From 7150db29d7186808cc0df66b54dde1cb0ffe3535 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Tue, 24 Dec 2024 13:29:17 +0530 Subject: lib: utils: Fix irqchip registration for PLIC and APLIC 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: 2dd6eaf68055 ("lib: sbi_irqchip: Call driver warm_init from SBI core") Reported-by: Himanshu Chauhan Signed-off-by: Anup Patel Reviewed-by: Himanshu Chauhan --- include/sbi_utils/irqchip/aplic.h | 4 ++++ include/sbi_utils/irqchip/plic.h | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'include') diff --git a/include/sbi_utils/irqchip/aplic.h b/include/sbi_utils/irqchip/aplic.h index 82682e8a..e31f48a4 100644 --- a/include/sbi_utils/irqchip/aplic.h +++ b/include/sbi_utils/irqchip/aplic.h @@ -12,6 +12,7 @@ #define __IRQCHIP_APLIC_H__ #include +#include #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; diff --git a/include/sbi_utils/irqchip/plic.h b/include/sbi_utils/irqchip/plic.h index a173871e..18aa7469 100644 --- a/include/sbi_utils/irqchip/plic.h +++ b/include/sbi_utils/irqchip/plic.h @@ -11,8 +11,12 @@ #define __IRQCHIP_PLIC_H__ #include +#include struct plic_data { + /* Private members */ + struct sbi_irqchip_device irqchip; + /* Public members */ unsigned long addr; unsigned long size; unsigned long num_src; -- cgit v1.2.3