trivial: fix header files

Signed-off-by: Curtis Millar <curtis.millar@data61.csiro.au>

include/arch/x86/arch/32/mode/model/statedata.h

@@ -10,6 +10,7 @@
 #include <config.h>
 #include <object/structures.h>
 #include <arch/types.h>
+#include <model/statedata.h>
 
 extern pde_t ia32KSGlobalPD[BIT(PD_INDEX_BITS)];
 extern pte_t ia32KSGlobalPT[BIT(PT_INDEX_BITS)];

include/arch/x86/arch/64/mode/machine.h

@@ -7,11 +7,11 @@
 #pragma once
 
 #include <config.h>
+#include <hardware.h>
 #include <arch/model/statedata.h>
 #include <arch/machine/cpu_registers.h>
 #include <arch/model/smp.h>
 #include <arch/machine.h>
-#include <plat_mode/machine/hardware.h>
 
 static inline cr3_t makeCR3(paddr_t addr, word_t pcid)
 {

include/arch/x86/arch/machine/timer.h

@@ -12,6 +12,7 @@
 
 #ifdef CONFIG_KERNEL_MCS
 #include <mode/util.h>
+#include <arch/kernel/xapic.h>
 
 static inline CONST time_t getKernelWcetUs(void)
 {

include/hardware.h

@@ -5,8 +5,6 @@
  */
 #pragma once
 
-#include <mode/hardware.h>
-
 /* Each architecture defines a set of constants in #defines. These
  * constants describe the memory regions of the kernel's portion of the
  * address space including the physical memory window, the kernel ELF
@@ -53,3 +51,5 @@ extern char ki_end[];
 #define KERNEL_ELF_PADDR_TOP (KERNEL_ELF_TOP - KERNEL_ELF_BASE_OFFSET)
 
 #endif /* __ASSEMBLER__ */
+
+#include <mode/hardware.h>

include/plat/pc99/plat/64/plat_mode/machine/hardware.h

@@ -116,14 +116,14 @@ compile_assert(user_top_tlbbitmap_no_overlap, GET_PML4_INDEX(USER_TOP) != GET_PM
 static inline void *CONST
 paddr_to_kpptr(paddr_t paddr)
 {
-    assert(paddr < PADDR_HIGH_TOP);
-    return (void *)(paddr + KERNEL_BASE_OFFSET);
+    assert(paddr < KERNEL_ELF_PADDR_TOP);
+    return (void *)(paddr + KERNEL_ELF_BASE_OFFSET);
 }
 
 static inline paddr_t CONST kpptr_to_paddr(void *pptr)
 {
-    assert((word_t)pptr >= KERNEL_BASE);
-    return (paddr_t)pptr - KERNEL_BASE_OFFSET;
+    assert((word_t)pptr >= KERNEL_ELF_BASE);
+    return (paddr_t)pptr - KERNEL_ELF_BASE_OFFSET;
 }
 
 #endif /* __ASSEMBLER__ */

src/arch/x86/64/traps.S

@@ -6,7 +6,7 @@
 
 #include <machine/assembler.h>
 #include <config.h>
-#include <plat_mode/machine/hardware.h>
+#include <hardware.h>
 
 /*
  * The exception in 64-bit mode:

src/arch/x86/kernel/boot_sys.c

@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <util.h>
+#include <hardware.h>
 #include <machine/io.h>
 #include <arch/machine.h>
 #include <arch/kernel/apic.h>

src/kernel/boot.c

@@ -14,7 +14,7 @@
 #include <arch/kernel/boot.h>
 #include <arch/kernel/vspace.h>
 #include <linker.h>
-#include <plat/machine/hardware.h>
+#include <hardware.h>
 #include <util.h>
 
 /* (node-local) state accessed only during bootstrapping */