[PATCH 12/26] KVM: arm64: Move arm_{psci,hypercalls}.h to an internal KVM path
Sean Christopherson
seanjc at google.com
Fri Sep 15 17:31:04 PDT 2023
From: Anish Ghulati <aghulati at google.com>
Move arm_hypercalls.h and arm_psci.h into arch/arm64/kvm now that KVM
no longer supports 32-bit ARM, i.e. now that there's no reason to make
the hypercall and PSCI APIs "public".
Signed-off-by: Anish Ghulati <aghulati at google.com>
[sean: squash into one patch, write changelog]
Signed-off-by: Sean Christopherson <seanjc at google.com>
---
arch/arm64/kvm/arm.c | 5 +++--
{include => arch/arm64}/kvm/arm_hypercalls.h | 0
{include => arch/arm64}/kvm/arm_psci.h | 0
arch/arm64/kvm/guest.c | 2 +-
arch/arm64/kvm/handle_exit.c | 2 +-
arch/arm64/kvm/hyp/Makefile | 4 ++--
arch/arm64/kvm/hyp/include/hyp/switch.h | 4 ++--
arch/arm64/kvm/hyp/nvhe/switch.c | 4 ++--
arch/arm64/kvm/hyp/vhe/switch.c | 4 ++--
arch/arm64/kvm/hypercalls.c | 4 ++--
arch/arm64/kvm/psci.c | 4 ++--
arch/arm64/kvm/pvtime.c | 2 +-
arch/arm64/kvm/trng.c | 2 +-
13 files changed, 19 insertions(+), 18 deletions(-)
rename {include => arch/arm64}/kvm/arm_hypercalls.h (100%)
rename {include => arch/arm64}/kvm/arm_psci.h (100%)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 4866b3f7b4ea..6de1d63b981b 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -41,9 +41,10 @@
#include <asm/kvm_emulate.h>
#include <asm/sections.h>
-#include <kvm/arm_hypercalls.h>
#include <kvm/arm_pmu.h>
-#include <kvm/arm_psci.h>
+
+#include "arm_hypercalls.h"
+#include "arm_psci.h"
static enum kvm_mode kvm_mode = KVM_MODE_DEFAULT;
diff --git a/include/kvm/arm_hypercalls.h b/arch/arm64/kvm/arm_hypercalls.h
similarity index 100%
rename from include/kvm/arm_hypercalls.h
rename to arch/arm64/kvm/arm_hypercalls.h
diff --git a/include/kvm/arm_psci.h b/arch/arm64/kvm/arm_psci.h
similarity index 100%
rename from include/kvm/arm_psci.h
rename to arch/arm64/kvm/arm_psci.h
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 95f6945c4432..32045ad51ec4 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -18,7 +18,6 @@
#include <linux/string.h>
#include <linux/vmalloc.h>
#include <linux/fs.h>
-#include <kvm/arm_hypercalls.h>
#include <asm/cputype.h>
#include <linux/uaccess.h>
#include <asm/fpsimd.h>
@@ -27,6 +26,7 @@
#include <asm/kvm_nested.h>
#include <asm/sigcontext.h>
+#include "arm_hypercalls.h"
#include "trace.h"
const struct _kvm_stats_desc kvm_vm_stats_desc[] = {
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
index 617ae6dea5d5..f1d02d6f8683 100644
--- a/arch/arm64/kvm/handle_exit.c
+++ b/arch/arm64/kvm/handle_exit.c
@@ -21,7 +21,7 @@
#include <asm/stacktrace/nvhe.h>
#include <asm/traps.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
#define CREATE_TRACE_POINTS
#include "trace_handle_exit.h"
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index a38dea6186c9..4ce8c86967b5 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -4,7 +4,7 @@
#
incdir := $(srctree)/$(src)/include
-subdir-asflags-y := -I$(incdir)
-subdir-ccflags-y := -I$(incdir)
+subdir-asflags-y := -I$(incdir) -I$(srctree)/arch/arm64/kvm
+subdir-ccflags-y := -I$(incdir) -I$(srctree)/arch/arm64/kvm
obj-$(CONFIG_KVM) += vhe/ nvhe/ pgtable.o
diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h
index 9cfe6bd1dbe4..cd21cf71d7db 100644
--- a/arch/arm64/kvm/hyp/include/hyp/switch.h
+++ b/arch/arm64/kvm/hyp/include/hyp/switch.h
@@ -16,8 +16,6 @@
#include <linux/jump_label.h>
#include <uapi/linux/psci.h>
-#include <kvm/arm_psci.h>
-
#include <asm/barrier.h>
#include <asm/cpufeature.h>
#include <asm/extable.h>
@@ -31,6 +29,8 @@
#include <asm/debug-monitors.h>
#include <asm/processor.h>
+#include "arm_psci.h"
+
struct kvm_exception_table_entry {
int insn, fixup;
};
diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c
index c353a06ee7e6..c0553ac36a46 100644
--- a/arch/arm64/kvm/hyp/nvhe/switch.c
+++ b/arch/arm64/kvm/hyp/nvhe/switch.c
@@ -13,8 +13,6 @@
#include <linux/jump_label.h>
#include <uapi/linux/psci.h>
-#include <kvm/arm_psci.h>
-
#include <asm/barrier.h>
#include <asm/cpufeature.h>
#include <asm/kprobes.h>
@@ -29,6 +27,8 @@
#include <nvhe/fixed_config.h>
#include <nvhe/mem_protect.h>
+#include "arm_psci.h"
+
/* Non-VHE specific context */
DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data);
DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt);
diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c
index 6537f58b1a8c..f7423c890b5c 100644
--- a/arch/arm64/kvm/hyp/vhe/switch.c
+++ b/arch/arm64/kvm/hyp/vhe/switch.c
@@ -13,8 +13,6 @@
#include <linux/percpu.h>
#include <uapi/linux/psci.h>
-#include <kvm/arm_psci.h>
-
#include <asm/barrier.h>
#include <asm/cpufeature.h>
#include <asm/kprobes.h>
@@ -28,6 +26,8 @@
#include <asm/thread_info.h>
#include <asm/vectors.h>
+#include "arm_psci.h"
+
/* VHE specific context */
DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data);
DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt);
diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index 7fb4df0456de..d34a31c9ace2 100644
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -6,8 +6,8 @@
#include <asm/kvm_emulate.h>
-#include <kvm/arm_hypercalls.h>
-#include <kvm/arm_psci.h>
+#include "arm_hypercalls.h"
+#include "arm_psci.h"
#define KVM_ARM_SMCCC_STD_FEATURES \
GENMASK(KVM_REG_ARM_STD_BMAP_BIT_COUNT - 1, 0)
diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c
index 1f69b667332b..c461e15026c9 100644
--- a/arch/arm64/kvm/psci.c
+++ b/arch/arm64/kvm/psci.c
@@ -13,8 +13,8 @@
#include <asm/cputype.h>
#include <asm/kvm_emulate.h>
-#include <kvm/arm_psci.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
+#include "arm_psci.h"
/*
* This is an implementation of the Power State Coordination Interface
diff --git a/arch/arm64/kvm/pvtime.c b/arch/arm64/kvm/pvtime.c
index 4ceabaa4c30b..b07d250d223c 100644
--- a/arch/arm64/kvm/pvtime.c
+++ b/arch/arm64/kvm/pvtime.c
@@ -8,7 +8,7 @@
#include <asm/kvm_mmu.h>
#include <asm/pvclock-abi.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
void kvm_update_stolen_time(struct kvm_vcpu *vcpu)
{
diff --git a/arch/arm64/kvm/trng.c b/arch/arm64/kvm/trng.c
index 99bdd7103c9c..b5dc0f09797a 100644
--- a/arch/arm64/kvm/trng.c
+++ b/arch/arm64/kvm/trng.c
@@ -6,7 +6,7 @@
#include <asm/kvm_emulate.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
#define ARM_SMCCC_TRNG_VERSION_1_0 0x10000UL
--
2.42.0.459.ge4e396fd5e-goog
More information about the linux-riscv
mailing list