ANDROID: KVM: arm64: Move pKVM module for headers to its own dir.

This allows better isolation about what headers are exported to modules.

Bug: 416603216
Bug: 357781595
Change-Id: I9634f9d5c55e203a00c4b1bb1043c57bcfd4ff81
Signed-off-by: HONG Yifan <elsk@google.com>

arch/arm64/include/asm/kvm_hypevents.h

@@ -4,7 +4,7 @@
 #define __ARM64_KVM_HYPEVENTS_H_
 
 #ifdef __KVM_NVHE_HYPERVISOR__
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 #endif
 
 /*

arch/arm64/kvm/hyp/Makefile

@@ -7,4 +7,8 @@ incdir := $(src)/include
 subdir-asflags-y := -I$(incdir)
 subdir-ccflags-y := -I$(incdir)
 
+# ANDROID: Add -I for tracing
+subdir-asflags-y += -I$(incdir)/module
+subdir-ccflags-y += -I$(incdir)/module
+
 obj-$(CONFIG_KVM) += vhe/ nvhe/ pgtable.o

arch/arm64/kvm/hyp/nvhe/Makefile.module

@@ -5,4 +5,5 @@ $(obj)/hyp.lds: arch/arm64/kvm/hyp/nvhe/module.lds.S FORCE
 
 include $(srctree)/arch/arm64/kvm/hyp/nvhe/Makefile.nvhe
 
-ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/nvhe/trace/ -DMODULE
+ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/module/nvhe
+ccflags-y += -DMODULE

arch/arm64/kvm/hyp/nvhe/events.c

@@ -5,9 +5,9 @@
 
 #include <nvhe/mm.h>
 #include <nvhe/mem_protect.h>
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 
-#include <nvhe/trace/define_events.h>
+#include <nvhe/define_events.h>
 
 extern struct hyp_event_id __hyp_event_ids_start[];
 extern struct hyp_event_id __hyp_event_ids_end[];

arch/arm64/kvm/hyp/nvhe/hyp-main.c

@@ -26,7 +26,7 @@
 #include <nvhe/mm.h>
 #include <nvhe/pkvm.h>
 #include <nvhe/pviommu-host.h>
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 #include <nvhe/trap_handler.h>
 
 #include <linux/irqchip/arm-gic-v3.h>

arch/arm64/kvm/hyp/nvhe/modules.c

@@ -14,7 +14,7 @@
 #include <nvhe/mm.h>
 #include <nvhe/serial.h>
 #include <nvhe/spinlock.h>
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 #include <nvhe/trap_handler.h>
 
 static void *__pkvm_module_memcpy(void *to, const void *from, size_t count)

arch/arm64/kvm/hyp/nvhe/setup.c

@@ -19,7 +19,7 @@
 #include <nvhe/mm.h>
 #include <nvhe/pkvm.h>
 #include <nvhe/serial.h>
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 #include <nvhe/trap_handler.h>
 
 unsigned long hyp_nr_cpus;

arch/arm64/kvm/hyp/nvhe/trace.c

@@ -8,7 +8,7 @@
 #include <nvhe/clock.h>
 #include <nvhe/mem_protect.h>
 #include <nvhe/mm.h>
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 
 #include <asm/percpu.h>
 #include <asm/kvm_mmu.h>