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

lib: utils/irqchip: Use heap in PLIC, APLIC and IMSIC drivers

Browse Source 
Let's use heap allocation in PLIC, APLIC, and IMSIC irqchip drivers
instead of using a fixed size global array.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
This commit is contained in:
Anup Patel
2023-04-19 16:55:59 +05:30
committed by Anup Patel
parent 5a8cfcdf19
commit 30137166c6
3 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,15 +11,11 @@
#include <libfdt.h>
#include <sbi/riscv_asm.h>
#include <sbi/sbi_error.h>
#include <sbi/sbi_heap.h>
#include <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/irqchip/fdt_irqchip.h>
#include <sbi_utils/irqchip/aplic.h>
#define APLIC_MAX_NR 16
static unsigned long aplic_count = 0;
static struct aplic_data aplic[APLIC_MAX_NR];
static int irqchip_aplic_warm_init(void)
{
/* Nothing to do here. */
@@ -32,15 +28,23 @@ static int irqchip_aplic_cold_init(void *fdt, int nodeoff,
int rc;
struct aplic_data *pd;
if (APLIC_MAX_NR <= aplic_count)
return SBI_ENOSPC;
pd = &aplic[aplic_count++];
pd = sbi_zalloc(sizeof(*pd));
if (!pd)
return SBI_ENOMEM;
rc = fdt_parse_aplic_node(fdt, nodeoff, pd);
if (rc)
return rc;
goto fail_free_data;
return aplic_cold_irqchip_init(pd);
rc = aplic_cold_irqchip_init(pd);
if (rc)
goto fail_free_data;
return 0;
fail_free_data:
sbi_free(pd);
return rc;
}
static const struct fdt_match irqchip_aplic_match[] = {

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

@@ -11,16 +11,12 @@
#include <libfdt.h>
#include <sbi/riscv_asm.h>
#include <sbi/sbi_error.h>
#include <sbi/sbi_heap.h>
#include <sbi/sbi_hartmask.h>
#include <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/irqchip/fdt_irqchip.h>
#include <sbi_utils/irqchip/imsic.h>
#define IMSIC_MAX_NR 16
static unsigned long imsic_count = 0;
static struct imsic_data imsic[IMSIC_MAX_NR];
static int irqchip_imsic_update_hartid_table(void *fdt, int nodeoff,
struct imsic_data *id)
{
@@ -71,27 +67,27 @@ static int irqchip_imsic_cold_init(void *fdt, int nodeoff,
int rc;
struct imsic_data *id;
if (IMSIC_MAX_NR <= imsic_count)
return SBI_ENOSPC;
id = &imsic[imsic_count];
id = sbi_zalloc(sizeof(*id));
if (!id)
return SBI_ENOMEM;
rc = fdt_parse_imsic_node(fdt, nodeoff, id);
if (rc)
return rc;
if (!id->targets_mmode)
return 0;
if (rc || !id->targets_mmode)
goto fail_free_data;
rc = irqchip_imsic_update_hartid_table(fdt, nodeoff, id);
if (rc)
return rc;
goto fail_free_data;
rc = imsic_cold_irqchip_init(id);
if (rc)
return rc;
imsic_count++;
goto fail_free_data;
return 0;
fail_free_data:
sbi_free(id);
return rc;
}
static const struct fdt_match irqchip_imsic_match[] = {

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

@@ -11,18 +11,14 @@
#include <sbi/riscv_asm.h>
#include <sbi/riscv_io.h>
#include <sbi/sbi_error.h>
#include <sbi/sbi_heap.h>
#include <sbi/sbi_hartmask.h>
#include <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/irqchip/fdt_irqchip.h>
#include <sbi_utils/irqchip/plic.h>
#define PLIC_MAX_NR 16
static unsigned long plic_count = 0;
static struct plic_data plic[PLIC_MAX_NR];
static struct plic_data *plic_hartid2data[SBI_HARTMASK_MAX_BITS];
static int plic_hartid2context[SBI_HARTMASK_MAX_BITS][2];
static int plic_hartid2context[SBI_HARTMASK_MAX_BITS][2] = { { -1 } };
void fdt_plic_priority_save(u8 *priority, u32 num)
{
@@ -114,16 +110,16 @@ static int irqchip_plic_update_hartid_table(void *fdt, int nodeoff,
static int irqchip_plic_cold_init(void *fdt, int nodeoff,
const struct fdt_match *match)
{
int i, rc;
int rc;
struct plic_data *pd;
if (PLIC_MAX_NR <= plic_count)
return SBI_ENOSPC;
pd = &plic[plic_count++];
pd = sbi_zalloc(sizeof(*pd));
if (!pd)
return SBI_ENOMEM;
rc = fdt_parse_plic_node(fdt, nodeoff, pd);
if (rc)
return rc;
goto fail_free_data;
if (match->data) {
void (*plic_plat_init)(struct plic_data *) = match->data;
@@ -132,17 +128,17 @@ static int irqchip_plic_cold_init(void *fdt, int nodeoff,
rc = plic_cold_irqchip_init(pd);
if (rc)
return rc;
goto fail_free_data;
if (plic_count == 1) {
for (i = 0; i < SBI_HARTMASK_MAX_BITS; i++) {
plic_hartid2data[i] = NULL;
plic_hartid2context[i][0] = -1;
plic_hartid2context[i][1] = -1;
}
}
rc = irqchip_plic_update_hartid_table(fdt, nodeoff, pd);
if (rc)
goto fail_free_data;
return irqchip_plic_update_hartid_table(fdt, nodeoff, pd);
return 0;
fail_free_data:
sbi_free(pd);
return rc;
}
#define THEAD_PLIC_CTRL_REG 0x1ffffc