x86: acpi: Adjust order in acpi_table.c

[u-boot] / arch / x86 / include / asm / global_data.h

diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index f7e3889df07ef4a25181675bb5b3dd14b0dbe79b..3bc2ac24cf3e6a6f2a7af33a609efad70869d769 100644 (file)
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -10,6 +10,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/processor.h>
+
 enum pei_boot_mode_t {
        PEI_BOOT_NONE = 0,
        PEI_BOOT_SOFT_RESET,
@@ -17,6 +19,29 @@ enum pei_boot_mode_t {
 
 };
 
+struct dimm_info {
+       uint32_t dimm_size;
+       uint16_t ddr_type;
+       uint16_t ddr_frequency;
+       uint8_t rank_per_dimm;
+       uint8_t channel_num;
+       uint8_t dimm_num;
+       uint8_t bank_locator;
+       /* The 5th byte is '\0' for the end of string */
+       uint8_t serial[5];
+       /* The 19th byte is '\0' for the end of string */
+       uint8_t module_part_number[19];
+       uint16_t mod_id;
+       uint8_t mod_type;
+       uint8_t bus_width;
+} __packed;
+
+struct pei_memory_info {
+       uint8_t dimm_cnt;
+       /* Maximum num of dimm is 8 */
+       struct dimm_info dimm[8];
+} __packed;
+
 struct memory_area {
        uint64_t start;
        uint64_t size;
@@ -44,6 +69,7 @@ struct mtrr_request {
 
 /* Architecture-specific global data */
 struct arch_global_data {
+       u64 gdt[X86_GDT_NUM_ENTRIES] __aligned(16);
        struct global_data *gd_addr;    /* Location of Global Data */
        uint8_t x86;                    /* CPU family */
        uint8_t x86_vendor;             /* CPU vendor */
@@ -51,14 +77,12 @@ struct arch_global_data {
        uint8_t x86_mask;
        uint32_t x86_device;
        uint64_t tsc_base;              /* Initial value returned by rdtsc() */
-       uint32_t tsc_base_kclocks;      /* Initial tsc as a kclocks value */
-       uint32_t tsc_prev;              /* For show_boot_progress() */
-       uint32_t tsc_mhz;               /* TSC frequency in MHz */
        void *new_fdt;                  /* Relocated FDT */
        uint32_t bist;                  /* Built-in self test value */
        enum pei_boot_mode_t pei_boot_mode;
        const struct pch_gpio_map *gpio_map;    /* board GPIO map */
        struct memory_info meminfo;     /* Memory information */
+       struct pei_memory_info pei_meminfo;     /* PEI memory information */
 #ifdef CONFIG_HAVE_FSP
        void *hob_list;                 /* FSP HOB list */
 #endif
@@ -68,7 +92,6 @@ struct arch_global_data {
        /* MRC training data to save for the next boot */
        char *mrc_output;
        unsigned int mrc_output_len;
-       void *gdt;                      /* Global descriptor table */
        ulong table;                    /* Table pointer from previous loader */
 };