Mirrors/opensbi
1
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2025-08-24 23:41:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

platform: Drop irqchip warm init and exit hooks

Browse Source 
Now that driver lifecycle is managed from within the SBI irqchip core,
platforms need only to initialize the driver once during cold init.
Remove the remaining platform hooks that are no longer used.

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:09 -08:00
committed by Anup Patel
parent 2dd6eaf680
commit 678f5909a3
13 changed files with 26 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/sbi/sbi_irqchip.c
View File

@@ -42,9 +42,11 @@ int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot)
const struct sbi_platform *plat = sbi_platform_ptr(scratch);
struct sbi_irqchip_device *dev;
rc = sbi_platform_irqchip_init(plat, cold_boot);
if (rc)
return rc;
if (cold_boot) {
rc = sbi_platform_irqchip_init(plat);
if (rc)
return rc;
}
sbi_list_for_each_entry(dev, &irqchip_list, node) {
if (!dev->warm_init)
@@ -62,10 +64,6 @@ int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot)
void sbi_irqchip_exit(struct sbi_scratch *scratch)
{
const struct sbi_platform *plat = sbi_platform_ptr(scratch);
if (ext_irqfn != default_irqfn)
csr_clear(CSR_MIE, MIP_MEIP);
sbi_platform_irqchip_exit(plat);
}

57
lib/utils/irqchip/fdt_irqchip.c
View File

@@ -16,40 +16,8 @@
extern struct fdt_irqchip *fdt_irqchip_drivers[];
extern unsigned long fdt_irqchip_drivers_size;
#define FDT_IRQCHIP_MAX_DRIVERS 8
static struct fdt_irqchip *current_drivers[FDT_IRQCHIP_MAX_DRIVERS] = {0};
static int current_drivers_count;
void fdt_irqchip_exit(void)
int fdt_irqchip_init(void)
{
int i;
for (i = 0; i < current_drivers_count; i++) {
if (!current_drivers[i] || !current_drivers[i]->exit)
continue;
current_drivers[i]->exit();
}
}
static int fdt_irqchip_warm_init(void)
{
int i, rc;
for (i = 0; i < current_drivers_count; i++) {
if (!current_drivers[i] || !current_drivers[i]->warm_init)
continue;
rc = current_drivers[i]->warm_init();
if (rc)
return rc;
}
return 0;
}
static int fdt_irqchip_cold_init(void)
{
bool drv_added;
int pos, noff, rc;
struct fdt_irqchip *drv;
const struct fdt_match *match;
@@ -59,7 +27,6 @@ static int fdt_irqchip_cold_init(void)
drv = fdt_irqchip_drivers[pos];
noff = -1;
drv_added = false;
while ((noff = fdt_find_match(fdt, noff,
drv->match_table, &match)) >= 0) {
if (!fdt_node_is_enabled(fdt,noff))
@@ -72,30 +39,8 @@ static int fdt_irqchip_cold_init(void)
if (rc)
return rc;
}
if (drv_added)
continue;
current_drivers[current_drivers_count++] = drv;
drv_added = true;
}
if (FDT_IRQCHIP_MAX_DRIVERS <= current_drivers_count)
break;
}
return 0;
}
int fdt_irqchip_init(bool cold_boot)
{
int rc;
if (cold_boot) {
rc = fdt_irqchip_cold_init();
if (rc)
return rc;
}
return fdt_irqchip_warm_init();
}

2
lib/utils/irqchip/fdt_irqchip_aplic.c
View File

@@ -49,6 +49,4 @@ static const struct fdt_match irqchip_aplic_match[] = {
struct fdt_irqchip fdt_irqchip_aplic = {
.match_table = irqchip_aplic_match,
.cold_init = irqchip_aplic_cold_init,
.warm_init = NULL,
.exit = NULL,
};

1
lib/utils/irqchip/fdt_irqchip_imsic.c
View File

@@ -95,5 +95,4 @@ static const struct fdt_match irqchip_imsic_match[] = {
struct fdt_irqchip fdt_irqchip_imsic = {
.match_table = irqchip_imsic_match,
.cold_init = irqchip_imsic_cold_init,
.warm_init = NULL,
};

2
lib/utils/irqchip/fdt_irqchip_plic.c
View File

@@ -108,6 +108,4 @@ static const struct fdt_match irqchip_plic_match[] = {
struct fdt_irqchip fdt_irqchip_plic = {
.match_table = irqchip_plic_match,
.cold_init = irqchip_plic_cold_init,
.warm_init = NULL,
.exit = NULL,
};