Commit 096f31c4 authored by Christoffer Dall's avatar Christoffer Dall Committed by Christoffer Dall
Browse files

KVM: arm/arm64: vgic: Get rid of MISR and EISR fields 



We don't use these fields anymore so let's nuke them completely.

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

include/kvm/arm_vgic.h

+0 −4
Original line number Diff line number Diff line
@@ -225,8 +225,6 @@ struct vgic_dist { 
struct vgic_v2_cpu_if {

	u32		vgic_hcr;

	u32		vgic_vmcr;

	u32		vgic_misr;	/* Saved only */

	u64		vgic_eisr;	/* Saved only */

	u64		vgic_elrsr;	/* Saved only */

	u32		vgic_apr;

	u32		vgic_lr[VGIC_V2_MAX_LRS];
@@ -236,8 +234,6 @@ struct vgic_v3_cpu_if { 
	u32		vgic_hcr;

	u32		vgic_vmcr;

	u32		vgic_sre;	/* Restored only, change ignored */

	u32		vgic_misr;	/* Saved only */

	u32		vgic_eisr;	/* Saved only */

	u32		vgic_elrsr;	/* Saved only */

	u32		vgic_ap0r[4];

	u32		vgic_ap1r[4];

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

+0 −2
Original line number Diff line number Diff line
@@ -77,9 +77,7 @@ void __hyp_text __vgic_v2_save_state(struct kvm_vcpu *vcpu) 


		writel_relaxed(0, base + GICH_HCR);

	} else {

		cpu_if->vgic_eisr = 0;

		cpu_if->vgic_elrsr = ~0UL;

		cpu_if->vgic_misr = 0;

		cpu_if->vgic_apr = 0;

	}

}

virt/kvm/arm/hyp/vgic-v3-sr.c

+0 −2
Original line number Diff line number Diff line
@@ -170,8 +170,6 @@ void __hyp_text __vgic_v3_save_state(struct kvm_vcpu *vcpu) 
			cpu_if->vgic_ap1r[0] = read_gicreg(ICH_AP1R0_EL2);

		}

	} else {

		cpu_if->vgic_misr  = 0;

		cpu_if->vgic_eisr  = 0;

		cpu_if->vgic_elrsr = 0xffff;

		cpu_if->vgic_ap0r[0] = 0;

		cpu_if->vgic_ap0r[1] = 0;