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

Commit 311b5b36 authored Jan 05, 2016 by Marc Zyngier

ARM: KVM: Remove unused hyp_pc field



This field was never populated, and the panic code already
does something similar. Delete the related code.

Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

parent ff3a01d1

arch/arm/include/asm/kvm_emulate.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -108,11 +108,6 @@ static inline phys_addr_t kvm_vcpu_get_fault_ipa(struct kvm_vcpu *vcpu)
		return ((phys_addr_t)vcpu->arch.fault.hpfar & HPFAR_MASK) << 8;
		}

		static inline unsigned long kvm_vcpu_get_hyp_pc(struct kvm_vcpu *vcpu)
		{
		return vcpu->arch.fault.hyp_pc;
		}

		static inline bool kvm_vcpu_dabt_isvalid(struct kvm_vcpu *vcpu)
		{
		return kvm_vcpu_get_hsr(vcpu) & HSR_ISV;

arch/arm/include/asm/kvm_host.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ struct kvm_vcpu_fault_info {
		u32 hsr; /* Hyp Syndrome Register */
		u32 hxfar; /* Hyp Data/Inst. Fault Address Register */
		u32 hpfar; /* Hyp IPA Fault Address Register */
		u32 hyp_pc; /* PC when exception was taken from Hyp mode */
		};

		/*

arch/arm/kernel/asm-offsets.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,6 @@ int main(void)
		DEFINE(CPU_CTXT_VFP, offsetof(struct kvm_cpu_context, vfp));
		DEFINE(CPU_CTXT_GP_REGS, offsetof(struct kvm_cpu_context, gp_regs));
		DEFINE(GP_REGS_USR, offsetof(struct kvm_regs, usr_regs));
		DEFINE(VCPU_HYP_PC, offsetof(struct kvm_vcpu, arch.fault.hyp_pc));
		#endif
		BLANK();
		#ifdef CONFIG_VDSO

arch/arm/kvm/handle_exit.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -147,11 +147,6 @@ int handle_exit(struct kvm_vcpu vcpu, struct kvm_run run,
		switch (exception_index) {
		case ARM_EXCEPTION_IRQ:
		return 1;
		case ARM_EXCEPTION_UNDEFINED:
		kvm_err("Undefined exception in Hyp mode at: %#08lx\n",
		kvm_vcpu_get_hyp_pc(vcpu));
		BUG();
		panic("KVM: Hypervisor undefined exception!\n");
		case ARM_EXCEPTION_DATA_ABORT:
		case ARM_EXCEPTION_PREF_ABORT:
		case ARM_EXCEPTION_HVC: