hv: x86: move initialization functions from cpu.c to init.c

doc/acrn.doxyfile

@@ -806,9 +806,7 @@ INPUT                  =  custom-doxygen/mainpage.md \
                           ../hypervisor/include/dm/vpic.h \
                           ../hypervisor/include/dm/io_req.h \
                           ../hypervisor/include/arch/x86/guest/vmx_io.h \
-                          ../hypervisor/include/arch/x86/guest/assign.h \
                           ../hypervisor/include/common/hypercall.h \
-                          ../hypervisor/include/common/ptdev.h \
                           ../hypervisor/include/public/acrn_common.h \
                           ../hypervisor/include/public/acrn_hv_defs.h \
                           ../hypervisor/include/arch/x86/guest/vcpu.h \

doc/developer-guides/asm_coding_guidelines.rst

@@ -147,7 +147,7 @@ assembler.
 Compliant example::
 
     #include <types.h>
-    #include <spinlock.h>
+    #include <x86/lib/spinlock.h>
 
     .macro asm_showcase_mov
             movl    $0x1, %eax
@@ -163,7 +163,7 @@ Compliant example::
 
        .end
 
-       #include <spinlock.h>
+       #include <x86/lib/spinlock.h>
 
        .macro asm_showcase_mov
                movl    $0x1, %eax

doc/developer-guides/hld/hv-startup.rst

@@ -53,9 +53,9 @@ description for the flow:
    physical CPU, and to support CPU sharing.
 
 -  **Interrupt Init:** Initialize interrupt and exception for native HV
-   including IDT and ``do_IRQ`` infrastructure; a timer interrupt
+   including IDT and ``do_irq`` infrastructure; a timer interrupt
    framework is then built. The native/physical interrupts will go
-   through this ``do_IRQ`` infrastructure then distribute to special
+   through this ``do_irq`` infrastructure then distribute to special
    targets (HV or VMs).
 
 -  **Start AP:** BSP kicks ``INIT-SIPI-SIPI`` IPI sequence to start other

doc/developer-guides/hld/virtio-net.rst

@@ -296,7 +296,7 @@ cases.)
 
 .. code-block:: c
 
-   do_IRQ -->
+   do_irq -->
        ...
        igb_msix_ring -->
            igbpoll -->

hypervisor/Makefile

@@ -137,10 +137,7 @@ REL_INCLUDE_PATH += include
 REL_INCLUDE_PATH += include/lib
 REL_INCLUDE_PATH += include/lib/crypto
 REL_INCLUDE_PATH += include/common
-REL_INCLUDE_PATH += include/arch/x86
-REL_INCLUDE_PATH += include/arch/x86/boot
-REL_INCLUDE_PATH += include/arch/x86/guest
-REL_INCLUDE_PATH += include/arch/x86/lib
+REL_INCLUDE_PATH += include/arch/
 REL_INCLUDE_PATH += include/debug
 REL_INCLUDE_PATH += include/public
 REL_INCLUDE_PATH += include/dm
@@ -216,7 +213,13 @@ HW_C_SRCS += arch/x86/notify.c
 HW_C_SRCS += arch/x86/vtd.c
 HW_C_SRCS += arch/x86/gdt.c
 HW_C_SRCS += arch/x86/irq.c
-HW_C_SRCS += arch/x86/timer.c
+HW_C_SRCS += arch/x86/exception.c
+HW_C_SRCS += arch/x86/nmi.c
+HW_C_SRCS += arch/x86/tsc.c
+HW_C_SRCS += arch/x86/tsc_deadline_timer.c
+HW_C_SRCS += common/timer.c
+HW_C_SRCS += common/udelay.c
+HW_C_SRCS += common/cycles.c
 HW_C_SRCS += arch/x86/vmx.c
 HW_C_SRCS += arch/x86/cpu_state_tbl.c
 HW_C_SRCS += arch/x86/pm.c
@@ -226,6 +229,7 @@ HW_S_SRCS += arch/x86/sched.S
 HW_C_SRCS += arch/x86/rdt.c
 HW_C_SRCS += arch/x86/sgx.c
 HW_C_SRCS += common/softirq.c
+HW_C_SRCS += common/irq.c
 HW_C_SRCS += common/schedule.c
 HW_C_SRCS += common/event.c
 ifeq ($(CONFIG_SCHED_NOOP),y)
