Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: utils/irqchip: Move per-hart data from fdt_plic to plic

Browse Source 
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 <samuel.holland@sifive.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Samuel Holland
2024-11-04 20:10:06 -08:00
committed by Anup Patel
parent c6c22f00f4
commit 56fddce83f
10 changed files with 60 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/generic/allwinner/sun20i-d1.c
View File

@@ -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 = {