KVM RISC-V HW IMSIC guest files
Subsystems (3)
cover KVM RISC-V HW IMSIC guest files
This series extends the HWACCEL and AUTO modes of AIA in-kernel irqchip to use HW IMSIC guest files whenever underlying host supports it.
This series depends upon the "Linux RISC-V AIA support" series which
is already queued for Linux-6.10.
(Refer, https://lore.kernel.org/lkml/20240307140307.646078-1-apatel at ventanamicro.com/)
These patches can also be found in the riscv_kvm_aia_hwaccel_v1 branch
at: https://github.com/avpatel/linux.git
Anup Patel (2):
RISC-V: KVM: Share APLIC and IMSIC defines with irqchip drivers
RISC-V: KVM: Use IMSIC guest files when available
arch/riscv/include/asm/kvm_aia_aplic.h | 58 -------------------------- arch/riscv/include/asm/kvm_aia_imsic.h | 38 ----------------- arch/riscv/kvm/aia.c | 35 +++++++++------- arch/riscv/kvm/aia_aplic.c | 2 +- arch/riscv/kvm/aia_device.c | 2 +- arch/riscv/kvm/aia_imsic.c | 2 +- 6 files changed, 24 insertions(+), 113 deletions(-) delete mode 100644 arch/riscv/include/asm/kvm_aia_aplic.h delete mode 100644 arch/riscv/include/asm/kvm_aia_imsic.h
Signature · 1 line
2.34.1
PATCH 1/2 RISC-V: KVM: Share APLIC and IMSIC defines with irqchip drivers
We have common APLIC and IMSIC headers available under include/linux/irqchip/ directory which are used by APLIC and IMSIC irqchip drivers. Let us replace the use of kvm_aia_*.h headers with include/linux/irqchip/riscv-*.h headers.
--- arch/riscv/include/asm/kvm_aia_aplic.h | 58 -------------------------- arch/riscv/include/asm/kvm_aia_imsic.h | 38 ----------------- arch/riscv/kvm/aia.c | 2 +- arch/riscv/kvm/aia_aplic.c | 2 +- arch/riscv/kvm/aia_device.c | 2 +- arch/riscv/kvm/aia_imsic.c | 2 +- 6 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 arch/riscv/include/asm/kvm_aia_aplic.h delete mode 100644 arch/riscv/include/asm/kvm_aia_imsic.h
arch/riscv/include/asm/kvm_aia_aplic.h deleted +0 -58
@@ -1,58 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright (C) 2021 Western Digital Corporation or its affiliates. -* Copyright (C) 2022 Ventana Micro Systems Inc. -*/ -#ifndef __KVM_RISCV_AIA_IMSIC_H -#define __KVM_RISCV_AIA_IMSIC_H - -#include <linux/bitops.h> - -#define APLIC_MAX_IDC BIT(14) -#define APLIC_MAX_SOURCE 1024 - -#define APLIC_DOMAINCFG 0x0000 -#define APLIC_DOMAINCFG_RDONLY 0x80000000 -#define APLIC_DOMAINCFG_IE BIT(8) -#define APLIC_DOMAINCFG_DM BIT(2) -#define APLIC_DOMAINCFG_BE BIT(0) - -#define APLIC_SOURCECFG_BASE 0x0004 -#define APLIC_SOURCECFG_D BIT(10) -#define APLIC_SOURCECFG_CHILDIDX_MASK 0x000003ff -#define APLIC_SOURCECFG_SM_MASK 0x00000007 -#define APLIC_SOURCECFG_SM_INACTIVE 0x0 -#define APLIC_SOURCECFG_SM_DETACH 0x1 -#define APLIC_SOURCECFG_SM_EDGE_RISE 0x4 -#define APLIC_SOURCECFG_SM_EDGE_FALL 0x5 -#define APLIC_SOURCECFG_SM_LEVEL_HIGH 0x6 -#define APLIC_SOURCECFG_SM_LEVEL_LOW 0x7 - -#define APLIC_IRQBITS_PER_REG 32 - -#define APLIC_SETIP_BASE 0x1c00 -#define APLIC_SETIPNUM 0x1cdc - -#define APLIC_CLRIP_BASE 0x1d00 -#define APLIC_CLRIPNUM 0x1ddc - -#define APLIC_SETIE_BASE 0x1e00 -#define APLIC_SETIENUM 0x1edc - -#define APLIC_CLRIE_BASE 0x1f00 -#define APLIC_CLRIENUM 0x1fdc - -#define APLIC_SETIPNUM_LE 0x2000 -#define APLIC_SETIPNUM_BE 0x2004 - -#define APLIC_GENMSI 0x3000 - -#define APLIC_TARGET_BASE 0x3004 -#define APLIC_TARGET_HART_IDX_SHIFT 18 -#define APLIC_TARGET_HART_IDX_MASK 0x3fff -#define APLIC_TARGET_GUEST_IDX_SHIFT 12 -#define APLIC_TARGET_GUEST_IDX_MASK 0x3f -#define APLIC_TARGET_IPRIO_MASK 0xff -#define APLIC_TARGET_EIID_MASK 0x7ff - -#endif
arch/riscv/include/asm/kvm_aia_imsic.h deleted +0 -38
@@ -1,38 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright (C) 2021 Western Digital Corporation or its affiliates. -* Copyright (C) 2022 Ventana Micro Systems Inc. -*/ -#ifndef __KVM_RISCV_AIA_IMSIC_H -#define __KVM_RISCV_AIA_IMSIC_H - -#include <linux/types.h> -#include <asm/csr.h> - -#define IMSIC_MMIO_PAGE_SHIFT 12 -#define IMSIC_MMIO_PAGE_SZ (1UL << IMSIC_MMIO_PAGE_SHIFT) -#define IMSIC_MMIO_PAGE_LE 0x00 -#define IMSIC_MMIO_PAGE_BE 0x04 - -#define IMSIC_MIN_ID 63 -#define IMSIC_MAX_ID 2048 - -#define IMSIC_EIDELIVERY 0x70 - -#define IMSIC_EITHRESHOLD 0x72 - -#define IMSIC_EIP0 0x80 -#define IMSIC_EIP63 0xbf -#define IMSIC_EIPx_BITS 32 - -#define IMSIC_EIE0 0xc0 -#define IMSIC_EIE63 0xff -#define IMSIC_EIEx_BITS 32 - -#define IMSIC_FIRST IMSIC_EIDELIVERY -#define IMSIC_LAST IMSIC_EIE63 - -#define IMSIC_MMIO_SETIPNUM_LE 0x00 -#define IMSIC_MMIO_SETIPNUM_BE 0x04 - -#endif
arch/riscv/kvm/aia.c +1 -1
@@ -10,12 +10,12 @@#include <linux/kernel.h> #include <linux/bitops.h> #include <linux/irq.h> +#include <linux/irqchip/riscv-imsic.h> #include <linux/irqdomain.h> #include <linux/kvm_host.h> #include <linux/percpu.h> #include <linux/spinlock.h> #include <asm/cpufeature.h> -#include <asm/kvm_aia_imsic.h> struct aia_hgei_control {raw_spinlock_t lock;
arch/riscv/kvm/aia_aplic.c +1 -1
@@ -7,12 +7,12 @@* Anup Patel <[email protected]> */ +#include <linux/irqchip/riscv-aplic.h> #include <linux/kvm_host.h> #include <linux/math.h> #include <linux/spinlock.h> #include <linux/swab.h> #include <kvm/iodev.h> -#include <asm/kvm_aia_aplic.h> struct aplic_irq {raw_spinlock_t lock;
arch/riscv/kvm/aia_device.c +1 -1
@@ -8,9 +8,9 @@*/ #include <linux/bits.h> +#include <linux/irqchip/riscv-imsic.h> #include <linux/kvm_host.h> #include <linux/uaccess.h> -#include <asm/kvm_aia_imsic.h> static void unlock_vcpus (struct kvm *kvm,int vcpu_lock_idx) {
arch/riscv/kvm/aia_imsic.c +1 -1
@@ -9,13 +9,13 @@#include <linux/atomic.h> #include <linux/bitmap.h> +#include <linux/irqchip/riscv-imsic.h> #include <linux/kvm_host.h> #include <linux/math.h> #include <linux/spinlock.h> #include <linux/swab.h> #include <kvm/iodev.h> #include <asm/csr.h> -#include <asm/kvm_aia_imsic.h> #define IMSIC_MAX_EIX (IMSIC_MAX_ID / BITS_PER_TYPE(u64))
Signature · 1 line
2.34.1
PATCH 2/2 RISC-V: KVM: Use IMSIC guest files when available
In reply to Anup PatelLet us discover and use IMSIC guest files from the IMSIC global config provided by the IMSIC irqchip driver.
--- arch/riscv/kvm/aia.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)
arch/riscv/kvm/aia.c +20 -13
@@ -394,6 +394,8 @@ int kvm_riscv_aia_alloc_hgei(int cpu, struct kvm_vcpu *owner, {int ret = -ENOENT ;unsigned long flags; +const struct imsic_global_config *gc; +const struct imsic_local_config *lc;struct aia_hgei_control *hgctrl =per_cpu_ptr (&aia_hgei, cpu);if (!kvm_riscv_aia_available () || !hgctrl)
@@ -409,11 +411,14 @@ int kvm_riscv_aia_alloc_hgei(int cpu, struct kvm_vcpu *owner,raw_spin_unlock_irqrestore (&hgctrl->lock, flags); -/* TODO: To be updated later by AIA IMSIC HW guest file support */ -if (hgei_va) - *hgei_va =NULL ; -if (hgei_pa) - *hgei_pa =0 ; + gc =imsic_get_global_config (); + lc = (gc) ?per_cpu_ptr (gc->local, cpu) :NULL ; +if (lc && ret >0 ) { +if (hgei_va) + *hgei_va = lc->msi_va + (ret *IMSIC_MMIO_PAGE_SZ ); +if (hgei_pa) + *hgei_pa = lc->msi_pa + (ret *IMSIC_MMIO_PAGE_SZ ); + }return ret; }
@@ -600,9 +605,11 @@ void kvm_riscv_aia_disable(void)int kvm_riscv_aia_init (void ) {int rc; +const struct imsic_global_config *gc;if (!riscv_isa_extension_available (NULL , SxAIA))return -ENODEV ; + gc =imsic_get_global_config ();/* Figure-out number of bits in HGEIE */ csr_write (CSR_HGEIE ,-1UL );
@@ -614,17 +621,17 @@ int kvm_riscv_aia_init(void)/* * Number of usable HGEI lines should be minimum of per-HART * IMSIC guest files and number of bits in HGEIE -* -* TODO: To be updated later by AIA IMSIC HW guest file support */ - kvm_riscv_aia_nr_hgei =0 ; +if (gc) + kvm_riscv_aia_nr_hgei =min ((ulong )kvm_riscv_aia_nr_hgei, +BIT (gc->guest_index_bits) -1 ); +else + kvm_riscv_aia_nr_hgei =0 ; -/* -* Find number of guest MSI IDs -* -* TODO: To be updated later by AIA IMSIC HW guest file support -*/ +/* Find number of guest MSI IDs */ kvm_riscv_aia_max_ids =IMSIC_MAX_ID ; +if (gc && kvm_riscv_aia_nr_hgei) + kvm_riscv_aia_max_ids = gc->nr_guest_ids +1 ;/* Initialize guest external interrupt line management */ rc =aia_hgei_init ();
Signature · 1 line
2.34.1
Anup Patel
maintainerQuoted 8 lines · On Thu, Apr 11, 2024 at 2:36?PM Anup Patel <[email protected]> wrote:
This series extends the HWACCEL and AUTO modes of AIA in-kernel irqchip to use HW IMSIC guest files whenever underlying host supports it.
This series depends upon the "Linux RISC-V AIA support" series which
is already queued for Linux-6.10.
(Refer, https://lore.kernel.org/lkml/20240307140307.646078-1-apatel at ventanamicro.com/)
Quoted 6 lines
These patches can also be found in the
riscv_kvm_aia_hwaccel_v1branch
at: https://github.com/avpatel/linux.gitAnup Patel (2):
RISC-V: KVM: Share APLIC and IMSIC defines with irqchip drivers
RISC-V: KVM: Use IMSIC guest files when available
Queued this series for Linux-6.11
Regards,
Anup
Quoted 14 lines
arch/riscv/include/asm/kvm_aia_aplic.h | 58 -------------------------- arch/riscv/include/asm/kvm_aia_imsic.h | 38 ----------------- arch/riscv/kvm/aia.c | 35 +++++++++------- arch/riscv/kvm/aia_aplic.c | 2 +- arch/riscv/kvm/aia_device.c | 2 +- arch/riscv/kvm/aia_imsic.c | 2 +- 6 files changed, 24 insertions(+), 113 deletions(-) delete mode 100644 arch/riscv/include/asm/kvm_aia_aplic.h delete mode 100644 arch/riscv/include/asm/kvm_aia_imsic.h--
2.34.1