plat/common/include/x86/acpi: Move `MADT` definition to sdt.h

Since `MADT` is a System Descriptor Table itself, move it to `sdt.h`
and keep in `madt.h` only the `MADT` specific definitions.

Signed-off-by: Sergiu Moga <sergiu.moga@protonmail.com>
Reviewed-by: Dragos Petre <dragos.petre27@gmail.com>
Reviewed-by: Marco Schlumpp <marco@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #911

diff --git a/plat/common/include/x86/acpi/madt.h b/plat/common/include/x86/acpi/madt.h
index 615d5d9694f6ea73b3717d952d4652f750398578..002a3fbb577a2d4fe7851852c9556c736cdced34 100644 (file)
--- a/plat/common/include/x86/acpi/madt.h
+++ b/plat/common/include/x86/acpi/madt.h
@@ -37,15 +37,6 @@
 
 #include <x86/acpi/sdt.h>
 
-#define ACPI_MADT_SIG                                          "APIC"
-#define ACPI_MADT_FLAGS_PCAT_COMPAT                            0x0001
-struct acpi_madt {
-       struct acpi_sdt_hdr hdr;
-       __u32 lapic_paddr;
-       __u32 flags;
-       __u8 entries[];
-} __packed;
-
 #define ACPI_MADT_LAPIC                                                0x00
 #define ACPI_MADT_IO_APIC                                      0x01
 #define ACPI_MADT_IRQ_SRC_OVRD                                 0x02

diff --git a/plat/common/include/x86/acpi/sdt.h b/plat/common/include/x86/acpi/sdt.h
index d738fb0418205d7ed89efe233d71098ef6b543a9..bafa8fda46dcd7dff1469f4c9d3a95dab1037c2c 100644 (file)
--- a/plat/common/include/x86/acpi/sdt.h
+++ b/plat/common/include/x86/acpi/sdt.h
@@ -72,4 +72,13 @@ struct acpi_xsdt {
        __u64 entry[];
 } __packed;
 
+#define ACPI_MADT_SIG                                  "APIC"
+#define ACPI_MADT_FLAGS_PCAT_COMPAT                    0x0001
+struct acpi_madt {
+       struct acpi_sdt_hdr hdr;
+       __u32 lapic_paddr;
+       __u32 flags;
+       __u8 entries[];
+} __packed;
+
 #endif /* __PLAT_CMN_X86_SDT_H__ */