x86: Allow putting some tables in the bloblist

At present all tables are placed starting at address f0000 in memory, and
can be up to 64KB in size. If the tables are very large, this may not
provide enough space.

Also if the tables point to other tables (such as console log or a ramoops
area) then we must allocate other memory anyway.

The bloblist is a nice place to put these tables since it is contiguous,
which makes it easy to reserve this memory for linux using the 820 tables.

Add an option to put some of the tables in the bloblist. For SMBIOS and
ACPI, create suitable pointers from the f0000 region to the new location
of the tables.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
[bmeng: squashed in http://patchwork.ozlabs.org/project/uboot/patch/
 20201105062407.1.I8091ad931cbbb5e3b6f6ababdf3f8d5db0d17bb9@changeid/]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c
index f7b71c5cd13b80d9cf6b4c37cfe73ab8382501fa..c4007fa48669871a0b1049de16695132ca8f7d26 100644 (file)
--- a/arch/x86/lib/tables.c
+++ b/arch/x86/lib/tables.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <bloblist.h>
 #include <log.h>
 #include <malloc.h>
 #include <smbios.h>
@@ -13,6 +14,8 @@
 #include <asm/tables.h>
 #include <asm/coreboot_tables.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /**
  * Function prototype to write a specific configuration table
  *
@@ -26,10 +29,16 @@ typedef ulong (*table_write)(ulong addr);
  *
  * @name: Name of table (for debugging)
  * @write: Function to call to write this table
+ * @tag: Bloblist tag if using CONFIG_BLOBLIST_TABLES
+ * @size: Maximum table size
+ * @align: Table alignment in bytes
  */
 struct table_info {
        const char *name;
        table_write write;
+       enum bloblist_tag_t tag;
+       int size;
+       int align;
 };
 
 static struct table_info table_list[] = {
@@ -43,10 +52,10 @@ static struct table_info table_list[] = {
        { "mp", write_mp_table, },
 #endif
 #ifdef CONFIG_GENERATE_ACPI_TABLE
-       { "acpi", write_acpi_tables, },
+       { "acpi", write_acpi_tables, BLOBLISTT_ACPI_TABLES, 0x10000, 0x1000},
 #endif
 #ifdef CONFIG_GENERATE_SMBIOS_TABLE
-       { "smbios", write_smbios_table, },
+       { "smbios", write_smbios_table, BLOBLISTT_SMBIOS_TABLES, 0x1000, 0x100},
 #endif
 };
 
@@ -66,16 +75,25 @@ void table_fill_string(char *dest, const char *src, size_t n, char pad)
 
 int write_tables(void)
 {
-       u32 rom_table_start = ROM_TABLE_ADDR;
+       u32 rom_table_start;
        u32 rom_table_end;
        u32 high_table, table_size;
        struct memory_area cfg_tables[ARRAY_SIZE(table_list) + 1];
        int i;
 
+       rom_table_start = ROM_TABLE_ADDR;
+
        debug("Writing tables to %x:\n", rom_table_start);
        for (i = 0; i < ARRAY_SIZE(table_list); i++) {
                const struct table_info *table = &table_list[i];
+               int size = table->size ? : CONFIG_ROM_TABLE_SIZE;
 
+               if (IS_ENABLED(CONFIG_BLOBLIST_TABLES) && table->tag) {
+                       rom_table_start = (ulong)bloblist_add(table->tag, size,
+                                                             table->align);
+                       if (!rom_table_start)
+                               return log_msg_ret("bloblist", -ENOBUFS);
+               }
                rom_table_end = table->write(rom_table_start);
                rom_table_end = ALIGN(rom_table_end, ROM_TABLE_ALIGN);
 
@@ -96,6 +114,11 @@ int write_tables(void)
 
                debug("- wrote '%s' to %x, end %x\n", table->name,
                      rom_table_start, rom_table_end);
+               if (rom_table_end - rom_table_start > size) {
+                       log_err("Out of space for configuration tables: need %x, have %x\n",
+                               rom_table_end - rom_table_start, size);
+                       return log_msg_ret("bloblist", -ENOSPC);
+               }
                rom_table_start = rom_table_end;
        }
 
@@ -105,6 +128,26 @@ int write_tables(void)
                write_coreboot_table(CB_TABLE_ADDR, cfg_tables);
        }
 
+       if (IS_ENABLED(CONFIG_BLOBLIST_TABLES)) {
+               void *ptr = (void *)CONFIG_ROM_TABLE_ADDR;
+
+               /* Write an RSDP pointing to the tables */
+               if (IS_ENABLED(CONFIG_GENERATE_ACPI_TABLE)) {
+                       struct acpi_ctx *ctx = gd_acpi_ctx();
+
+                       acpi_write_rsdp(ptr, ctx->rsdt, ctx->xsdt);
+                       ptr += ALIGN(sizeof(struct acpi_rsdp), 16);
+               }
+               if (IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLE)) {
+                       void *smbios;
+
+                       smbios = bloblist_find(BLOBLISTT_SMBIOS_TABLES, 0);
+                       if (!smbios)
+                               return log_msg_ret("smbios", -ENOENT);
+                       memcpy(ptr, smbios, sizeof(struct smbios_entry));
+               }
+       }
+
        debug("- done writing tables\n");
 
        return 0;

diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h
index abbca6530db75a327edf4936139018c6d00d18ba..a28eb71f4d72c77a59b126b9b4409d296d61d810 100644 (file)
--- a/include/acpi/acpi_table.h
+++ b/include/acpi/acpi_table.h
@@ -688,6 +688,16 @@ int acpi_add_table(struct acpi_ctx *ctx, void *table);
  */
 void acpi_setup_base_tables(struct acpi_ctx *ctx, void *start);
 
+/**
+ * acpi_write_rsdp() - Write out an RSDP indicating where the ACPI tables are
+ *
+ * @rsdp: Address to write RSDP
+ * @rsdt: Address of RSDT
+ * @xsdt: Address of XSDT
+ */
+void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt,
+                    struct acpi_xsdt *xsdt);
+
 #endif /* !__ACPI__*/
 
 #include <asm/acpi_table.h>

diff --git a/include/bloblist.h b/include/bloblist.h
index 2b4b6696897c11f2ce6d618551314dd1ff7bb95f..8cdce61187aa668dbdd666286f3aa4f4af93aefb 100644 (file)
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -36,6 +36,8 @@ enum bloblist_tag_t {
        BLOBLISTT_INTEL_VBT,            /* Intel Video-BIOS table */
        BLOBLISTT_TPM2_TCG_LOG,         /* TPM v2 log space */
        BLOBLISTT_TCPA_LOG,             /* TPM log space */
+       BLOBLISTT_ACPI_TABLES,          /* ACPI tables for x86 */
+       BLOBLISTT_SMBIOS_TABLES,        /* SMBIOS tables for x86 */
 
        BLOBLISTT_COUNT
 };

diff --git a/lib/Kconfig b/lib/Kconfig
index 5f1b95d7d7b9ef1829293d6b338140ce475081ff..8f487533e8ca7759d4b360b14f36da8461898856 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -637,6 +637,15 @@ config FDT_FIXUP_PARTITIONS
 menu "System tables"
        depends on (!EFI && !SYS_COREBOOT) || (ARM && EFI_LOADER)
 
+config BLOBLIST_TABLES
+       bool "Put tables in a bloblist"
+       depends on X86
+       help
+         Normally tables are placed at address 0xf0000 and can be up to 64KB
+         long. With this option, tables are instead placed in the bloblist
+         with a pointer from 0xf0000. The size can then be larger and the
+         tables can be placed high in memory.
+
 config GENERATE_SMBIOS_TABLE
        bool "Generate an SMBIOS (System Management BIOS) table"
        default y

diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index 908d8903893568c963817969407645e92dad7411..a0f0961be5bcfd9a804b2f5553129c30b6018e4e 100644 (file)
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -183,8 +183,8 @@ int acpi_add_table(struct acpi_ctx *ctx, void *table)
        return 0;
 }
 
-static void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt,
-                           struct acpi_xsdt *xsdt)
+void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt,
+                    struct acpi_xsdt *xsdt)
 {
        memset(rsdp, 0, sizeof(struct acpi_rsdp));