lib: sbi_irqchip: Register devices during cold init

Have the SBI irqchip core keep track of registered irqchip devices. This
is useful for any callbacks the irqchip driver may have, such as for
warm initialization, the external interrupt handler function, and any
future support for handling external interrupts (beyond IPIs) in M-mode.

This improves on the tracking done in fdt_irqchip.c, as it tracks device
instances, not just drivers, so callbacks can target a specific device.

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:07 -08:00
committed by Anup Patel
parent 56fddce83f
commit e3e5686ef9
5 changed files with 38 additions and 0 deletions

View File

@@ -10,10 +10,17 @@
#ifndef __SBI_IRQCHIP_H__ #ifndef __SBI_IRQCHIP_H__
#define __SBI_IRQCHIP_H__ #define __SBI_IRQCHIP_H__
#include <sbi/sbi_list.h>
#include <sbi/sbi_types.h> #include <sbi/sbi_types.h>
struct sbi_scratch; struct sbi_scratch;
/** irqchip hardware device */
struct sbi_irqchip_device {
/** Node in the list of irqchip devices */
struct sbi_dlist node;
};
/** /**
* Set external interrupt handling function * Set external interrupt handling function
* *
@@ -34,6 +41,9 @@ void sbi_irqchip_set_irqfn(int (*fn)(void));
*/ */
int sbi_irqchip_process(void); int sbi_irqchip_process(void);
/** Register an irqchip device to receive callbacks */
void sbi_irqchip_add_device(struct sbi_irqchip_device *dev);
/** Initialize interrupt controllers */ /** Initialize interrupt controllers */
int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot); int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot);

View File

@@ -8,8 +8,11 @@
*/ */
#include <sbi/sbi_irqchip.h> #include <sbi/sbi_irqchip.h>
#include <sbi/sbi_list.h>
#include <sbi/sbi_platform.h> #include <sbi/sbi_platform.h>
static SBI_LIST_HEAD(irqchip_list);
static int default_irqfn(void) static int default_irqfn(void)
{ {
return SBI_ENODEV; return SBI_ENODEV;
@@ -28,6 +31,11 @@ int sbi_irqchip_process(void)
return ext_irqfn(); return ext_irqfn();
} }
void sbi_irqchip_add_device(struct sbi_irqchip_device *dev)
{
sbi_list_add_tail(&dev->node, &irqchip_list);
}
int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot) int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot)
{ {
int rc; int rc;

View File

@@ -12,6 +12,7 @@
#include <sbi/sbi_console.h> #include <sbi/sbi_console.h>
#include <sbi/sbi_domain.h> #include <sbi/sbi_domain.h>
#include <sbi/sbi_error.h> #include <sbi/sbi_error.h>
#include <sbi/sbi_irqchip.h>
#include <sbi_utils/irqchip/aplic.h> #include <sbi_utils/irqchip/aplic.h>
#define APLIC_MAX_IDC (1UL << 14) #define APLIC_MAX_IDC (1UL << 14)
@@ -165,6 +166,9 @@ static int aplic_check_msicfg(struct aplic_msicfg_data *msicfg)
return 0; return 0;
} }
static struct sbi_irqchip_device aplic_device = {
};
int aplic_cold_irqchip_init(struct aplic_data *aplic) int aplic_cold_irqchip_init(struct aplic_data *aplic)
{ {
int rc; int rc;
@@ -275,5 +279,8 @@ int aplic_cold_irqchip_init(struct aplic_data *aplic)
return rc; return rc;
} }
/* Register irqchip device */
sbi_irqchip_add_device(&aplic_device);
return 0; return 0;
} }

View File

@@ -345,6 +345,9 @@ int imsic_data_check(struct imsic_data *imsic)
return 0; return 0;
} }
static struct sbi_irqchip_device imsic_device = {
};
int imsic_cold_irqchip_init(struct imsic_data *imsic) int imsic_cold_irqchip_init(struct imsic_data *imsic)
{ {
int i, rc; int i, rc;
@@ -387,6 +390,9 @@ int imsic_cold_irqchip_init(struct imsic_data *imsic)
return rc; return rc;
} }
/* Register irqchip device */
sbi_irqchip_add_device(&imsic_device);
/* Register IPI device */ /* Register IPI device */
sbi_ipi_set_device(&imsic_ipi_device); sbi_ipi_set_device(&imsic_ipi_device);

View File

@@ -15,6 +15,7 @@
#include <sbi/sbi_domain.h> #include <sbi/sbi_domain.h>
#include <sbi/sbi_error.h> #include <sbi/sbi_error.h>
#include <sbi/sbi_heap.h> #include <sbi/sbi_heap.h>
#include <sbi/sbi_irqchip.h>
#include <sbi/sbi_string.h> #include <sbi/sbi_string.h>
#include <sbi_utils/irqchip/plic.h> #include <sbi_utils/irqchip/plic.h>
@@ -220,6 +221,9 @@ int plic_warm_irqchip_init(void)
return 0; return 0;
} }
static struct sbi_irqchip_device plic_device = {
};
int plic_cold_irqchip_init(struct plic_data *plic) int plic_cold_irqchip_init(struct plic_data *plic)
{ {
int i, ret; int i, ret;
@@ -278,5 +282,8 @@ int plic_cold_irqchip_init(struct plic_data *plic)
plic_set_hart_data_ptr(sbi_hartindex_to_scratch(i), plic); plic_set_hart_data_ptr(sbi_hartindex_to_scratch(i), plic);
} }
/* Register irqchip device */
sbi_irqchip_add_device(&plic_device);
return 0; return 0;
} }