Commit 33853392 authored by Anup Patel's avatar Anup Patel Committed by Anup Patel
Browse files

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



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

Signed-off-by: default avatarAnup Patel <apatel@ventanamicro.com>
Link: https://lore.kernel.org/r/20240411090639.237119-3-apatel@ventanamicro.com


Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent e5b088c1

arch/riscv/kvm/aia.c

+20 −13
Original line number Diff line number Diff line
@@ -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 */

	gc = imsic_get_global_config();

	lc = (gc) ? per_cpu_ptr(gc->local, cpu) : NULL;

	if (lc && ret > 0) {

		if (hgei_va)

		*hgei_va = NULL;

			*hgei_va = lc->msi_va + (ret * IMSIC_MMIO_PAGE_SZ);

		if (hgei_pa)

		*hgei_pa = 0;

			*hgei_pa = lc->msi_pa + (ret * IMSIC_MMIO_PAGE_SZ);

	}



	return ret;

}
@@ -605,9 +610,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);
@@ -619,17 +626,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

	 */

	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();