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

Commit dac288f7 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

ARM: KVM: use phys_addr_t instead of unsigned long long for HYP PGDs 



HYP PGDs are passed around as phys_addr_t, except just before calling
into the hypervisor init code, where they are cast to a rather weird
unsigned long long.

Just keep them around as phys_addr_t, which is what makes the most
sense.

Reported-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <cdall@cs.columbia.edu>
parent 368074d9

arch/arm/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ int kvm_arm_coproc_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *); 
int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,

		int exception_index);



static inline void __cpu_init_hyp_mode(unsigned long long boot_pgd_ptr,

				       unsigned long long pgd_ptr,

static inline void __cpu_init_hyp_mode(phys_addr_t boot_pgd_ptr,

				       phys_addr_t pgd_ptr,

				       unsigned long hyp_stack_ptr,

				       unsigned long vector_ptr)

{

arch/arm/kvm/arm.c

+4 −4
Original line number Diff line number Diff line
@@ -789,8 +789,8 @@ long kvm_arch_vm_ioctl(struct file *filp, 


static void cpu_init_hyp_mode(void *dummy)

{

	unsigned long long boot_pgd_ptr;

	unsigned long long pgd_ptr;

	phys_addr_t boot_pgd_ptr;

	phys_addr_t pgd_ptr;

	unsigned long hyp_stack_ptr;

	unsigned long stack_page;

	unsigned long vector_ptr;
@@ -798,8 +798,8 @@ static void cpu_init_hyp_mode(void *dummy) 
	/* Switch from the HYP stub to our own HYP init vector */

	__hyp_set_vectors(kvm_get_idmap_vector());



	boot_pgd_ptr = (unsigned long long)kvm_mmu_get_boot_httbr();

	pgd_ptr = (unsigned long long)kvm_mmu_get_httbr();

	boot_pgd_ptr = kvm_mmu_get_boot_httbr();

	pgd_ptr = kvm_mmu_get_httbr();

	stack_page = __get_cpu_var(kvm_arm_hyp_stack_page);

	hyp_stack_ptr = stack_page + PAGE_SIZE;

	vector_ptr = (unsigned long)__kvm_hyp_vector;