hv:cleanup header files for arch folder

cleanup arch folder, only include some necessary,
doesn't include hypervisor.h

Tracked-On: #1842
Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>

	modified:   arch/x86/configs/apl-mrb/pt_dev.c
	modified:   arch/x86/configs/apl-mrb/ve820.c
	modified:   arch/x86/configs/dnv-cb2/pt_dev.c
	modified:   arch/x86/configs/dnv-cb2/ve820.c
	modified:   arch/x86/configs/partition_config.c
	modified:   arch/x86/configs/sharing_config.c
	modified:   arch/x86/cpu.c
	modified:   arch/x86/cpu_state_tbl.c
	modified:   arch/x86/e820.c
	modified:   arch/x86/gdt.c
	modified:   arch/x86/init.c
	modified:   arch/x86/ioapic.c
	modified:   arch/x86/irq.c
	modified:   arch/x86/lapic.c
	modified:   arch/x86/mmu.c
	modified:   arch/x86/notify.c
	modified:   arch/x86/page.c
	modified:   arch/x86/pagetable.c
	modified:   arch/x86/static_checks.c
	modified:   arch/x86/timer.c
	modified:   arch/x86/trampoline.c
	modified:   arch/x86/vmx.c
	modified:   arch/x86/vtd.c
	modified:   boot/include/acpi.h
	modified:   include/arch/x86/e820.h
	modified:   include/arch/x86/ioapic.h