@@ -298,19 +302,19 @@ VP_DM_C_SRCS += dm/mmio_dev.c
 VP_DM_C_SRCS += dm/vgpio.c
 VP_DM_C_SRCS += arch/x86/guest/vlapic.c
 VP_DM_C_SRCS += arch/x86/guest/pm.c
-VP_DM_C_SRCS += arch/x86/guest/assign.c
 VP_DM_C_SRCS += arch/x86/guest/vmx_io.c
 VP_DM_C_SRCS += arch/x86/guest/instr_emul.c
 VP_DM_C_SRCS += arch/x86/guest/splitlock.c
 VP_DM_C_SRCS += arch/x86/guest/vm_reset.c
-VP_DM_C_SRCS += common/ptdev.c
+VP_DM_C_SRCS += arch/x86/ptirq.c
+VP_DM_C_SRCS += arch/x86/ptintr.c
+VP_DM_C_SRCS += common/ptirq.c
+VP_DM_C_SRCS += common/ptintr.c
 
 # virtual platform trusty
 VP_TRUSTY_C_SRCS += arch/x86/guest/trusty.c
 VP_TRUSTY_C_SRCS += common/trusty_hypercall.c
-VP_TRUSTY_C_SRCS += arch/x86/seed/seed.c
-VP_TRUSTY_C_SRCS += arch/x86/seed/seed_abl.c
-VP_TRUSTY_C_SRCS += arch/x86/seed/seed_sbl.c
+VP_TRUSTY_C_SRCS += crypto/seed.c
 
 # virtual platform hypercall
 VP_HCALL_C_SRCS += arch/x86/guest/vmcall.c

hypervisor/acpi_parser/acpi_ext.c

@@ -29,13 +29,14 @@
 #include <types.h>
 #include <rtl.h>
 #include "acpi.h"
-#include <pgtable.h>
-#include <ioapic.h>
+#include <x86/pgtable.h>
+#include <x86/apicreg.h>
+#include <x86/ioapic.h>
 #include <logmsg.h>
-#include <host_pm.h>
+#include <x86/host_pm.h>
 #include <pci.h>
 #include <acrn_common.h>
-#include <rtcm.h>
+#include <x86/rtcm.h>
 
 /* Per ACPI spec:
  * There are two fundamental types of ACPI tables:

hypervisor/acpi_parser/dmar_parse.c

@@ -6,11 +6,11 @@
 
 #include <types.h>
 #include <logmsg.h>
-#include <io.h>
-#include <spinlock.h>
-#include <cpu_caps.h>
+#include <x86/io.h>
+#include <x86/lib/spinlock.h>
+#include <x86/cpu_caps.h>
+#include <x86/vtd.h>
 #include "pci.h"
-#include "vtd.h"
 #include "acpi.h"
 
 static uint32_t dmar_unit_cnt;
@@ -105,7 +105,7 @@ static uint32_t get_drhd_dev_scope_cnt(struct acpi_dmar_hardware_unit *drhd)
 /**
  * @Application constraint: The dedicated DMAR unit for Intel integrated GPU
  * shall be available on the physical platform.
- */ 
+ */
 static int32_t handle_one_drhd(struct acpi_dmar_hardware_unit *acpi_drhd, struct dmar_drhd *drhd)
 {
 	struct dmar_dev_scope *dev_scope;
@@ -134,7 +134,7 @@ static int32_t handle_one_drhd(struct acpi_dmar_hardware_unit *acpi_drhd, struct
 		consumed = handle_dmar_devscope(dev_scope, cp, remaining);
 
 		/* Disable GPU IOMMU due to gvt-d hasn’t been enabled on APL yet. */
-		if (is_apl_platform()) {
+		if ((pcpu_family_id() == 0x6U) && (pcpu_model_id() == 0x5cU)) {
 			if (((drhd->segment << 16U) |
 		     	     (dev_scope->bus << 8U) |
 		     	     dev_scope->devfun) == CONFIG_GPU_SBDF) {

hypervisor/arch/x86/configs/pci_dev.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <vm_config.h>
+#include <x86/vm_config.h>
 #include <pci.h>
-#include <pci_dev.h>
+#include <x86/pci_dev.h>
 #include <vpci.h>
 
 /*

hypervisor/arch/x86/configs/vacpi.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <vm.h>
+#include <x86/guest/vm.h>
 #include <vacpi.h>
 
 /**

hypervisor/arch/x86/configs/vm_config.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <vm_config.h>
+#include <x86/vm_config.h>
 
 /*
  * @pre vm_id < CONFIG_MAX_VM_NUM