|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v2 10/26] xen/riscv: implement make_intc_domU_node()
Introduce a RISC-V specific function to create an interrupt controller
Device Tree node for DomU domains during dom0less build.
Add make_intc_domU_node() to the dom0less build path and wire it to
a new generic helper, intc_make_domu_dt_node(), which delegates DT
node creation to the active interrupt controller implementation via
vintc_init_ops.
Signed-off-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
---
Changes in v2:
- s/intc_make_domu_dt_node/make_intc_domU_node.
- introduce separate intc_hw_init_ops structure for init operations.
- Return -EOPNOTSUPP instead of -ENOSYS.
- Drop const for kinfo argument as it could be changed by interrupt
controller node creation code.
- Refactor make_domu_dt_node().
- Make make_domu_dt_node part of vintc structure as it looks more logical to be
there.
---
xen/arch/riscv/include/asm/domain.h | 2 ++
xen/arch/riscv/include/asm/intc.h | 12 ++++++++++--
xen/arch/riscv/intc.c | 11 +++++++++++
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/xen/arch/riscv/include/asm/domain.h
b/xen/arch/riscv/include/asm/domain.h
index 664b0b9f9129..136d9e816a44 100644
--- a/xen/arch/riscv/include/asm/domain.h
+++ b/xen/arch/riscv/include/asm/domain.h
@@ -98,6 +98,8 @@ struct arch_domain {
DECLARE_BITMAP(guest_isa, RISCV_ISA_EXT_MAX);
char guest_isa_str[RISCV_GUEST_ISA_STR_MAX];
+
+ struct vintc *vintc;
};
#include <xen/sched.h>
diff --git a/xen/arch/riscv/include/asm/intc.h
b/xen/arch/riscv/include/asm/intc.h
index 8b498e43b33f..70df461a2a51 100644
--- a/xen/arch/riscv/include/asm/intc.h
+++ b/xen/arch/riscv/include/asm/intc.h
@@ -8,14 +8,13 @@
#ifndef ASM__RISCV__INTERRUPT_CONTOLLER_H
#define ASM__RISCV__INTERRUPT_CONTOLLER_H
-struct dt_device_node;
-
enum intc_version {
INTC_APLIC,
};
struct cpu_user_regs;
struct irq_desc;
+struct kernel_info;
struct intc_info {
enum intc_version hw_version;
@@ -46,6 +45,15 @@ struct intc_hw_init_ops {
int (*init)(void);
};
+struct vintc_init_ops {
+ /* Create interrupt controller node for domain */
+ int (*make_domu_dt_node)(struct kernel_info *kinfo);
+};
+
+struct vintc {
+ struct vintc_init_ops *init_ops;
+};
+
void intc_preinit(void);
void register_intc_ops(const struct intc_hw_operations *ops,
diff --git a/xen/arch/riscv/intc.c b/xen/arch/riscv/intc.c
index 8649160403f7..0994deddcb2c 100644
--- a/xen/arch/riscv/intc.c
+++ b/xen/arch/riscv/intc.c
@@ -3,6 +3,7 @@
#include <xen/acpi.h>
#include <xen/bug.h>
#include <xen/device_tree.h>
+#include <xen/fdt-kernel.h>
#include <xen/init.h>
#include <xen/irq.h>
#include <xen/lib.h>
@@ -73,3 +74,13 @@ void intc_route_irq_to_xen(struct irq_desc *desc, unsigned
int priority)
intc_set_irq_type(desc, desc->arch.type);
intc_set_irq_priority(desc, priority);
}
+
+int __init make_intc_domU_node(struct kernel_info *kinfo)
+{
+ struct vintc *vintc = kinfo->bd.d->arch.vintc;
+
+ if ( intc_hw_ops && vintc->init_ops && vintc->init_ops->make_domu_dt_node )
+ return vintc->init_ops->make_domu_dt_node(kinfo);
+
+ return -EOPNOTSUPP;
+}
--
2.54.0
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |