At the current development stage, only domain vINTC init and deinit operations are required, so implement those first.
Initialize vAPLIC's domaincfg to with the interrupt-enable bit set and MSI delivery mode selected as the current solution is exepcted to have always IMSIC, and initialize vintc->ops. Other operations such as emulate_load(), emulate_store(), and is_access() will be needed once guests are running and MMIO accesses to APLIC MMIO range must be handled. These will be introduced separately later. Introduce a structure to describe a virtual interrupt controller (vINTC) and a vintc_ops structure, which provides operations to emulate load and store accesses to interrupt controller MMIOs and to check whether a given address falls within the MMIO range of a specific virtual interrupt controller. The vAPLIC implementation of these operations will be provided later once guests can be run and these operations are actually needed. Introduce these structures here as they are required for the implementation of domain_vaplic_init() and domain_vaplic_alloc(). Also, introduce vcpu_vaplic_init() and init vintc_ops->vcpu_init() with it. Co-developed-by: Romain Caritey <[email protected]> Signed-off-by: Oleksii Kurochko <[email protected]> --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/domain.c | 11 ++--- xen/arch/riscv/include/asm/domain.h | 2 + xen/arch/riscv/include/asm/intc.h | 14 ++++++ xen/arch/riscv/include/asm/vaplic.h | 36 ++++++++++++++ xen/arch/riscv/intc.c | 1 + xen/arch/riscv/vaplic.c | 74 +++++++++++++++++++++++++++++ 7 files changed, 131 insertions(+), 8 deletions(-) create mode 100644 xen/arch/riscv/include/asm/vaplic.h create mode 100644 xen/arch/riscv/vaplic.c diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index d772b42386c0..b9941a230e03 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -24,6 +24,7 @@ obj-y += smpboot.o obj-y += stubs.o obj-y += time.o obj-y += traps.o +obj-y += vaplic.o obj-y += vmid.o obj-y += vm_event.o obj-y += vsbi/ diff --git a/xen/arch/riscv/domain.c b/xen/arch/riscv/domain.c index 515735b32e30..560b21b16ffb 100644 --- a/xen/arch/riscv/domain.c +++ b/xen/arch/riscv/domain.c @@ -11,6 +11,7 @@ #include <asm/bitops.h> #include <asm/cpufeature.h> #include <asm/csr.h> +#include <asm/intc.h> #include <asm/riscv_encoding.h> #include <asm/vtimer.h> @@ -154,14 +155,8 @@ int arch_vcpu_create(struct vcpu *v) if ( (rc = vcpu_vtimer_init(v)) ) goto fail; - /* - * As interrupt controller (IC) is not yet implemented, - * return an error. - * - * TODO: Drop this once IC is implemented. - */ - rc = -EOPNOTSUPP; - goto fail; + if ( (rc = v->domain->arch.vintc->ops->vcpu_init(v)) ) + goto fail; return rc; diff --git a/xen/arch/riscv/include/asm/domain.h b/xen/arch/riscv/include/asm/domain.h index bdb1ffd748c9..21a3e6876f36 100644 --- a/xen/arch/riscv/include/asm/domain.h +++ b/xen/arch/riscv/include/asm/domain.h @@ -98,6 +98,8 @@ struct arch_domain { struct paging_domain paging; #endif + struct vintc *vintc; + /* Next unused device tree phandle number */ uint32_t next_phandle; }; diff --git a/xen/arch/riscv/include/asm/intc.h b/xen/arch/riscv/include/asm/intc.h index 8300d71d472f..c5a869db8bc5 100644 --- a/xen/arch/riscv/include/asm/intc.h +++ b/xen/arch/riscv/include/asm/intc.h @@ -16,6 +16,7 @@ struct cpu_user_regs; struct dt_device_node; struct irq_desc; struct kernel_info; +struct vcpu; struct intc_info { enum intc_version hw_version; @@ -47,6 +48,19 @@ struct intc_hw_operations { const struct dt_device_node *intc); }; +struct vintc_ops { + /* Initialize some vINTC-related stuff for a vCPU */ + int (*vcpu_init)(struct vcpu *vcpu); + + /* Check if a register is virtual interrupt controller MMIO */ + int (*is_access)(const struct vcpu *vcpu, const unsigned long addr); +}; + +struct vintc { + const struct intc_info *info; + const struct vintc_ops *ops; +}; + void intc_preinit(void); void register_intc_ops(const struct intc_hw_operations *ops); diff --git a/xen/arch/riscv/include/asm/vaplic.h b/xen/arch/riscv/include/asm/vaplic.h new file mode 100644 index 000000000000..7684f3490829 --- /dev/null +++ b/xen/arch/riscv/include/asm/vaplic.h @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: MIT */ +/* + * xen/arch/riscv/vaplic.c + * + * Virtual RISC-V Advanced Platform-Level Interrupt Controller support + * + * Copyright (c) Microchip. + */ + +#ifndef ASM__RISCV__VAPLIC_H +#define ASM__RISCV__VAPLIC_H + +#include <xen/kernel.h> +#include <xen/types.h> + +#include <asm/intc.h> + +struct domain; + +#define to_vaplic(v) container_of(v, struct vaplic, base) + +struct vaplic_regs { + uint32_t domaincfg; + uint32_t smsiaddrcfg; + uint32_t smsiaddrcfgh; +}; + +struct vaplic { + struct vintc base; + struct vaplic_regs regs; +}; + +int domain_vaplic_init(struct domain *d); +void domain_vaplic_deinit(struct domain *d); + +#endif /* ASM__RISCV__VAPLIC_H */ diff --git a/xen/arch/riscv/intc.c b/xen/arch/riscv/intc.c index c9f12651fda1..ff7a76accaca 100644 --- a/xen/arch/riscv/intc.c +++ b/xen/arch/riscv/intc.c @@ -6,6 +6,7 @@ #include <xen/init.h> #include <xen/irq.h> #include <xen/lib.h> +#include <xen/sched.h> #include <xen/spinlock.h> #include <asm/aia.h> diff --git a/xen/arch/riscv/vaplic.c b/xen/arch/riscv/vaplic.c new file mode 100644 index 000000000000..9b105de7ed7d --- /dev/null +++ b/xen/arch/riscv/vaplic.c @@ -0,0 +1,74 @@ +/* SPDX-License-Identifier: MIT */ +/* + * xen/arch/riscv/vaplic.c + * + * Virtual RISC-V Advanced Platform-Level Interrupt Controller support + * + * Copyright (c) Microchip. + * Copyright (c) Vates + */ + +#include <xen/errno.h> +#include <xen/sched.h> +#include <xen/xvmalloc.h> + +#include <asm/aia.h> +#include <asm/imsic.h> +#include <asm/intc.h> +#include <asm/vaplic.h> + +#include "aplic-priv.h" + +static int __init cf_check vcpu_vaplic_init(struct vcpu *v) +{ + int rc = 0; + + rc = vcpu_imsic_init(v); + if ( rc ) + return rc; + + imsic_set_guest_file_id(v, vgein_assign(v)); + + return rc; +} + +static const struct vintc_ops vaplic_ops = { + .vcpu_init = vcpu_vaplic_init, +}; + +static struct vintc * __init vaplic_alloc(void) +{ + struct vaplic *v = NULL; + + v = xvzalloc(struct vaplic); + if ( !v ) + return NULL; + + return &v->base; +} + +int __init domain_vaplic_init(struct domain *d) +{ + int ret = 0; + + d->arch.vintc = vaplic_alloc(); + if ( !d->arch.vintc ) + { + ret = -ENOMEM; + goto fail; + } + + d->arch.vintc->ops = &vaplic_ops; + to_vaplic(d->arch.vintc)->regs.domaincfg = + APLIC_DOMAINCFG_IE | APLIC_DOMAINCFG_DM; + + fail: + return ret; +} + +void __init domain_vaplic_deinit(struct domain *d) +{ + struct vaplic *vaplic = to_vaplic(d->arch.vintc); + + XVFREE(vaplic); +} -- 2.53.0
