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

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

arm64: KVM: Move the AArch32 conditional execution to common code 



It would make some sense to share the conditional execution code
between 32 and 64bit. In order to achieve this, let's move that
code to virt/kvm/arm/aarch32.c. While we're at it, drop a
superfluous BUG_ON() that wasn't that useful.

Following patches will migrate the 32bit port to that code base.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 3e51d435

arch/arm/kvm/emulate.c

+1 −3
Original line number Diff line number Diff line
@@ -221,9 +221,7 @@ static void kvm_adjust_itstate(struct kvm_vcpu *vcpu) 
	unsigned long cpsr = *vcpu_cpsr(vcpu);

	bool is_arm = !(cpsr & PSR_T_BIT);



	BUG_ON(is_arm && (cpsr & PSR_IT_MASK));



	if (!(cpsr & PSR_IT_MASK))

	if (is_arm || !(cpsr & PSR_IT_MASK))

		return;



	cond = (cpsr & 0xe000) >> 13;

arch/arm64/kvm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/e 
kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/arm.o $(ARM)/mmu.o $(ARM)/mmio.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/psci.o $(ARM)/perf.o



kvm-$(CONFIG_KVM_ARM_HOST) += emulate.o inject_fault.o regmap.o

kvm-$(CONFIG_KVM_ARM_HOST) += inject_fault.o regmap.o

kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o

kvm-$(CONFIG_KVM_ARM_HOST) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/aarch32.o



kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-init.o

arch/arm64/kvm/emulate.c→virt/kvm/arm/aarch32.c

+1 −3
Original line number Diff line number Diff line
@@ -109,9 +109,7 @@ static void kvm_adjust_itstate(struct kvm_vcpu *vcpu) 
	unsigned long cpsr = *vcpu_cpsr(vcpu);

	bool is_arm = !(cpsr & COMPAT_PSR_T_BIT);



	BUG_ON(is_arm && (cpsr & COMPAT_PSR_IT_MASK));



	if (!(cpsr & COMPAT_PSR_IT_MASK))

	if (is_arm || !(cpsr & COMPAT_PSR_IT_MASK))

		return;



	cond = (cpsr & 0xe000) >> 13;