|
@@ -5,8 +5,6 @@
|
|
|
#include <common.h>
|
|
|
#include <cpu_func.h>
|
|
|
#include <dm.h>
|
|
|
-#include <regmap.h>
|
|
|
-#include <syscon.h>
|
|
|
#include <asm/gic.h>
|
|
|
#include <asm/gic-v3.h>
|
|
|
#include <asm/io.h>
|
|
@@ -19,22 +17,15 @@ static u32 lpi_id_bits;
|
|
|
#define LPI_PROPBASE_SZ ALIGN(BIT(LPI_NRBITS), SZ_64K)
|
|
|
#define LPI_PENDBASE_SZ ALIGN(BIT(LPI_NRBITS) / 8, SZ_64K)
|
|
|
|
|
|
-/* Number of GIC re-distributors */
|
|
|
-#define MAX_GIC_REDISTRIBUTORS 8
|
|
|
-
|
|
|
/*
|
|
|
* gic_v3_its_priv - gic details
|
|
|
*
|
|
|
* @gicd_base: gicd base address
|
|
|
* @gicr_base: gicr base address
|
|
|
- * @lpi_base: gic lpi base address
|
|
|
- * @num_redist: number of gic re-distributors
|
|
|
*/
|
|
|
struct gic_v3_its_priv {
|
|
|
ulong gicd_base;
|
|
|
ulong gicr_base;
|
|
|
- ulong lpi_base;
|
|
|
- u32 num_redist;
|
|
|
};
|
|
|
|
|
|
static int gic_v3_its_get_gic_addr(struct gic_v3_its_priv *priv)
|
|
@@ -68,39 +59,13 @@ static int gic_v3_its_get_gic_addr(struct gic_v3_its_priv *priv)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int gic_v3_its_get_gic_lpi_addr(struct gic_v3_its_priv *priv)
|
|
|
-{
|
|
|
- struct regmap *regmap;
|
|
|
- struct udevice *dev;
|
|
|
- int ret;
|
|
|
-
|
|
|
- ret = uclass_get_device_by_driver(UCLASS_SYSCON,
|
|
|
- DM_DRIVER_GET(gic_lpi_syscon), &dev);
|
|
|
- if (ret) {
|
|
|
- pr_err("%s: failed to get %s syscon device\n", __func__,
|
|
|
- DM_DRIVER_GET(gic_lpi_syscon)->name);
|
|
|
- return ret;
|
|
|
- }
|
|
|
-
|
|
|
- regmap = syscon_get_regmap(dev);
|
|
|
- if (!regmap) {
|
|
|
- pr_err("%s: failed to regmap for %s syscon device\n", __func__,
|
|
|
- DM_DRIVER_GET(gic_lpi_syscon)->name);
|
|
|
- return -ENODEV;
|
|
|
- }
|
|
|
- priv->lpi_base = regmap->ranges[0].start;
|
|
|
-
|
|
|
- priv->num_redist = dev_read_u32_default(dev, "max-gic-redistributors",
|
|
|
- MAX_GIC_REDISTRIBUTORS);
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
/*
|
|
|
* Program the GIC LPI configuration tables for all
|
|
|
* the re-distributors and enable the LPI table
|
|
|
+ * base: Configuration table address
|
|
|
+ * num_redist: number of redistributors
|
|
|
*/
|
|
|
-int gic_lpi_tables_init(void)
|
|
|
+int gic_lpi_tables_init(u64 base, u32 num_redist)
|
|
|
{
|
|
|
struct gic_v3_its_priv priv;
|
|
|
u32 gicd_typer;
|
|
@@ -109,15 +74,12 @@ int gic_lpi_tables_init(void)
|
|
|
int i;
|
|
|
u64 redist_lpi_base;
|
|
|
u64 pend_base;
|
|
|
- ulong pend_tab_total_sz;
|
|
|
+ ulong pend_tab_total_sz = num_redist * LPI_PENDBASE_SZ;
|
|
|
void *pend_tab_va;
|
|
|
|
|
|
if (gic_v3_its_get_gic_addr(&priv))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- if (gic_v3_its_get_gic_lpi_addr(&priv))
|
|
|
- return -EINVAL;
|
|
|
-
|
|
|
gicd_typer = readl((uintptr_t)(priv.gicd_base + GICD_TYPER));
|
|
|
/* GIC support for Locality specific peripheral interrupts (LPI's) */
|
|
|
if (!(gicd_typer & GICD_TYPER_LPIS)) {
|
|
@@ -130,7 +92,7 @@ int gic_lpi_tables_init(void)
|
|
|
* Once the LPI table is enabled, can not program the
|
|
|
* LPI configuration tables again, unless the GIC is reset.
|
|
|
*/
|
|
|
- for (i = 0; i < priv.num_redist; i++) {
|
|
|
+ for (i = 0; i < num_redist; i++) {
|
|
|
u32 offset = i * GIC_REDISTRIBUTOR_OFFSET;
|
|
|
|
|
|
if ((readl((uintptr_t)(priv.gicr_base + offset))) &
|
|
@@ -146,7 +108,7 @@ int gic_lpi_tables_init(void)
|
|
|
ITS_MAX_LPI_NRBITS);
|
|
|
|
|
|
/* Set PropBase */
|
|
|
- val = (priv.lpi_base |
|
|
|
+ val = (base |
|
|
|
GICR_PROPBASER_INNERSHAREABLE |
|
|
|
GICR_PROPBASER_RAWAWB |
|
|
|
((LPI_NRBITS - 1) & GICR_PROPBASER_IDBITS_MASK));
|
|
@@ -163,8 +125,7 @@ int gic_lpi_tables_init(void)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- redist_lpi_base = priv.lpi_base + LPI_PROPBASE_SZ;
|
|
|
- pend_tab_total_sz = priv.num_redist * LPI_PENDBASE_SZ;
|
|
|
+ redist_lpi_base = base + LPI_PROPBASE_SZ;
|
|
|
pend_tab_va = map_physmem(redist_lpi_base, pend_tab_total_sz,
|
|
|
MAP_NOCACHE);
|
|
|
memset(pend_tab_va, 0, pend_tab_total_sz);
|
|
@@ -172,7 +133,7 @@ int gic_lpi_tables_init(void)
|
|
|
unmap_physmem(pend_tab_va, MAP_NOCACHE);
|
|
|
|
|
|
pend_base = priv.gicr_base + GICR_PENDBASER;
|
|
|
- for (i = 0; i < priv.num_redist; i++) {
|
|
|
+ for (i = 0; i < num_redist; i++) {
|
|
|
u32 offset = i * GIC_REDISTRIBUTOR_OFFSET;
|
|
|
|
|
|
val = ((redist_lpi_base + (i * LPI_PENDBASE_SZ)) |
|
|
@@ -207,14 +168,3 @@ U_BOOT_DRIVER(arm_gic_v3_its) = {
|
|
|
.id = UCLASS_IRQ,
|
|
|
.of_match = gic_v3_its_ids,
|
|
|
};
|
|
|
-
|
|
|
-static const struct udevice_id gic_lpi_syscon_ids[] = {
|
|
|
- { .compatible = "gic-lpi-base" },
|
|
|
- {}
|
|
|
-};
|
|
|
-
|
|
|
-U_BOOT_DRIVER(gic_lpi_syscon) = {
|
|
|
- .name = "gic-lpi-base",
|
|
|
- .id = UCLASS_SYSCON,
|
|
|
- .of_match = gic_lpi_syscon_ids,
|
|
|
-};
|