efi: Use the installed SMBIOS tables

U-Boot should set up the SMBIOS tables during startup, as it does on x86.
Ensure that it does this correctly on non-x86 machines too, by creating
an event spy for last-stage init.

Tidy up the installation-condition code while we are here.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index 3fe5319437ea739f096bef6f210fe3c19a6b1b48..04124d8014ddc4f73a67802c69551d8f54a24a96 100644 (file)
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -307,7 +307,8 @@ static int last_stage_init(void)
        struct udevice *bus;
        ofnode node;
 
-       if (!of_machine_is_compatible("globalscale,espressobin"))
+       if (!CONFIG_IS_ENABLED(DM_MDIO) ||
+           !of_machine_is_compatible("globalscale,espressobin"))
                return 0;
 
        node = ofnode_by_compatible(ofnode_null(), "marvell,orion-mdio");

diff --git a/lib/Kconfig b/lib/Kconfig
index 6b5389f3a87d3e609b130930e9cd99b9ce64a552..79cf9ef0fa31c3141e71dbf5d335fc4f9ec981a6 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -1049,6 +1049,7 @@ config SMBIOS
        bool "SMBIOS support"
        depends on X86 || EFI_LOADER
        default y
+       select LAST_STAGE_INIT
        help
          Indicates that this platform can support System Management BIOS
          (SMBIOS) tables. These provide various pieces of information about

diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index 0eb748ff1a59edb30d6a7f2bebd0f7e96705774d..8d31fc61c60171803444fee9fd8c616d55f925f2 100644 (file)
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -79,7 +79,7 @@ obj-$(CONFIG_VIDEO) += efi_gop.o
 obj-$(CONFIG_BLK) += efi_disk.o
 obj-$(CONFIG_NETDEVICES) += efi_net.o
 obj-$(CONFIG_ACPI) += efi_acpi.o
-obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o
+obj-$(CONFIG_SMBIOS) += efi_smbios.o
 obj-$(CONFIG_EFI_RNG_PROTOCOL) += efi_rng.o
 obj-$(CONFIG_EFI_TCG2_PROTOCOL) += efi_tcg2.o
 obj-$(CONFIG_EFI_RISCV_BOOT_PROTOCOL) += efi_riscv.o

diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index ad719afd63282008ce72ab193a9a7374b360e4d5..e6de685e8795be6380b00be2f5864b0fdbfe8ac0 100644 (file)
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@@ -326,11 +326,11 @@ efi_status_t efi_init_obj_list(void)
                if (ret != EFI_SUCCESS)
                        goto out;
        }
-#ifdef CONFIG_GENERATE_SMBIOS_TABLE
-       ret = efi_smbios_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
+       if (IS_ENABLED(CONFIG_SMBIOS)) {
+               ret = efi_smbios_register();
+               if (ret != EFI_SUCCESS)
+                       goto out;
+       }
        ret = efi_watchdog_register();
        if (ret != EFI_SUCCESS)
                goto out;

diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c
index 306c0bc54f90b0d4bae98c8c5a72bce4504e49d0..48446f654d9bc3cf318d81115e6faf9e0ff37af3 100644 (file)
--- a/lib/efi_loader/efi_smbios.c
+++ b/lib/efi_loader/efi_smbios.c
@@ -10,8 +10,14 @@
 #include <common.h>
 #include <efi_loader.h>
 #include <log.h>
+#include <malloc.h>
 #include <mapmem.h>
 #include <smbios.h>
+#include <linux/sizes.h>
+
+enum {
+       TABLE_SIZE      = SZ_4K,
+};
 
 /*
  * Install the SMBIOS table as a configuration table.
@@ -20,36 +26,50 @@
  */
 efi_status_t efi_smbios_register(void)
 {
-       /* Map within the low 32 bits, to allow for 32bit SMBIOS tables */
-       u64 dmi_addr = U32_MAX;
+       ulong addr;
        efi_status_t ret;
-       void *dmi;
 
-       /* Reserve 4kiB page for SMBIOS */
-       ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
-                                EFI_RUNTIME_SERVICES_DATA, 1, &dmi_addr);
+       addr = gd->arch.smbios_start;
+       if (!addr) {
+               log_err("No SMBIOS tables to install\n");
+               return EFI_NOT_FOUND;
+       }
+
+       /* Mark space used for tables */
+       ret = efi_add_memory_map(addr, TABLE_SIZE, EFI_RUNTIME_SERVICES_DATA);
+       if (ret)
+               return ret;
+
+       log_debug("EFI using SMBIOS tables at %lx\n", addr);
+
+       /* Install SMBIOS information as configuration table */
+       return efi_install_configuration_table(&smbios_guid,
+                                              map_sysmem(addr, 0));
+}
+
+static int install_smbios_table(void)
+{
+       ulong addr;
+       void *buf;
 
-       if (ret != EFI_SUCCESS) {
-               /* Could not find space in lowmem, use highmem instead */
-               ret = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES,
-                                        EFI_RUNTIME_SERVICES_DATA, 1,
-                                        &dmi_addr);
+       if (!IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLE) || IS_ENABLED(CONFIG_X86))
+               return 0;
 
-               if (ret != EFI_SUCCESS)
-                       return ret;
+       /* Align the table to a 4KB boundary to keep EFI happy */
+       buf = memalign(SZ_4K, TABLE_SIZE);
+       if (!buf)
+               return log_msg_ret("mem", -ENOMEM);
+
+       addr = map_to_sysmem(buf);
+       if (!write_smbios_table(addr)) {
+               log_err("Failed to write SMBIOS table\n");
+               return log_msg_ret("smbios", -EINVAL);
        }
 
-       /*
-        * Generate SMBIOS tables - we know that efi_allocate_pages() returns
-        * a 4k-aligned address, so it is safe to assume that
-        * write_smbios_table() will write the table at that address.
-        */
-       assert(!(dmi_addr & 0xf));
-       dmi = (void *)(uintptr_t)dmi_addr;
-       if (write_smbios_table(map_to_sysmem(dmi)))
-               /* Install SMBIOS information as configuration table */
-               return efi_install_configuration_table(&smbios_guid, dmi);
-       efi_free_pages(dmi_addr, 1);
-       log_err("Cannot create SMBIOS table\n");
-       return EFI_SUCCESS;
+       /* Make a note of where we put it */
+       log_debug("SMBIOS tables written to %lx\n", addr);
+       gd->arch.smbios_start = addr;
+
+       return 0;
 }
+EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, install_smbios_table);

diff --git a/test/py/tests/test_event_dump.py b/test/py/tests/test_event_dump.py
index a6df9e10e54e1aa1001e37c1609f5359b6e67627..e282c67335cd8a30568e826875ebcbc1a69be9f7 100644 (file)
--- a/test/py/tests/test_event_dump.py
+++ b/test/py/tests/test_event_dump.py
@@ -18,6 +18,7 @@ def test_event_dump(u_boot_console):
 --------------------  ------------------------------  ------------------------------
 EVT_FT_FIXUP          bootmeth_vbe_ft_fixup           .*boot/vbe_request.c:.*
 EVT_FT_FIXUP          bootmeth_vbe_simple_ft_fixup    .*boot/vbe_simple_os.c:.*
+EVT_LAST_STAGE_INIT   install_smbios_table            .*lib/efi_loader/efi_smbios.c:.*
 EVT_MISC_INIT_F       sandbox_early_getopt_check      .*arch/sandbox/cpu/start.c:.*
 EVT_TEST              h_adder_simple                  .*test/common/event.c:'''
     assert re.match(expect, out, re.MULTILINE) is not None