diff options
| author | Samuel Holland <[email protected]> | 2024-11-04 20:10:06 -0800 |
|---|---|---|
| committer | Anup Patel <[email protected]> | 2024-11-28 11:35:01 +0530 |
| commit | 56fddce83f163e5e90ea82bf78a8df3d990b0572 (patch) | |
| tree | d8830216f94abf2f83ea8a09340583ac1ce2c86f /platform | |
| parent | c6c22f00f457264560ca05414e9f9e0c5c3438db (diff) | |
lib: utils/irqchip: Move per-hart data from fdt_plic to plic
The per-hart PLIC pointer is not really specific to FDT platforms. Move
it into the main driver and drop the extra wrapper functions.
Signed-off-by: Samuel Holland <[email protected]>
Reviewed-by: Anup Patel <[email protected]>
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/fpga/ariane/platform.c | 2 | ||||
| -rw-r--r-- | platform/fpga/openpiton/platform.c | 2 | ||||
| -rw-r--r-- | platform/generic/allwinner/sun20i-d1.c | 8 | ||||
| -rw-r--r-- | platform/kendryte/k210/platform.c | 2 | ||||
| -rw-r--r-- | platform/nuclei/ux600/platform.c | 2 | ||||
| -rw-r--r-- | platform/template/platform.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/platform/fpga/ariane/platform.c b/platform/fpga/ariane/platform.c index 7a9283b3..8cc4dadb 100644 --- a/platform/fpga/ariane/platform.c +++ b/platform/fpga/ariane/platform.c @@ -110,7 +110,7 @@ static int ariane_irqchip_init(bool cold_boot) return ret; } - return plic_warm_irqchip_init(&plic); + return plic_warm_irqchip_init(); } /* diff --git a/platform/fpga/openpiton/platform.c b/platform/fpga/openpiton/platform.c index 0822c9fd..175751db 100644 --- a/platform/fpga/openpiton/platform.c +++ b/platform/fpga/openpiton/platform.c @@ -143,7 +143,7 @@ static int openpiton_irqchip_init(bool cold_boot) return ret; } - return plic_warm_irqchip_init(&plic); + return plic_warm_irqchip_init(); } /* diff --git a/platform/generic/allwinner/sun20i-d1.c b/platform/generic/allwinner/sun20i-d1.c index c4b06d1a..b65013c2 100644 --- a/platform/generic/allwinner/sun20i-d1.c +++ b/platform/generic/allwinner/sun20i-d1.c @@ -17,7 +17,7 @@ #include <sbi/sbi_scratch.h> #include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/fdt/fdt_helper.h> -#include <sbi_utils/irqchip/fdt_irqchip_plic.h> +#include <sbi_utils/irqchip/plic.h> #define SUN20I_D1_CCU_BASE ((void *)0x02001000) #define SUN20I_D1_RISCV_CFG_BASE ((void *)0x06010000) @@ -92,7 +92,7 @@ static void sun20i_d1_ppu_restore(void) static void sun20i_d1_riscv_cfg_save(void) { - struct plic_data *plic = fdt_plic_get(); + struct plic_data *plic = plic_get(); u32 *plic_sie = plic->pm_data; /* Enable MMIO access. Do not assume S-mode leaves the clock enabled. */ @@ -136,7 +136,7 @@ static int sun20i_d1_hart_suspend(u32 suspend_type) if (!(suspend_type & SBI_HSM_SUSP_NON_RET_BIT)) return SBI_ENOTSUPP; - fdt_plic_suspend(); + plic_suspend(); sun20i_d1_ppu_save(); sun20i_d1_riscv_cfg_save(); sun20i_d1_csr_save(); @@ -156,7 +156,7 @@ static void sun20i_d1_hart_resume(void) sun20i_d1_csr_restore(); sun20i_d1_riscv_cfg_restore(); sun20i_d1_ppu_restore(); - fdt_plic_resume(); + plic_resume(); } static const struct sbi_hsm_device sun20i_d1_ppu = { diff --git a/platform/kendryte/k210/platform.c b/platform/kendryte/k210/platform.c index d5e4622a..5a0f62ae 100644 --- a/platform/kendryte/k210/platform.c +++ b/platform/kendryte/k210/platform.c @@ -146,7 +146,7 @@ static int k210_irqchip_init(bool cold_boot) return rc; } - return plic_warm_irqchip_init(&plic); + return plic_warm_irqchip_init(); } static int k210_ipi_init(void) diff --git a/platform/nuclei/ux600/platform.c b/platform/nuclei/ux600/platform.c index ea68aa4b..bafaf678 100644 --- a/platform/nuclei/ux600/platform.c +++ b/platform/nuclei/ux600/platform.c @@ -200,7 +200,7 @@ static int ux600_irqchip_init(bool cold_boot) return rc; } - return plic_warm_irqchip_init(&plic); + return plic_warm_irqchip_init(); } static int ux600_ipi_init(void) diff --git a/platform/template/platform.c b/platform/template/platform.c index fadd1bb1..c8375d89 100644 --- a/platform/template/platform.c +++ b/platform/template/platform.c @@ -100,7 +100,7 @@ static int platform_irqchip_init(bool cold_boot) return ret; } - return plic_warm_irqchip_init(&plic); + return plic_warm_irqchip_init(); } /* |