kevin/linux
1
Fork 0
Code

RISC-V: KVM: Use IMSIC guest files when available

Browse Source 
Let us discover and use IMSIC guest files from the IMSIC global
config provided by the IMSIC irqchip driver.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Link: https://lore.kernel.org/r/20240411090639.237119-3-apatel@ventanamicro.com
Signed-off-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Anup Patel 2024-04-11 14:36:39 +05:30 committed by Anup Patel
parent e5b088c1dc
commit 3385339296
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/riscv/kvm/aia.c
View File

@ -394,6 +394,8 @@ int kvm_riscv_aia_alloc_hgei(int cpu, struct kvm_vcpu *owner,
{ {
int ret = -ENOENT; int ret = -ENOENT;
unsigned long flags; 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); struct aia_hgei_control *hgctrl = per_cpu_ptr(&aia_hgei, cpu);
if (!kvm_riscv_aia_available() || !hgctrl) 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); raw_spin_unlock_irqrestore(&hgctrl->lock, flags);
/* TODO: To be updated later by AIA IMSIC HW guest file support */ gc = imsic_get_global_config();
lc = (gc) ? per_cpu_ptr(gc->local, cpu) : NULL;
if (lc && ret > 0) {
if (hgei_va) if (hgei_va)
*hgei_va = NULL; *hgei_va = lc->msi_va + (ret * IMSIC_MMIO_PAGE_SZ);
if (hgei_pa) if (hgei_pa)
*hgei_pa = 0; *hgei_pa = lc->msi_pa + (ret * IMSIC_MMIO_PAGE_SZ);
}
return ret; return ret;
} }
@ -605,9 +610,11 @@ void kvm_riscv_aia_disable(void)
int kvm_riscv_aia_init(void) int kvm_riscv_aia_init(void)
{ {
int rc; int rc;
const struct imsic_global_config *gc;
if (!riscv_isa_extension_available(NULL, SxAIA)) if (!riscv_isa_extension_available(NULL, SxAIA))
return -ENODEV; return -ENODEV;
gc = imsic_get_global_config();
/* Figure-out number of bits in HGEIE */ /* Figure-out number of bits in HGEIE */
csr_write(CSR_HGEIE, -1UL); csr_write(CSR_HGEIE, -1UL);
@ -619,17 +626,17 @@ int kvm_riscv_aia_init(void)
/* /*
* Number of usable HGEI lines should be minimum of per-HART * Number of usable HGEI lines should be minimum of per-HART
* IMSIC guest files and number of bits in HGEIE * IMSIC guest files and number of bits in HGEIE
*
* TODO: To be updated later by AIA IMSIC HW guest file support
*/ */
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; kvm_riscv_aia_nr_hgei = 0;
/* /* Find number of guest MSI IDs */
* Find number of guest MSI IDs
*
* TODO: To be updated later by AIA IMSIC HW guest file support
*/
kvm_riscv_aia_max_ids = IMSIC_MAX_ID; 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 */ /* Initialize guest external interrupt line management */
rc = aia_hgei_init(); rc = aia_hgei_init();