Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 807a3784 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm/arm64: Move ioremap calls to create_hyp_io_mappings 



Both HYP io mappings call ioremap, followed by create_hyp_io_mappings.
Let's move the ioremap call into create_hyp_io_mappings itself, which
simplifies the code a bit and allows for further refactoring.

Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent b4ef0499

arch/arm/include/asm/kvm_mmu.h

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ 
#include <asm/stage2_pgtable.h>



int create_hyp_mappings(void *from, void *to, pgprot_t prot);

int create_hyp_io_mappings(void *from, void *to, phys_addr_t);

int create_hyp_io_mappings(phys_addr_t phys_addr, size_t size,

			   void __iomem **kaddr);

void free_hyp_pgds(void);



void stage2_unmap_vm(struct kvm *kvm);

arch/arm64/include/asm/kvm_mmu.h

+2 −1
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ static inline unsigned long __kern_hyp_va(unsigned long v) 
#include <asm/stage2_pgtable.h>



int create_hyp_mappings(void *from, void *to, pgprot_t prot);

int create_hyp_io_mappings(void *from, void *to, phys_addr_t);

int create_hyp_io_mappings(phys_addr_t phys_addr, size_t size,

			   void __iomem **kaddr);

void free_hyp_pgds(void);



void stage2_unmap_vm(struct kvm *kvm);

virt/kvm/arm/mmu.c

+14 −10
Original line number Diff line number Diff line
@@ -709,26 +709,30 @@ int create_hyp_mappings(void *from, void *to, pgprot_t prot) 
}



/**

 * create_hyp_io_mappings - duplicate a kernel IO mapping into Hyp mode

 * @from:	The kernel start VA of the range

 * @to:		The kernel end VA of the range (exclusive)

 * create_hyp_io_mappings - Map IO into both kernel and HYP

 * @phys_addr:	The physical start address which gets mapped

 * @size:	Size of the region being mapped

 * @kaddr:	Kernel VA for this mapping

 *

 * The resulting HYP VA is the same as the kernel VA, modulo

 * HYP_PAGE_OFFSET.

 */

int create_hyp_io_mappings(void *from, void *to, phys_addr_t phys_addr)

int create_hyp_io_mappings(phys_addr_t phys_addr, size_t size,

			   void __iomem **kaddr)

{

	unsigned long start = kern_hyp_va((unsigned long)from);

	unsigned long end = kern_hyp_va((unsigned long)to);

	unsigned long start, end;



	if (is_kernel_in_hyp_mode())

	*kaddr = ioremap(phys_addr, size);

	if (!*kaddr)

		return -ENOMEM;



	if (is_kernel_in_hyp_mode()) {

		return 0;

	}



	/* Check for a valid kernel IO mapping */

	if (!is_vmalloc_addr(from) || !is_vmalloc_addr(to - 1))

		return -EINVAL;



	start = kern_hyp_va((unsigned long)*kaddr);

	end = kern_hyp_va((unsigned long)*kaddr + size);

	return __create_hyp_mappings(hyp_pgd, PTRS_PER_PGD, start, end,

				     __phys_to_pfn(phys_addr), PAGE_HYP_DEVICE);

}

virt/kvm/arm/vgic/vgic-v2.c

+8 −23
Original line number Diff line number Diff line
@@ -360,16 +360,10 @@ int vgic_v2_probe(const struct gic_kvm_info *info) 
	if (!PAGE_ALIGNED(info->vcpu.start) ||

	    !PAGE_ALIGNED(resource_size(&info->vcpu))) {

		kvm_info("GICV region size/alignment is unsafe, using trapping (reduced performance)\n");

		kvm_vgic_global_state.vcpu_base_va = ioremap(info->vcpu.start,

							     resource_size(&info->vcpu));

		if (!kvm_vgic_global_state.vcpu_base_va) {

			kvm_err("Cannot ioremap GICV\n");

			return -ENOMEM;

		}



		ret = create_hyp_io_mappings(kvm_vgic_global_state.vcpu_base_va,

					     kvm_vgic_global_state.vcpu_base_va + resource_size(&info->vcpu),

					     info->vcpu.start);

		ret = create_hyp_io_mappings(info->vcpu.start,

					     resource_size(&info->vcpu),

					     &kvm_vgic_global_state.vcpu_base_va);

		if (ret) {

			kvm_err("Cannot map GICV into hyp\n");

			goto out;
@@ -378,26 +372,17 @@ int vgic_v2_probe(const struct gic_kvm_info *info) 
		static_branch_enable(&vgic_v2_cpuif_trap);

	}



	kvm_vgic_global_state.vctrl_base = ioremap(info->vctrl.start,

						   resource_size(&info->vctrl));

	if (!kvm_vgic_global_state.vctrl_base) {

		kvm_err("Cannot ioremap GICH\n");

		ret = -ENOMEM;

		goto out;

	}



	vtr = readl_relaxed(kvm_vgic_global_state.vctrl_base + GICH_VTR);

	kvm_vgic_global_state.nr_lr = (vtr & 0x3f) + 1;



	ret = create_hyp_io_mappings(kvm_vgic_global_state.vctrl_base,

				     kvm_vgic_global_state.vctrl_base +

	ret = create_hyp_io_mappings(info->vctrl.start,

				     resource_size(&info->vctrl),

				     info->vctrl.start);

				     &kvm_vgic_global_state.vctrl_base);

	if (ret) {

		kvm_err("Cannot map VCTRL into hyp\n");

		goto out;

	}



	vtr = readl_relaxed(kvm_vgic_global_state.vctrl_base + GICH_VTR);

	kvm_vgic_global_state.nr_lr = (vtr & 0x3f) + 1;



	ret = kvm_register_vgic_device(KVM_DEV_TYPE_ARM_VGIC_V2);

	if (ret) {

		kvm_err("Cannot register GICv2 KVM device\n");