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

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

KVM: arm/arm64: Move arm64-only vgic-v2-sr.c file to arm64 



The vgic-v2-sr.c file now only contains the logic to replay unaligned
accesses to the virtual CPU interface on 16K and 64K page systems, which
is only relevant on 64-bit platforms.  Therefore move this file to the
arm64 KVM tree, remove the compile directive from the 32-bit side
makefile, and remove the ifdef in the C file.

Since this file also no longer saves/restores anything, rename the file
to vgic-v2-cpuif-proxy.c to more accurately describe the logic in this
file.

Reviewed-by: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 75174ba6

arch/arm/kvm/hyp/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,6 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING 




KVM=../../../../virt/kvm

KVM=../../../../virt/kvm





obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o

arch/arm64/kvm/hyp/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,10 +7,10 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING 




KVM=../../../../virt/kvm

KVM=../../../../virt/kvm





obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o





obj-$(CONFIG_KVM_ARM_HOST) += vgic-v2-cpuif-proxy.o

obj-$(CONFIG_KVM_ARM_HOST) += sysreg-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += sysreg-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += debug-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += debug-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += entry.o

obj-$(CONFIG_KVM_ARM_HOST) += entry.o

virt/kvm/arm/hyp/vgic-v2-sr.c→arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <asm/kvm_hyp.h>

#include <asm/kvm_hyp.h>

#include <asm/kvm_mmu.h>

#include <asm/kvm_mmu.h>





#ifdef CONFIG_ARM64

/*

/*

 * __vgic_v2_perform_cpuif_access -- perform a GICV access on behalf of the

 * __vgic_v2_perform_cpuif_access -- perform a GICV access on behalf of the

 *				     guest.

 *				     guest.
@@ -77,4 +76,3 @@ int __hyp_text __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu) 




	return 1;

	return 1;

}
 
}
 
#endif