hypervisor/arch/x86/configs/apl-mrb/pt_dev.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <vm.h>
 
 struct acrn_vm_pci_ptdev_config vm0_pci_ptdevs[2] = {
 	{

hypervisor/arch/x86/configs/apl-mrb/ve820.c

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
 #include <e820.h>
 
 const struct e820_entry ve820_entry[E820_MAX_ENTRIES] = {

hypervisor/arch/x86/configs/dnv-cb2/pt_dev.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <vm.h>
 
 struct acrn_vm_pci_ptdev_config vm0_pci_ptdevs[3] = {
 	{

hypervisor/arch/x86/configs/dnv-cb2/ve820.c

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
 #include <e820.h>
 
 const struct e820_entry ve820_entry[E820_MAX_ENTRIES] = {

hypervisor/arch/x86/configs/partition_config.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <vm.h>
 #include <partition_config.h>
 
 #define INIT_VM_CONFIG(idx)	\

hypervisor/arch/x86/configs/sharing_config.c

@@ -3,8 +3,7 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-
-#include <hypervisor.h>
+#include <vm.h>
 #include <sos_vm.h>
 
 struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] __aligned(PAGE_SIZE) = {

hypervisor/arch/x86/cpu.c

@@ -4,15 +4,25 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
-#include <acpi.h>
-#include <schedule.h>
-#include <version.h>
-#include <trampoline.h>
+#include <types.h>
+#include <atomic.h>
+#include <bits.h>
+#include <page.h>
 #include <e820.h>
+#include <mmu.h>
+#include <lapic.h>
+#include <per_cpu.h>
+#include <cpufeatures.h>
 #include <cpu_caps.h>
-#include <security.h>
+#include <acpi.h>
+#include <ioapic.h>
+#include <trampoline.h>
+#include <cpuid.h>
+#include <version.h>
+#include <vmx.h>
+#include <vm.h>
 #include <ld_sym.h>
+#include <logmsg.h>
 
 struct per_cpu_region per_cpu_data[CONFIG_MAX_PCPU_NUM] __aligned(PAGE_SIZE);
 static uint16_t phys_cpu_num = 0U;

hypervisor/arch/x86/cpu_state_tbl.c

@@ -4,7 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <rtl.h>
+#include <acrn_common.h>
+#include <host_pm.h>
+#include <cpu_caps.h>
 
 /* The table includes cpu px info of Intel A3960 SoC */
 static const struct cpu_px_data px_a3960[] = {

hypervisor/arch/x86/e820.c

@@ -4,10 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
-#include <reloc.h>
-#include <multiboot.h>
+#include <types.h>
+#include <acrn_hv_defs.h>
+#include <page.h>
 #include <e820.h>
+#include <mmu.h>
+#include <multiboot.h>
+#include <logmsg.h>
 
 /*
  * e820.c contains the related e820 operations; like HV to get memory info for its MMU setup;

hypervisor/arch/x86/gdt.c

@@ -4,7 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <gdt.h>
+#include <per_cpu.h>
 
 static void set_tss_desc(struct tss_64_descriptor *desc,
 		uint64_t tss, size_t tss_limit, uint32_t type)

hypervisor/arch/x86/init.c

@@ -4,10 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <types.h>
 #include <init.h>
-#include <hypervisor.h>
-#include <schedule.h>
+#include <console.h>
+#include <per_cpu.h>
+#include <profiling.h>
 #include <vtd.h>
+#include <vmx.h>
+#include <vm.h>
+#include <logmsg.h>
 
 /* Push sp magic to top of stack for call trace */
 #define SWITCH_TO(rsp, to)                                              \

hypervisor/arch/x86/ioapic.c

@@ -4,9 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <errno.h>
+#include <spinlock.h>
 #include <ioapic.h>
+#include <irq.h>
+#include <pgtable.h>
+#include <io.h>
+#include <mmu.h>
 #include <acpi.h>
+#include <logmsg.h>
 
 #define	IOAPIC_MAX_PIN		240U
 #define IOAPIC_INVALID_ID	0xFFU

hypervisor/arch/x86/irq.c

@@ -4,9 +4,20 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
-#include <softirq.h>
+#include <types.h>
+#include <errno.h>
+#include <bits.h>
+#include <spinlock.h>
+#include <per_cpu.h>
+#include <io.h>
+#include <irq.h>
+#include <idt.h>
 #include <ioapic.h>
+#include <lapic.h>
+#include <softirq.h>
+#include <bsp_extern.h>
+#include <dump.h>
+#include <logmsg.h>
 
 static spinlock_t exception_spinlock = { .head = 0U, .tail = 0U, };
 static spinlock_t irq_alloc_spinlock = { .head = 0U, .tail = 0U, };

hypervisor/arch/x86/lapic.c

@@ -4,7 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <bits.h>
+#include <msr.h>
+#include <cpu.h>
+#include <per_cpu.h>
+#include <cpu_caps.h>
+#include <lapic.h>
 
 union lapic_base_msr {
 	uint64_t value;

hypervisor/arch/x86/mmu.c

@@ -27,10 +27,18 @@
  * $FreeBSD$
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <atomic.h>
+#include <page.h>
+#include <pgtable.h>
+#include <cpu_caps.h>
+#include <mmu.h>
+#include <vmx.h>
 #include <reloc.h>
-#include <e820.h>
+#include <vcpu.h>
+#include <vm.h>
 #include <ld_sym.h>
+#include <logmsg.h>
 
 static void *ppt_mmu_pml4_addr;
 static uint8_t sanitized_page[PAGE_SIZE] __aligned(PAGE_SIZE);

hypervisor/arch/x86/notify.c

@@ -4,7 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <errno.h>
+#include <bits.h>
+#include <atomic.h>
+#include <irq.h>
+#include <cpu.h>
+#include <per_cpu.h>
+#include <lapic.h>
 
 static uint32_t notification_irq = IRQ_INVALID;
 

hypervisor/arch/x86/page.c

@@ -3,7 +3,13 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <hypervisor.h>
+#include <types.h>
+#include <rtl.h>
+#include <pgtable.h>
+#include <page.h>
+#include <mmu.h>
+#include <vm.h>
+#include <trusty.h>
 
 static struct page ppt_pml4_pages[PML4_PAGE_NUM(CONFIG_PLATFORM_RAM_SIZE + PLATFORM_LO_MMIO_SIZE)];
 static struct page ppt_pdpt_pages[PDPT_PAGE_NUM(CONFIG_PLATFORM_RAM_SIZE + PLATFORM_LO_MMIO_SIZE)];

hypervisor/arch/x86/pagetable.c

@@ -3,7 +3,13 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <hypervisor.h>
+
+#include <types.h>
+#include <util.h>
+#include <acrn_hv_defs.h>
+#include <page.h>
+#include <mmu.h>
+#include <logmsg.h>
 
 #define ACRN_DBG_MMU	6U
 

hypervisor/arch/x86/static_checks.c

@@ -3,8 +3,13 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <hypervisor.h>
+
+#include <types.h>
+#include <util.h>
 #include <boot_context.h>
+#include <acrn_common.h>
+#include <vcpu.h>
+#include <trusty.h>
 
 #define CAT__(A,B) A ## B
 #define CAT_(A,B) CAT__(A,B)

hypervisor/arch/x86/timer.c

@@ -4,8 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <errno.h>
+#include <io.h>
+#include <cpuid.h>
+#include <cpu_caps.h>
 #include <softirq.h>
+#include <trace.h>
 
 #define MAX_TIMER_ACTIONS	32U
 #define CAL_MS			10U

hypervisor/arch/x86/trampoline.c

@@ -3,10 +3,13 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <hypervisor.h>
-#include <reloc.h>
+
+#include <types.h>
+#include <mmu.h>
+#include <per_cpu.h>
 #include <trampoline.h>
-#include <e820.h>
+#include <reloc.h>
+#include <bsp_extern.h>
 #include <ld_sym.h>
 
 static uint64_t trampoline_start16_paddr;

hypervisor/arch/x86/vmx.c

@@ -6,8 +6,9 @@
  * this file contains pure vmx operations
  */
 
-#include <hypervisor.h>
-#include <cpu.h>
+#include <types.h>
+#include <per_cpu.h>
+#include <pgtable.h>
 
 /**
  * @pre addr != NULL && addr is 4KB-aligned

hypervisor/arch/x86/vtd.c

@@ -6,8 +6,18 @@
 
 #define pr_prefix		"iommu: "
 
-#include <hypervisor.h>
+#include <types.h>
+#include <bits.h>
+#include <errno.h>
+#include <spinlock.h>
+#include <page.h>
+#include <pgtable.h>
+#include <irq.h>
+#include <io.h>
+#include <mmu.h>
+#include <lapic.h>
 #include <vtd.h>
+#include <logmsg.h>
 
 #define DBG_IOMMU 0
 
@@ -17,7 +27,6 @@
 #else
 #define ACRN_DBG_IOMMU 6U
 #endif
-
 #define LEVEL_WIDTH 9U
 
 #define ROOT_ENTRY_LOWER_PRESENT_POS        (0U)

hypervisor/boot/include/acpi.h

@@ -7,6 +7,7 @@
 #ifndef ACPI_H
 #define ACPI_H
 
+struct ioapic_info;
 uint16_t parse_madt(uint32_t lapic_id_array[CONFIG_MAX_PCPU_NUM]);
 uint16_t parse_madt_ioapic(struct ioapic_info *ioapic_id_array);
 

hypervisor/include/arch/x86/e820.h

@@ -6,6 +6,7 @@
 
 #ifndef E820_H
 #define E820_H
+#include <types.h>
 
 /* E820 memory types */
 #define E820_TYPE_RAM		1U	/* EFI 1, 2, 3, 4, 5, 6, 7 */

hypervisor/include/arch/x86/idt.h

@@ -26,7 +26,7 @@ union idt_64_descriptor {
 			uint32_t value;
 			struct {
 				uint32_t offset_15_0:16;
-				uint32_t segment_sel:16;
+				uint32_t seg_sel:16;
 			} bits;
 		} low32;
 		union {

hypervisor/include/arch/x86/ioapic.h

@@ -7,6 +7,8 @@
 #ifndef IOAPIC_H
 #define IOAPIC_H
 
+#include <apicreg.h>
+
 #define NR_LEGACY_IRQ		16U
 #define NR_LEGACY_PIN		NR_LEGACY_IRQ