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

KVM: arm/arm64: Factor out hypercall handling from PSCI code 



We currently intertwine the KVM PSCI implementation with the general
dispatch of hypercall handling, which makes perfect sense because PSCI
is the only category of hypercalls we support.

However, as we are about to support additional hypercalls, factor out
this functionality into a separate hypercall handler file.

Signed-off-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
[steven.price@arm.com: rebased]
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarSteven Price <steven.price@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 6a745848

arch/arm/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ obj-y += kvm-arm.o init.o interrupts.o 
obj-y += handle_exit.o guest.o emulate.o reset.o

obj-y += coproc.o coproc_a15.o coproc_a7.o   vgic-v3-coproc.o

obj-y += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o

obj-y += $(KVM)/arm/psci.o $(KVM)/arm/perf.o

obj-y += $(KVM)/arm/psci.o $(KVM)/arm/perf.o $(KVM)/arm/hypercalls.o

obj-y += $(KVM)/arm/aarch32.o



obj-y += $(KVM)/arm/vgic/vgic.o

arch/arm/kvm/handle_exit.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <asm/kvm_emulate.h>

#include <asm/kvm_coproc.h>

#include <asm/kvm_mmu.h>

#include <kvm/arm_psci.h>

#include <kvm/arm_hypercalls.h>

#include <trace/events/kvm.h>



#include "trace.h"

arch/arm64/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ obj-$(CONFIG_KVM_ARM_HOST) += hyp/ 
kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o

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

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

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



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

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

arch/arm64/kvm/handle_exit.c

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
#include <linux/kvm.h>

#include <linux/kvm_host.h>



#include <kvm/arm_psci.h>



#include <asm/esr.h>

#include <asm/exception.h>

#include <asm/kvm_asm.h>
@@ -22,6 +20,8 @@ 
#include <asm/debug-monitors.h>

#include <asm/traps.h>



#include <kvm/arm_hypercalls.h>



#define CREATE_TRACE_POINTS

#include "trace.h"

include/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ header-test- += keys/big_key-type.h 
header-test-			+= keys/request_key_auth-type.h

header-test-			+= keys/trusted.h

header-test-			+= kvm/arm_arch_timer.h

header-test-$(CONFIG_ARM)	+= kvm/arm_hypercalls.h

header-test-$(CONFIG_ARM64)	+= kvm/arm_hypercalls.h

header-test-			+= kvm/arm_pmu.h

header-test-$(CONFIG_ARM)	+= kvm/arm_psci.h

header-test-$(CONFIG_ARM64)	+= kvm/arm_psci.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE