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

lib: utils: Fix irqchip registration for PLIC and APLIC

Browse Source 
Currently, the same irqchip instance is registered for multiple PLIC
and APLIC instances which causes the sbi_list_for_each_entry() loop
in the sbi_irqchip_init() to hang at boot-time.

To address the above issue, register a separate irqchip instance for
each PLIC and APLIC instance.

Fixes: 2dd6eaf680 ("lib: sbi_irqchip: Call driver warm_init from SBI core")
Reported-by: Himanshu Chauhan <hchauhan@ventanamicro.com>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Himanshu Chauhan <hchauhan@ventanamicro.com>
This commit is contained in:
Anup Patel
2024-12-24 13:29:17 +05:30
committed by Anup Patel
parent 551ac0f2d4
commit 7150db29d7
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/sbi_utils/irqchip/aplic.h
View File

@@ -12,6 +12,7 @@
#define __IRQCHIP_APLIC_H__
#include <sbi/sbi_types.h>
#include <sbi/sbi_irqchip.h>
#define APLIC_MAX_DELEGATE 16
@@ -30,6 +31,9 @@ struct aplic_delegate_data {
};
struct aplic_data {
/* Private members */
struct sbi_irqchip_device irqchip;
/* Public members */
unsigned long addr;
unsigned long size;
unsigned long num_idc;

4
include/sbi_utils/irqchip/plic.h
View File

@@ -11,8 +11,12 @@
#define __IRQCHIP_PLIC_H__
#include <sbi/sbi_types.h>
#include <sbi/sbi_irqchip.h>
struct plic_data {
/* Private members */
struct sbi_irqchip_device irqchip;
/* Public members */
unsigned long addr;
unsigned long size;
unsigned long num_src;

6
lib/utils/irqchip/aplic.c
View File

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

8
lib/utils/irqchip/plic.c
View File

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