|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v3 15/23] xen/riscv: introduce (de)initialization helpers for vINTC
Add common helpers domain_vintc_init() and domain_vintc_deinit() to
allocate and deallocate a virtual interrupt controller (vINTC)
structure and initialize basic virtual interrupt controller registers.
domain_vintc_deinit() isn't called at the moment as arch_domain_destroy()
is implemented as stub at the moment.
Signed-off-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
---
Changes in v3:
- Drop redundant printk() from domain_vintc_deinit()'s default case to
avoid duplicate messages when init fails.
- Add a comment to domain_vintc_init() clarifying that guests currently
receive a virtual interrupt controller that mirrors the host hardware.
---
Changes in v2:
- Drop __init for domain_vintc_(de)init().
- Update the commit message.
---
---
xen/arch/riscv/domain.c | 3 +++
xen/arch/riscv/include/asm/intc.h | 3 +++
xen/arch/riscv/intc.c | 40 +++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+)
diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c
index 129e775c52cb..3499c25dcfe0 100644
--- a/xen/arch/riscv/domain.c
+++ b/xen/arch/riscv/domain.c
@@ -309,6 +309,9 @@ int arch_domain_create(struct domain *d,
if ( (rc = p2m_init(d, config)) != 0)
goto fail;
+ if ( (rc = domain_vintc_init(d)) )
+ goto fail;
+
return rc;
fail:
diff --git a/xen/arch/riscv/include/asm/intc.h
b/xen/arch/riscv/include/asm/intc.h
index d3d456afe5f0..95ca526e1223 100644
--- a/xen/arch/riscv/include/asm/intc.h
+++ b/xen/arch/riscv/include/asm/intc.h
@@ -77,4 +77,7 @@ void intc_route_irq_to_xen(struct irq_desc *desc, unsigned
int priority);
void intc_handle_external_irqs(struct cpu_user_regs *regs);
+int domain_vintc_init(struct domain *d);
+void domain_vintc_deinit(struct domain *d);
+
#endif /* ASM__RISCV__INTERRUPT_CONTOLLER_H */
diff --git a/xen/arch/riscv/intc.c b/xen/arch/riscv/intc.c
index f0ce27a96c1d..ec37b359f323 100644
--- a/xen/arch/riscv/intc.c
+++ b/xen/arch/riscv/intc.c
@@ -11,6 +11,7 @@
#include <asm/aia.h>
#include <asm/intc.h>
+#include <asm/vaplic.h>
static const struct intc_hw_operations *__ro_after_init intc_hw_ops;
@@ -83,3 +84,42 @@ int __init make_intc_domU_node(struct kernel_info *kinfo)
return vintc->init_ops->make_domu_dt_node(kinfo);
}
+
+/*
+ * Guests are given a virtual interrupt controller that mirrors the host
+ * hardware: an AIA-capable host yields a virtual AIA for the guest, and
+ * so on for any future controller types.
+ */
+int domain_vintc_init(struct domain *d)
+{
+ int ret = -EOPNOTSUPP;
+ const enum intc_version ver = intc_hw_ops->info->hw_version;
+
+ switch ( ver )
+ {
+ case INTC_APLIC:
+ ret = domain_vaplic_init(d);
+ break;
+
+ default:
+ printk("vintc (ver:%d) isn't implemented\n", ver);
+ break;
+ }
+
+ return ret;
+}
+
+void domain_vintc_deinit(struct domain *d)
+{
+ const enum intc_version ver = intc_hw_ops->info->hw_version;
+
+ switch ( ver )
+ {
+ case INTC_APLIC:
+ domain_vaplic_deinit(d);
+ break;
+
+ default:
+ break;
+ }
+}
--
2.54.0
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |