Skip to contentSkip to conversation

x86: Updates to SMBIOS

PATCH Superseded Simon Glass 2 participants 13 messages Oct 22, 2020

Subsystems (2)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v3 cover x86: Updates to SMBIOS

At present there are a few Kconfig options which allow SMBIOS fields to be specified at build time.

Not all fields are supported. Also, defining these at build-time is limiting since a factory system cannot insert values for particular boards or models without rebuilding U-Boot.

This series adds a way to set SMBIOS properties using the devicetree. With this approach, more fields are supported and it is easy to update values in the devicetree in the factory.

Changes in v3:
- Use a different binding with subnodes for each table type
- Add onto the sysinfo binding

Changes in v2:
- Move dm.h header file to avoid build error on qemu-arm
- Deal with boards that don't use of-control

Simon Glass (6):
board: Rename uclass to sysinfo
doc: Add a binding for sysinfo
x86: Pass an ofnode into each SMBIOS function
smbios: Allow properties to come from the device tree
smbios: Add more properties
smbios: Add documentation and devicetree binding

 arch/powerpc/dts/gdsys/gazerbeam-uboot.dtsi   |   2 +-
 arch/sandbox/dts/test.dts                     |   8 +-
 board/gdsys/common/cmd_ioloop.c               |  12 +-
 board/gdsys/mpc8308/gazerbeam.c               |  47 +++---
 board/google/chromebook_coral/coral.c         |   2 +-
 common/spl/spl_fit.c                          |  15 +-
 configs/chromebook_coral_defconfig            |   2 +-
 configs/gazerbeam_defconfig                   |   4 +-
 configs/sandbox64_defconfig                   |   8 +-
 configs/sandbox_defconfig                     |   8 +-
 configs/sandbox_flattree_defconfig            |   4 +-
 configs/sandbox_spl_defconfig                 |   4 +-
 doc/arch/x86.rst                              |   8 +
 .../gdsys,sysinfo_gazerbeam.txt}              |   8 +-
 doc/device-tree-bindings/sysinfo/smbios.txt   |  77 ++++++++++
 doc/device-tree-bindings/sysinfo/sysinfo.txt  |  18 +++
 drivers/Kconfig                               |   4 +-
 drivers/Makefile                              |   2 +-
 drivers/board/board-uclass.c                  |  71 ---------
 drivers/{board => sysinfo}/Kconfig            |  16 +-
 drivers/{board => sysinfo}/Makefile           |   6 +-
 drivers/{board => sysinfo}/gazerbeam.c        |  74 ++++-----
 drivers/{board => sysinfo}/gazerbeam.h        |   0
 drivers/{board => sysinfo}/sandbox.c          |  50 +++----
 drivers/{board => sysinfo}/sandbox.h          |   0
 drivers/sysinfo/sysinfo-uclass.c              |  71 +++++++++
 drivers/timer/mpc83xx_timer.c                 |  10 +-
 include/dm/uclass-id.h                        |   2 +-
 include/smbios.h                              |   5 +-
 include/{board.h => sysinfo.h}                |  80 +++++-----
 lib/smbios.c                                  | 140 ++++++++++++++----
 test/dm/Makefile                              |   2 +-
 test/dm/board.c                               |  59 --------
 test/dm/sysinfo.c                             |  59 ++++++++
 34 files changed, 533 insertions(+), 345 deletions(-)
 rename doc/device-tree-bindings/{board/gdsys,board_gazerbeam.txt => sysinfo/gdsys,sysinfo_gazerbeam.txt} (90%)
 create mode 100644 doc/device-tree-bindings/sysinfo/smbios.txt
 create mode 100644 doc/device-tree-bindings/sysinfo/sysinfo.txt
 delete mode 100644 drivers/board/board-uclass.c
 rename drivers/{board => sysinfo}/Kconfig (65%)
 rename drivers/{board => sysinfo}/Makefile (50%)
 rename drivers/{board => sysinfo}/gazerbeam.c (69%)
 rename drivers/{board => sysinfo}/gazerbeam.h (100%)
 rename drivers/{board => sysinfo}/sandbox.c (50%)
 rename drivers/{board => sysinfo}/sandbox.h (100%)
 create mode 100644 drivers/sysinfo/sysinfo-uclass.c
 rename include/{board.h => sysinfo.h} (65%)
 delete mode 100644 test/dm/board.c
 create mode 100644 test/dm/sysinfo.c
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
#1 lore raw

PATCH v3 1/6 board: Rename uclass to sysinfo

This uclass is intended to provide a way to obtain information about a U-Boot board. But the concept of a U-Boot 'board' is the whole system, not just one circuit board, meaning that 'board' is something of a misnomer for this uclass.

In addition, the name 'board' is a bit overused in U-Boot and we want to use the same uclass to provide SMBIOS information.

The obvious name is 'system' but that is so vague as to be meaningless. Use 'sysinfo' instead, since this uclass is aimed at providing information on the system.

Rename everything accordingly.

---

(no changes since v1)

 arch/powerpc/dts/gdsys/gazerbeam-uboot.dtsi   |  2 +-
 arch/sandbox/dts/test.dts                     |  8 +-
 board/gdsys/common/cmd_ioloop.c               | 12 +--
 board/gdsys/mpc8308/gazerbeam.c               | 47 ++++++-----
 board/google/chromebook_coral/coral.c         |  2 +-
 common/spl/spl_fit.c                          | 15 ++--
 configs/chromebook_coral_defconfig            |  2 +-
 configs/gazerbeam_defconfig                   |  4 +-
 configs/sandbox64_defconfig                   |  8 +-
 configs/sandbox_defconfig                     |  8 +-
 configs/sandbox_flattree_defconfig            |  4 +-
 configs/sandbox_spl_defconfig                 |  4 +-
 .../gdsys,sysinfo_gazerbeam.txt}              |  8 +-
 drivers/Kconfig                               |  4 +-
 drivers/Makefile                              |  2 +-
 drivers/board/board-uclass.c                  | 71 ----------------
 drivers/{board => sysinfo}/Kconfig            | 16 ++--
 drivers/{board => sysinfo}/Makefile           |  6 +-
 drivers/{board => sysinfo}/gazerbeam.c        | 74 ++++++++---------
 drivers/{board => sysinfo}/gazerbeam.h        |  0
 drivers/{board => sysinfo}/sandbox.c          | 50 ++++++------
 drivers/{board => sysinfo}/sandbox.h          |  0
 drivers/sysinfo/sysinfo-uclass.c              | 71 ++++++++++++++++
 drivers/timer/mpc83xx_timer.c                 | 10 +--
 include/dm/uclass-id.h                        |  2 +-
 include/{board.h => sysinfo.h}                | 80 +++++++++----------
 test/dm/Makefile                              |  2 +-
 test/dm/board.c                               | 59 --------------
 test/dm/sysinfo.c                             | 59 ++++++++++++++
 29 files changed, 318 insertions(+), 312 deletions(-)
 rename doc/device-tree-bindings/{board/gdsys,board_gazerbeam.txt => sysinfo/gdsys,sysinfo_gazerbeam.txt} (90%)
 delete mode 100644 drivers/board/board-uclass.c
 rename drivers/{board => sysinfo}/Kconfig (65%)
 rename drivers/{board => sysinfo}/Makefile (50%)
 rename drivers/{board => sysinfo}/gazerbeam.c (69%)
 rename drivers/{board => sysinfo}/gazerbeam.h (100%)
 rename drivers/{board => sysinfo}/sandbox.c (50%)
 rename drivers/{board => sysinfo}/sandbox.h (100%)
 create mode 100644 drivers/sysinfo/sysinfo-uclass.c
 rename include/{board.h => sysinfo.h} (65%)
 delete mode 100644 test/dm/board.c
 create mode 100644 test/dm/sysinfo.c
arch/powerpc/dts/gdsys/gazerbeam-uboot.dtsi +1 -1
index 1c4977f20f3..3439737fa3f 100644
@@ -32,7 +32,7 @@
 	};
 
 	board {
-		compatible = "gdsys,board_gazerbeam";
+		compatible = "gdsys,sysinfo-gazerbeam";
 		csb = <&board_soc>;
 		serdes = <&SERDES>;
 		rxaui0 = <&RXAUI0_0>;
arch/sandbox/dts/test.dts +4 -4
index fa84b2c10f3..0f0d69da50e 100644
@@ -1070,10 +1070,6 @@
 		compatible = "sandbox,sandbox_osd";
 	};
 
-	board {
-		compatible = "sandbox,board_sandbox";
-	};
-
 	sandbox_tee {
 		compatible = "sandbox,tee";
 	};
@@ -1209,6 +1205,10 @@
 		reset-names = "valid", "no_mask", "out_of_range";
 	};
 
+	sysinfo {
+		compatible = "sandbox,sysinfo-sandbox";
+	};
+
 	some_regmapped-bus {
 		#address-cells = <0x1>;
 		#size-cells = <0x1>;
board/gdsys/common/cmd_ioloop.c +7 -5
index 3ea2bec8ebd..658756d9842 100644
@@ -16,7 +16,7 @@
 #include <dm.h>
 #include <misc.h>
 #include <regmap.h>
-#include <board.h>
+#include <sysinfo.h>
 
 #include "../../../drivers/misc/gdsys_soc.h"
 #include "../../../drivers/misc/gdsys_ioep.h"
@@ -506,11 +506,11 @@ int do_ioloop(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 int do_iodev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 	struct udevice *ioep = NULL;
-	struct udevice *board;
+	struct udevice *sysinfo;
 	char name[8];
 	int ret;
 
-	if (board_get(&board))
+	if (sysinfo_get(&sysinfo))
 		return CMD_RET_FAILURE;
 
 	if (argc > 1) {
@@ -518,7 +518,8 @@ int do_iodev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 
 		snprintf(name, sizeof(name), "ioep%d", i);
 
-		ret = uclass_get_device_by_phandle(UCLASS_MISC, board, name, &ioep);
+		ret = uclass_get_device_by_phandle(UCLASS_MISC, sysinfo, name,
+						   &ioep);
 
 		if (ret || !ioep) {
 			printf("Invalid IOEP %d\n", i);
@@ -532,7 +533,8 @@ int do_iodev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 		while (1) {
 			snprintf(name, sizeof(name), "ioep%d", i);
 
-			ret = uclass_get_device_by_phandle(UCLASS_MISC, board, name, &ioep);
+			ret = uclass_get_device_by_phandle(UCLASS_MISC, sysinfo,
+							   name, &ioep);
 
 			if (ret || !ioep)
 				break;
board/gdsys/mpc8308/gazerbeam.c +25 -22

110 lines not on this page · raw message

board/google/chromebook_coral/coral.c +1 -1
index f5ae48290f4..b8b923c139e 100644
@@ -150,7 +150,7 @@ static const struct udevice_id coral_ids[] = {
 
 U_BOOT_DRIVER(coral_drv) = {
 	.name		= "coral",
-	.id		= UCLASS_BOARD,
+	.id		= UCLASS_SYSINFO,
 	.of_match	= coral_ids,
 	ACPI_OPS_PTR(&coral_acpi_ops)
 };
common/spl/spl_fit.c +8 -7
index a90d821c82e..f8f52771352 100644
@@ -6,13 +6,13 @@
 
 #include <common.h>
 #include <errno.h>
-#include <board.h>
 #include <fpga.h>
 #include <gzip.h>
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
 #include <spl.h>
+#include <sysinfo.h>
 #include <asm/cache.h>
 #include <linux/libfdt.h>
 
@@ -74,7 +74,7 @@ static int spl_fit_get_image_name(const void *fit, int images,
 				  const char *type, int index,
 				  const char **outname)
 {
-	struct udevice *board;
+	struct udevice *sysinfo;
 	const char *name, *str;
 	__maybe_unused int node;
 	int conf_node;
@@ -110,19 +110,20 @@ static int spl_fit_get_image_name(const void *fit, int images,
 		}
 	}
 
-	if (!found && !board_get(&board)) {
+	if (!found && CONFIG_IS_ENABLED(SYSINFO) && !sysinfo_get(&sysinfo)) {
 		int rc;
 		/*
-		 * no string in the property for this index. Check if the board
-		 * level code can supply one.
+		 * no string in the property for this index. Check if the
+		 * sysinfo-level code can supply one.
 		 */
-		rc = board_get_fit_loadable(board, index - i - 1, type, &str);
+		rc = sysinfo_get_fit_loadable(sysinfo, index - i - 1, type,
+					      &str);
 		if (rc && rc != -ENOENT)
 			return rc;
 
 		if (!rc) {
 			/*
-			 * The board provided a name for a loadable.
+			 * The sysinfo provided a name for a loadable.
 			 * Try to match it against the description properties
 			 * first. If no matching node is found, use it as a
 			 * node name.
configs/chromebook_coral_defconfig +1 -1
index 0ec95af75e0..d934eeb8866 100644
@@ -77,7 +77,6 @@ CONFIG_SYSCON=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_INTEL_ACPIGEN=y
 CONFIG_CPU=y
-CONFIG_BOARD=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
 CONFIG_MISC=y
@@ -98,6 +97,7 @@ CONFIG_SOUND_MAX98357A=y
 CONFIG_SOUND_RT5677=y
 CONFIG_SPI=y
 CONFIG_ICH_SPI=y
+CONFIG_SYSINFO=y
 CONFIG_TPL_SYSRESET=y
 # CONFIG_TPM_V1 is not set
 CONFIG_TPM2_CR50_I2C=y
configs/gazerbeam_defconfig +2 -2
index 36c2500bae1..5765ef456be 100644
@@ -157,8 +157,6 @@ CONFIG_CLK=y
 CONFIG_ICS8N3QV01=y
 CONFIG_CPU=y
 CONFIG_CPU_MPC83XX=y
-CONFIG_BOARD=y
-CONFIG_BOARD_GAZERBEAM=y
 CONFIG_DM_PCA953X=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
@@ -197,6 +195,8 @@ CONFIG_MPC83XX_SDRAM=y
 CONFIG_DM_RESET=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_GAZERBEAM=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_MPC83XX=y
 CONFIG_TIMER=y
configs/sandbox64_defconfig +4 -4
index e9928d5fc2e..dc993cd13aa 100644
@@ -69,6 +69,8 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_CMD_SOUND=y
 CONFIG_CMD_QFW=y
+CONFIG_CMD_PSTORE=y
+CONFIG_CMD_PSTORE_MEM_ADDR=0x3000000
 CONFIG_CMD_BOOTSTAGE=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
@@ -80,8 +82,6 @@ CONFIG_CMD_CBFS=y
 CONFIG_CMD_CRAMFS=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
-CONFIG_CMD_PSTORE=y
-CONFIG_CMD_PSTORE_MEM_ADDR=0x3000000
 CONFIG_MAC_PARTITION=y
 CONFIG_AMIGA_PARTITION=y
 CONFIG_OF_CONTROL=y
@@ -109,8 +109,6 @@ CONFIG_CPU=y
 CONFIG_DM_DEMO=y
 CONFIG_DM_DEMO_SIMPLE=y
 CONFIG_DM_DEMO_SHAPE=y
-CONFIG_BOARD=y
-CONFIG_BOARD_SANDBOX=y
 CONFIG_GPIO_HOG=y
 CONFIG_DM_GPIO_LOOKUP_LABEL=y
 CONFIG_PM8916_GPIO=y
@@ -201,6 +199,8 @@ CONFIG_SOC_DEVICE=y
 CONFIG_SANDBOX_SPI=y
 CONFIG_SPMI=y
 CONFIG_SPMI_SANDBOX=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SANDBOX=y
 CONFIG_SYSRESET=y
 CONFIG_TIMER=y
 CONFIG_TIMER_EARLY=y
configs/sandbox_defconfig +4 -4
index b15b1889e07..5b7cee7889a 100644
@@ -81,6 +81,8 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_CMD_SOUND=y
 CONFIG_CMD_QFW=y
+CONFIG_CMD_PSTORE=y
+CONFIG_CMD_PSTORE_MEM_ADDR=0x3000000
 CONFIG_CMD_BOOTSTAGE=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
@@ -93,8 +95,6 @@ CONFIG_CMD_CRAMFS=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_SQUASHFS=y
 CONFIG_CMD_MTDPARTS=y
-CONFIG_CMD_PSTORE=y
-CONFIG_CMD_PSTORE_MEM_ADDR=0x3000000
 CONFIG_MAC_PARTITION=y
 CONFIG_AMIGA_PARTITION=y
 CONFIG_OF_CONTROL=y
@@ -130,8 +130,6 @@ CONFIG_CPU=y
 CONFIG_DM_DEMO=y
 CONFIG_DM_DEMO_SIMPLE=y
 CONFIG_DM_DEMO_SHAPE=y
-CONFIG_BOARD=y
-CONFIG_BOARD_SANDBOX=y
 CONFIG_DMA=y
 CONFIG_DMA_CHANNELS=y
 CONFIG_SANDBOX_DMA=y
@@ -235,6 +233,8 @@ CONFIG_SOC_DEVICE=y
 CONFIG_SANDBOX_SPI=y
 CONFIG_SPMI=y
 CONFIG_SPMI_SANDBOX=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SANDBOX=y
 CONFIG_SYSRESET=y
 CONFIG_TIMER=y
 CONFIG_TIMER_EARLY=y
configs/sandbox_flattree_defconfig +2 -2
index 6ee23c4a619..1f593eba8fd 100644
@@ -90,8 +90,6 @@ CONFIG_CPU=y
 CONFIG_DM_DEMO=y
 CONFIG_DM_DEMO_SIMPLE=y
 CONFIG_DM_DEMO_SHAPE=y
-CONFIG_BOARD=y
-CONFIG_BOARD_SANDBOX=y
 CONFIG_GPIO_HOG=y
 CONFIG_DM_GPIO_LOOKUP_LABEL=y
 CONFIG_PM8916_GPIO=y
@@ -177,6 +175,8 @@ CONFIG_SOC_DEVICE=y
 CONFIG_SANDBOX_SPI=y
 CONFIG_SPMI=y
 CONFIG_SPMI_SANDBOX=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SANDBOX=y
 CONFIG_SYSRESET=y
 CONFIG_TIMER=y
 CONFIG_TIMER_EARLY=y
configs/sandbox_spl_defconfig +2 -2
index 1d49e816393..9205f84b86e 100644
@@ -109,8 +109,6 @@ CONFIG_CPU=y
 CONFIG_DM_DEMO=y
 CONFIG_DM_DEMO_SIMPLE=y
 CONFIG_DM_DEMO_SHAPE=y
-CONFIG_BOARD=y
-CONFIG_BOARD_SANDBOX=y
 CONFIG_SPL_FIRMWARE=y
 CONFIG_GPIO_HOG=y
 CONFIG_PM8916_GPIO=y
@@ -194,6 +192,8 @@ CONFIG_SOC_DEVICE=y
 CONFIG_SANDBOX_SPI=y
 CONFIG_SPMI=y
 CONFIG_SPMI_SANDBOX=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SANDBOX=y
 CONFIG_SYSRESET=y
 CONFIG_SPL_SYSRESET=y
 CONFIG_TIMER=y
doc/device-tree-bindings/sysinfo/gdsys,sysinfo_gazerbeam.txt renamed from doc/device-tree-bindings/board/gdsys,board_gazerbeam.txt +4 -4
similarity index 90%
rename from doc/device-tree-bindings/board/gdsys,board_gazerbeam.txt
rename to doc/device-tree-bindings/sysinfo/gdsys,sysinfo_gazerbeam.txt
index 28c1080d904..f70652d3c48 100644
@@ -1,11 +1,11 @@
-gdsys Gazerbeam board driver
+gdsys Gazerbeam sysinfo driver
 
 This driver provides capabilities to access the gdsys Gazerbeam board's device
 information. Furthermore, phandles to some internal devices are provided for
 the board files.
 
 Required properties:
-- compatible:  should be "gdsys,board_gazerbeam"
+- compatible:  should be "gdsys,sysinfo-gazerbeam"
 - csb:         phandle to the board's coherent system bus (CSB) device node
 - rxaui[0-3]:  phandles to the rxaui control device nodes
 - fpga[0-1]:   phandles to the board's gdsys FPGA device nodes
@@ -17,8 +17,8 @@ Required properties:
 Example:
 
 
-board {
-	compatible = "gdsys,board_gazerbeam";
+sysinfo {
+	compatible = "gdsys,sysinfo-gazerbeam";
 	csb = <&board_soc>;
 	serdes = <&SERDES>;
 	rxaui0 = <&RXAUI0>;
drivers/Kconfig +2 -2
index 613669cb381..37293e8da9d 100644
@@ -30,8 +30,6 @@ source "drivers/ddr/Kconfig"
 
 source "drivers/demo/Kconfig"
 
-source "drivers/board/Kconfig"
-
 source "drivers/ddr/fsl/Kconfig"
 
 source "drivers/dfu/Kconfig"
@@ -112,6 +110,8 @@ source "drivers/spi/Kconfig"
 
 source "drivers/spmi/Kconfig"
 
+source "drivers/sysinfo/Kconfig"
+
 source "drivers/sysreset/Kconfig"
 
 source "drivers/tee/Kconfig"
drivers/Makefile +1 -1
index 9eb51453e57..51eec712996 100644
@@ -26,9 +26,9 @@ obj-$(CONFIG_$(SPL_TPL_)TIMER) += timer/
 obj-$(CONFIG_$(SPL_TPL_)VIRTIO) += virtio/
 obj-$(CONFIG_$(SPL_)DM_MAILBOX) += mailbox/
 obj-$(CONFIG_$(SPL_)REMOTEPROC) += remoteproc/
+obj-$(CONFIG_$(SPL_)SYSINFO) += sysinfo/
 obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm/
 obj-$(CONFIG_$(SPL_TPL_)ACPI_PMC) += power/acpi_pmc/
-obj-$(CONFIG_$(SPL_)BOARD) += board/
 obj-$(CONFIG_XEN) += xen/
 obj-$(CONFIG_$(SPL_)FPGA) += fpga/
 
drivers/board/board-uclass.c deleted +0 -71

71 lines not on this page · raw message

drivers/sysinfo/Kconfig renamed from drivers/board/Kconfig +8 -8
similarity index 65%
rename from drivers/board/Kconfig
rename to drivers/sysinfo/Kconfig
index 254f657049d..39141500a05 100644
@@ -1,24 +1,24 @@
-menuconfig BOARD
-	bool "Device Information"
+menuconfig SYSINFO
+	bool "Device System Information"
 	help
 	  Support methods to query hardware configurations from internal
 	  mechanisms (e.g. reading GPIO values, determining the presence of
 	  devices on busses, etc.). This enables the usage of U-Boot with
 	  modular board architectures.
 
-if BOARD
+if SYSINFO
 
-config SPL_BOARD
+config SPL_SYSINFO
 	depends on SPL_DM
 	bool "Enable board driver support in SPL"
 
-config BOARD_GAZERBEAM
-	bool "Enable board driver for the Gazerbeam board"
+config SYSINFO_GAZERBEAM
+	bool "Enable sysinfo driver for the Gazerbeam board"
 	help
 	  Support querying device information for the gdsys Gazerbeam board.
 
-config BOARD_SANDBOX
-	bool "Enable board driver for the Sandbox board"
+config SYSINFO_SANDBOX
+	bool "Enable sysinfo driver for the Sandbox board"
 	help
 	  Support querying device information for the Sandbox boards.
 
drivers/sysinfo/Makefile renamed from drivers/board/Makefile +3 -3
similarity index 50%
rename from drivers/board/Makefile
rename to drivers/sysinfo/Makefile
index cc16361755a..aecf0b0d47c 100644
@@ -2,6 +2,6 @@
 #
 # (C) Copyright 2017
 # Mario Six,  Guntermann & Drunck GmbH, mario.six at gdsys.cc
-obj-y += board-uclass.o
-obj-$(CONFIG_BOARD_GAZERBEAM) += gazerbeam.o
-obj-$(CONFIG_BOARD_SANDBOX) += sandbox.o
+obj-y += sysinfo-uclass.o
+obj-$(CONFIG_SYSINFO_GAZERBEAM) += gazerbeam.o
+obj-$(CONFIG_SYSINFO_SANDBOX) += sandbox.o
drivers/sysinfo/gazerbeam.c renamed from drivers/board/gazerbeam.c +37 -37

146 lines not on this page · raw message

drivers/sysinfo/gazerbeam.h renamed from drivers/board/gazerbeam.h +0 -0
similarity index 100%
rename from drivers/board/gazerbeam.h
rename to drivers/sysinfo/gazerbeam.h
drivers/sysinfo/sandbox.c renamed from drivers/board/sandbox.c +25 -25

100 lines not on this page · raw message

drivers/sysinfo/sandbox.h renamed from drivers/board/sandbox.h +0 -0
similarity index 100%
rename from drivers/board/sandbox.h
rename to drivers/sysinfo/sandbox.h
drivers/sysinfo/sysinfo-uclass.c new file +71 -0

71 lines not on this page · raw message

drivers/timer/mpc83xx_timer.c +5 -5
index ad8bb28e8b3..125056235e7 100644
@@ -5,12 +5,12 @@
  */
 
 #include <common.h>
-#include <board.h>
 #include <clk.h>
 #include <dm.h>
 #include <irq_func.h>
 #include <log.h>
 #include <status_led.h>
+#include <sysinfo.h>
 #include <time.h>
 #include <timer.h>
 #include <watchdog.h>
@@ -97,7 +97,7 @@ int interrupt_init(void)
 {
 	immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
 	struct udevice *csb;
-	struct udevice *board;
+	struct udevice *sysinfo;
 	struct udevice *timer;
 	struct mpc83xx_timer_priv *timer_priv;
 	struct clk clock;
@@ -112,12 +112,12 @@ int interrupt_init(void)
 
 	timer_priv = dev_get_priv(timer);
 
-	if (board_get(&board)) {
-		debug("%s: board device could not be fetched.\n", __func__);
+	if (sysinfo_get(&sysinfo)) {
+		debug("%s: sysinfo device could not be fetched.\n", __func__);
 		return -ENOENT;
 	}
 
-	ret = uclass_get_device_by_phandle(UCLASS_SIMPLE_BUS, board,
+	ret = uclass_get_device_by_phandle(UCLASS_SIMPLE_BUS, sysinfo,
 					   "csb", &csb);
 	if (ret) {
 		debug("%s: Could not retrieve CSB device (error: %d)",
include/dm/uclass-id.h +1 -1
index 88f10c46221..e5f942e8a51 100644
@@ -36,7 +36,6 @@ enum uclass_id {
 	UCLASS_AUDIO_CODEC,	/* Audio codec with control and data path */
 	UCLASS_AXI,		/* AXI bus */
 	UCLASS_BLK,		/* Block device */
-	UCLASS_BOARD,		/* Device information from hardware */
 	UCLASS_BOOTCOUNT,       /* Bootcount backing store */
 	UCLASS_BUTTON,		/* Button */
 	UCLASS_CACHE,		/* Cache controller */
@@ -106,6 +105,7 @@ enum uclass_id {
 	UCLASS_SPI_GENERIC,	/* Generic SPI flash target */
 	UCLASS_SPMI,		/* System Power Management Interface bus */
 	UCLASS_SYSCON,		/* System configuration device */
+	UCLASS_SYSINFO,		/* Device information from hardware */
 	UCLASS_SYSRESET,	/* System reset device */
 	UCLASS_TEE,		/* Trusted Execution Environment device */
 	UCLASS_THERMAL,		/* Thermal sensor */
include/sysinfo.h renamed from include/board.h +40 -40

208 lines not on this page · raw message

test/dm/Makefile +1 -1
index e2b07983885..0d507791a12 100644
@@ -18,7 +18,6 @@ obj-$(CONFIG_ACPIGEN) += acpigen.o
 obj-$(CONFIG_ACPIGEN) += acpi_dp.o
 obj-$(CONFIG_SOUND) += audio.o
 obj-$(CONFIG_BLK) += blk.o
-obj-$(CONFIG_BOARD) += board.o
 obj-$(CONFIG_BUTTON) += button.o
 obj-$(CONFIG_DM_BOOTCOUNT) += bootcount.o
 obj-$(CONFIG_CLK) += clk.o clk_ccf.o
@@ -71,6 +70,7 @@ obj-$(CONFIG_DM_SERIAL) += serial.o
 obj-$(CONFIG_CPU) += cpu.o
 obj-$(CONFIG_SOC_DEVICE) += soc.o
 obj-$(CONFIG_SOUND) += sound.o
+obj-$(CONFIG_SYSINFO) += sysinfo.o
 obj-$(CONFIG_TEE) += tee.o
 obj-$(CONFIG_VIRTIO_SANDBOX) += virtio.o
 obj-$(CONFIG_DMA) += dma.o
test/dm/board.c deleted +0 -59

59 lines not on this page · raw message

test/dm/sysinfo.c new file +59 -0

59 lines not on this page · raw message

Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
#2 lore raw

PATCH v3 2/6 doc: Add a binding for sysinfo

In reply to Simon Glass

Add a simple binding file for this, so that it is clear what this binding directory is for.

---

(no changes since v1)

 doc/device-tree-bindings/sysinfo/sysinfo.txt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 doc/device-tree-bindings/sysinfo/sysinfo.txt
doc/device-tree-bindings/sysinfo/sysinfo.txt new file +18 -0
new file mode 100644
index 00000000000..ed8830b8284
@@ -0,0 +1,18 @@
+Sysinfo
+=======
+
+This provides capabilities to access information about a board/system, for
+use by drivers.
+
+Required properties:
+
+  - compatible: any suitable string where the driver is in the UCLASS_SYSINFO
+      class
+
+See also smbios.txt
+
+
+Example
+
+sysinfo {
+	compatible = "sandbox,sysinfo";
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
#3 lore raw

PATCH v3 2/6 doc: Add a binding for sysinfo

Quoted 27 lines · Simon Glass

Add a simple binding file for this, so that it is clear what this binding directory is for.

---

(no changes since v1)

 doc/device-tree-bindings/sysinfo/sysinfo.txt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 doc/device-tree-bindings/sysinfo/sysinfo.txt
doc/device-tree-bindings/sysinfo/sysinfo.txt new file +8 -0
new file mode 100644
index 00000000000..ed8830b8284
@@ -0,0 +1,18 @@
+Sysinfo
+=======
+
+This provides capabilities to access information about a board/system, for
+use by drivers.
+
+Required properties:
+

doc/device-tree-bindings/sysinfo/sysinfo.txt line 18

Quoted 10 lines
doc/device-tree-bindings/sysinfo/sysinfo.txt new file +10 -0
+  - compatible: any suitable string where the driver is in the UCLASS_SYSINFO
+      class
+
+See also smbios.txt
+
+
+Example
+
+sysinfo {
+	compatible = "sandbox,sysinfo";

Most boards use don't use ACPI but device-trees for calling the operating system.
We try to keep our device-trees in sync with Linux. The device-tree available under $fdtcontroladdr should be usable to boot the OS.
We should avoid anything that could lead now or in the future to a conflict with the the OS usage of the device tree nodes.

Please, use in the example a compatibility string that is unique to U-Boot.

How about: "uboot,sandbox-sysinfo"?

Best regards

Heinrich

#4 lore raw

PATCH v3 2/6 doc: Add a binding for sysinfo

Hi Heinrich,

Quoted 48 lines · Heinrich Schuchardt
Quoted 27 lines · Simon Glass

Add a simple binding file for this, so that it is clear what this binding directory is for.

---

(no changes since v1)

 doc/device-tree-bindings/sysinfo/sysinfo.txt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 doc/device-tree-bindings/sysinfo/sysinfo.txt
doc/device-tree-bindings/sysinfo/sysinfo.txt new file +8 -0
new file mode 100644
index 00000000000..ed8830b8284
@@ -0,0 +1,18 @@
+Sysinfo
+=======
+
+This provides capabilities to access information about a board/system, for
+use by drivers.
+
+Required properties:
+

doc/device-tree-bindings/sysinfo/sysinfo.txt line 18

Quoted 10 lines
doc/device-tree-bindings/sysinfo/sysinfo.txt new file +10 -0
+  - compatible: any suitable string where the driver is in the UCLASS_SYSINFO
+      class
+
+See also smbios.txt
+
+
+Example
+
+sysinfo {
+     compatible = "sandbox,sysinfo";

Most boards use don't use ACPI but device-trees for calling the operating system.
We try to keep our device-trees in sync with Linux. The device-tree available under $fdtcontroladdr should be usable to boot the OS.
We should avoid anything that could lead now or in the future to a conflict with the the OS usage of the device tree nodes.

Quoted 4 lines

Please, use in the example a compatibility string that is unique to U-Boot.

How about: "uboot,sandbox-sysinfo"?

We use "sandbox" as the vendor throughout U-Boot so I don't feel we should change now. Perhaps as part of an effort to send our bindings upstream?

Regards,
Simon

#5 lore raw

PATCH v3 3/6 x86: Pass an ofnode into each SMBIOS function

In reply to Simon Glass

As a first step to obtaining SMBIOS information from the devicetree, add an ofnode parameter to the writing functions.

---

(no changes since v2)

Changes in v2:
- Move dm.h header file to avoid build error on qemu-arm
- Deal with boards that don't use of-control

 include/smbios.h |  5 ++++-
 lib/smbios.c     | 44 ++++++++++++++++++++++++++------------------
 2 files changed, 30 insertions(+), 19 deletions(-)
include/smbios.h +4 -1
index 97b9ddce237..c19afbe16c7 100644
@@ -8,6 +8,8 @@
 #ifndef _SMBIOS_H_
 #define _SMBIOS_H_
 
+#include <dm/ofnode.h>
+
 /* SMBIOS spec version implemented */
 #define SMBIOS_MAJOR_VER	3
 #define SMBIOS_MINOR_VER	0
@@ -222,9 +224,10 @@ static inline void fill_smbios_header(void *table, int type,
  *
  * @addr:	start address to write the structure
  * @handle:	the structure's handle, a unique 16-bit number
+ * @node:	node containing the information to write (ofnode_null() if none)
  * @return:	size of the structure
  */
-typedef int (*smbios_write_type)(ulong *addr, int handle);
+typedef int (*smbios_write_type)(ulong *addr, int handle, ofnode node);
 
 /**
  * write_smbios_table() - Write SMBIOS table
lib/smbios.c +26 -18

149 lines not on this page · raw message

Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
#6 lore raw

PATCH v3 4/6 smbios: Allow properties to come from the device tree

In reply to Simon Glass

Support a way to put SMBIOS properties in the device tree. These can be placed in a 'board' device in an 'smbios' subnode.

---

Changes in v3:
- Use a different binding with subnodes for each table type

 lib/smbios.c | 100 +++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 82 insertions(+), 18 deletions(-)
lib/smbios.c +82 -18
index 4bb3bac56b4..6d3c20a48ee 100644
@@ -17,6 +17,18 @@
 #include <dm/uclass-internal.h>
 #endif
 
+/**
+ * struct smbios_write_method - Informaiton about a table-writing function
+ *
+ * @write: Function to call
+ * @subnode_name: Name of subnode which has the information for this function,
+ *	NULL if none
+ */
+struct smbios_write_method {
+	smbios_write_type write;
+	const char *subnode_name;
+};
+
 /**
  * smbios_add_string() - add a string to the string area
  *
@@ -52,6 +64,43 @@ static int smbios_add_string(char *start, const char *str)
 	}
 }
 
+/**
+ * smbios_add_prop_default() - Add a property from the device tree or default
+ *
+ * @start:	string area start address
+ * @node:	node containing the information to write (ofnode_null() if none)
+ * @prop:	property to write
+ * @def:	default string if the node has no such property
+ * @return 0 if not found, else SMBIOS string number (1 or more)
+ */
+static int smbios_add_prop_default(char *start, ofnode node, const char *prop,
+				   const char *def)
+{
+	const char *str = NULL;
+
+	if (IS_ENABLED(CONFIG_OF_CONTROL))
+		str = ofnode_read_string(node, prop);
+	if (str)
+		return smbios_add_string(start, str);
+	else if (def)
+		return smbios_add_string(start, def);
+
+	return 0;
+}
+
+/**
+ * smbios_add_prop() - Add a property from the device tree
+ *
+ * @start:	string area start address
+ * @node:	node containing the information to write (ofnode_null() if none)
+ * @prop:	property to write
+ * @return 0 if not found, else SMBIOS string number (1 or more)
+ */
+static int smbios_add_prop(char *start, ofnode node, const char *prop)
+{
+	return smbios_add_prop_default(start, node, prop, NULL);
+}
+
 /**
  * smbios_string_table_len() - compute the string area size
  *
@@ -120,11 +169,15 @@ static int smbios_write_type1(ulong *current, int handle, ofnode node)
 	t = map_sysmem(*current, len);
 	memset(t, 0, sizeof(struct smbios_type1));
 	fill_smbios_header(t, SMBIOS_SYSTEM_INFORMATION, len, handle);
-	t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
-	t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME);
+	t->manufacturer = smbios_add_prop_default(t->eos, node, "manufactuer",
+						  CONFIG_SMBIOS_MANUFACTURER);
+	t->product_name = smbios_add_prop_default(t->eos, node, "product",
+						  CONFIG_SMBIOS_PRODUCT_NAME);
 	if (serial_str) {
-		strncpy((char *)t->uuid, serial_str, sizeof(t->uuid));
 		t->serial_number = smbios_add_string(t->eos, serial_str);
+		strncpy((char *)t->uuid, serial_str, sizeof(t->uuid));
+	} else {
+		t->serial_number = smbios_add_prop(t->eos, node, "serial");
 	}
 
 	len = t->length + smbios_string_table_len(t->eos);
@@ -142,8 +195,10 @@ static int smbios_write_type2(ulong *current, int handle, ofnode node)
 	t = map_sysmem(*current, len);
 	memset(t, 0, sizeof(struct smbios_type2));
 	fill_smbios_header(t, SMBIOS_BOARD_INFORMATION, len, handle);
-	t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
-	t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME);
+	t->manufacturer = smbios_add_prop_default(t->eos, node, "manufactuer",
+						  CONFIG_SMBIOS_MANUFACTURER);
+	t->product_name = smbios_add_prop_default(t->eos, node, "product",
+						  CONFIG_SMBIOS_PRODUCT_NAME);
 	t->feature_flags = SMBIOS_BOARD_FEATURE_HOSTING;
 	t->board_type = SMBIOS_BOARD_MOTHERBOARD;
 
@@ -162,7 +217,8 @@ static int smbios_write_type3(ulong *current, int handle, ofnode node)
 	t = map_sysmem(*current, len);
 	memset(t, 0, sizeof(struct smbios_type3));
 	fill_smbios_header(t, SMBIOS_SYSTEM_ENCLOSURE, len, handle);
-	t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
+	t->manufacturer = smbios_add_prop_default(t->eos, node, "manufactuer",
+						  CONFIG_SMBIOS_MANUFACTURER);
 	t->chassis_type = SMBIOS_ENCLOSURE_DESKTOP;
 	t->bootup_state = SMBIOS_STATE_SAFE;
 	t->power_supply_state = SMBIOS_STATE_SAFE;
@@ -262,19 +318,19 @@ static int smbios_write_type127(ulong *current, int handle, ofnode node)
 	return len;
 }
 
-static smbios_write_type smbios_write_funcs[] = {
-	smbios_write_type0,
-	smbios_write_type1,
-	smbios_write_type2,
-	smbios_write_type3,
-	smbios_write_type4,
-	smbios_write_type32,
-	smbios_write_type127
+static struct smbios_write_method smbios_write_funcs[] = {
+	{ smbios_write_type0, },
+	{ smbios_write_type1, "system", },
+	{ smbios_write_type2, "baseboard", },
+	{ smbios_write_type3, "chassis", },
+	{ smbios_write_type4, },
+	{ smbios_write_type32, },
+	{ smbios_write_type127 },
 };
 
 ulong write_smbios_table(ulong addr)
 {
-	ofnode node = ofnode_null();
+	ofnode parent_node = ofnode_null();
 	struct smbios_entry *se;
 	struct udevice *dev;
 	ulong table_addr;
@@ -287,9 +343,9 @@ ulong write_smbios_table(ulong addr)
 	int i;
 
 	if (IS_ENABLED(CONFIG_OF_CONTROL)) {
-		uclass_first_device(UCLASS_BOARD, &dev);
+		uclass_first_device(UCLASS_SYSINFO, &dev);
 		if (dev)
-			node = dev_read_subnode(dev, "smbios");
+			parent_node = dev_read_subnode(dev, "smbios");
 	}
 
 	/* 16 byte align the table address */
@@ -304,7 +360,15 @@ ulong write_smbios_table(ulong addr)
 
 	/* populate minimum required tables */
 	for (i = 0; i < ARRAY_SIZE(smbios_write_funcs); i++) {
-		int tmp = smbios_write_funcs[i]((ulong *)&addr, handle++, node);
+		const struct smbios_write_method *method;
+		ofnode node = ofnode_null();
+		int tmp;
+
+		method = &smbios_write_funcs[i];
+		if (method->subnode_name)
+			node = ofnode_find_subnode(parent_node,
+						   method->subnode_name);
+		tmp = method->write((ulong *)&addr, handle++, node);
 
 		max_struct_size = max(max_struct_size, tmp);
 		len += tmp;
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
#7 lore raw

PATCH v3 4/6 smbios: Allow properties to come from the device tree

Quoted 2 lines · Simon Glass

Support a way to put SMBIOS properties in the device tree. These can be placed in a 'board' device in an 'smbios' subnode.

For me it is fine if you want to specify the SMBIOS properties via the device tree. But it makes no sense to have multiple ways of specification and thereby increase code size.

So if you move to SMBIOS properties to the device-tree, please, eliminate the Kconfig symbols.

Best regards

Heinrich

Quoted 178 lines

---

Changes in v3:
- Use a different binding with subnodes for each table type

 lib/smbios.c | 100 +++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 82 insertions(+), 18 deletions(-)
lib/smbios.c +82 -18
index 4bb3bac56b4..6d3c20a48ee 100644
@@ -17,6 +17,18 @@
 #include <dm/uclass-internal.h>
 #endif
 
+/**
+ * struct smbios_write_method - Informaiton about a table-writing function
+ *
+ * @write: Function to call
+ * @subnode_name: Name of subnode which has the information for this function,
+ *	NULL if none
+ */
+struct smbios_write_method {
+	smbios_write_type write;
+	const char *subnode_name;
+};
+
 /**
  * smbios_add_string() - add a string to the string area
  *
@@ -52,6 +64,43 @@ static int smbios_add_string(char *start, const char *str)
 	}
 }
 
+/**
+ * smbios_add_prop_default() - Add a property from the device tree or default
+ *
+ * @start:	string area start address
+ * @node:	node containing the information to write (ofnode_null() if none)
+ * @prop:	property to write
+ * @def:	default string if the node has no such property
+ * @return 0 if not found, else SMBIOS string number (1 or more)
+ */
+static int smbios_add_prop_default(char *start, ofnode node, const char *prop,
+				   const char *def)
+{
+	const char *str = NULL;
+
+	if (IS_ENABLED(CONFIG_OF_CONTROL))
+		str = ofnode_read_string(node, prop);
+	if (str)
+		return smbios_add_string(start, str);
+	else if (def)
+		return smbios_add_string(start, def);
+
+	return 0;
+}
+
+/**
+ * smbios_add_prop() - Add a property from the device tree
+ *
+ * @start:	string area start address
+ * @node:	node containing the information to write (ofnode_null() if none)
+ * @prop:	property to write
+ * @return 0 if not found, else SMBIOS string number (1 or more)
+ */
+static int smbios_add_prop(char *start, ofnode node, const char *prop)
+{
+	return smbios_add_prop_default(start, node, prop, NULL);
+}
+
 /**
  * smbios_string_table_len() - compute the string area size
  *
@@ -120,11 +169,15 @@ static int smbios_write_type1(ulong *current, int handle, ofnode node)
 	t = map_sysmem(*current, len);
 	memset(t, 0, sizeof(struct smbios_type1));
 	fill_smbios_header(t, SMBIOS_SYSTEM_INFORMATION, len, handle);
-	t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
-	t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME);
+	t->manufacturer = smbios_add_prop_default(t->eos, node, "manufactuer",
+						  CONFIG_SMBIOS_MANUFACTURER);
+	t->product_name = smbios_add_prop_default(t->eos, node, "product",
+						  CONFIG_SMBIOS_PRODUCT_NAME);
 	if (serial_str) {
-		strncpy((char *)t->uuid, serial_str, sizeof(t->uuid));
 		t->serial_number = smbios_add_string(t->eos, serial_str);
+		strncpy((char *)t->uuid, serial_str, sizeof(t->uuid));
+	} else {
+		t->serial_number = smbios_add_prop(t->eos, node, "serial");
 	}
 
 	len = t->length + smbios_string_table_len(t->eos);
@@ -142,8 +195,10 @@ static int smbios_write_type2(ulong *current, int handle, ofnode node)
 	t = map_sysmem(*current, len);
 	memset(t, 0, sizeof(struct smbios_type2));
 	fill_smbios_header(t, SMBIOS_BOARD_INFORMATION, len, handle);
-	t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
-	t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME);
+	t->manufacturer = smbios_add_prop_default(t->eos, node, "manufactuer",
+						  CONFIG_SMBIOS_MANUFACTURER);
+	t->product_name = smbios_add_prop_default(t->eos, node, "product",
+						  CONFIG_SMBIOS_PRODUCT_NAME);
 	t->feature_flags = SMBIOS_BOARD_FEATURE_HOSTING;
 	t->board_type = SMBIOS_BOARD_MOTHERBOARD;
 
@@ -162,7 +217,8 @@ static int smbios_write_type3(ulong *current, int handle, ofnode node)
 	t = map_sysmem(*current, len);
 	memset(t, 0, sizeof(struct smbios_type3));
 	fill_smbios_header(t, SMBIOS_SYSTEM_ENCLOSURE, len, handle);
-	t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
+	t->manufacturer = smbios_add_prop_default(t->eos, node, "manufactuer",
+						  CONFIG_SMBIOS_MANUFACTURER);
 	t->chassis_type = SMBIOS_ENCLOSURE_DESKTOP;
 	t->bootup_state = SMBIOS_STATE_SAFE;
 	t->power_supply_state = SMBIOS_STATE_SAFE;
@@ -262,19 +318,19 @@ static int smbios_write_type127(ulong *current, int handle, ofnode node)
 	return len;
 }
 
-static smbios_write_type smbios_write_funcs[] = {
-	smbios_write_type0,
-	smbios_write_type1,
-	smbios_write_type2,
-	smbios_write_type3,
-	smbios_write_type4,
-	smbios_write_type32,
-	smbios_write_type127
+static struct smbios_write_method smbios_write_funcs[] = {
+	{ smbios_write_type0, },
+	{ smbios_write_type1, "system", },
+	{ smbios_write_type2, "baseboard", },
+	{ smbios_write_type3, "chassis", },
+	{ smbios_write_type4, },
+	{ smbios_write_type32, },
+	{ smbios_write_type127 },
 };
 
 ulong write_smbios_table(ulong addr)
 {
-	ofnode node = ofnode_null();
+	ofnode parent_node = ofnode_null();
 	struct smbios_entry *se;
 	struct udevice *dev;
 	ulong table_addr;
@@ -287,9 +343,9 @@ ulong write_smbios_table(ulong addr)
 	int i;
 
 	if (IS_ENABLED(CONFIG_OF_CONTROL)) {
-		uclass_first_device(UCLASS_BOARD, &dev);
+		uclass_first_device(UCLASS_SYSINFO, &dev);
 		if (dev)
-			node = dev_read_subnode(dev, "smbios");
+			parent_node = dev_read_subnode(dev, "smbios");
 	}
 
 	/* 16 byte align the table address */
@@ -304,7 +360,15 @@ ulong write_smbios_table(ulong addr)
 
 	/* populate minimum required tables */
 	for (i = 0; i < ARRAY_SIZE(smbios_write_funcs); i++) {
-		int tmp = smbios_write_funcs[i]((ulong *)&addr, handle++, node);
+		const struct smbios_write_method *method;
+		ofnode node = ofnode_null();
+		int tmp;
+
+		method = &smbios_write_funcs[i];
+		if (method->subnode_name)
+			node = ofnode_find_subnode(parent_node,
+						   method->subnode_name);
+		tmp = method->write((ulong *)&addr, handle++, node);
 
 		max_struct_size = max(max_struct_size, tmp);
 		len += tmp;
#8 lore raw

PATCH v3 4/6 smbios: Allow properties to come from the device tree

Hi Heinrich,

Quoted 11 lines · Heinrich Schuchardt
Quoted 2 lines · Simon Glass

Support a way to put SMBIOS properties in the device tree. These can be placed in a 'board' device in an 'smbios' subnode.

For me it is fine if you want to specify the SMBIOS properties via the device tree. But it makes no sense to have multiple ways of specification and thereby increase code size.

So if you move to SMBIOS properties to the device-tree, please, eliminate the Kconfig symbols.

I was thinking about that. There is one board that doesn't even use devicetree, but perhaps we should just remove the CONFIG or the board.

I will take a look.

Regards,
Simon

#9 lore raw

PATCH v3 5/6 smbios: Add more properties

In reply to Simon Glass

The current tables only support a subset of the available fields defined by the SMBIOS spec. Add a few more.

---

(no changes since v1)

 lib/smbios.c | 4 ++++
 1 file changed, 4 insertions(+)
lib/smbios.c +4 -0
index 6d3c20a48ee..e97a3bfe6f3 100644
@@ -173,12 +173,15 @@ static int smbios_write_type1(ulong *current, int handle, ofnode node)
 						  CONFIG_SMBIOS_MANUFACTURER);
 	t->product_name = smbios_add_prop_default(t->eos, node, "product",
 						  CONFIG_SMBIOS_PRODUCT_NAME);
+	t->version = smbios_add_prop(t->eos, node, "version");
 	if (serial_str) {
 		t->serial_number = smbios_add_string(t->eos, serial_str);
 		strncpy((char *)t->uuid, serial_str, sizeof(t->uuid));
 	} else {
 		t->serial_number = smbios_add_prop(t->eos, node, "serial");
 	}
+	t->sku_number = smbios_add_prop(t->eos, node, "sku");
+	t->family = smbios_add_prop(t->eos, node, "family");
 
 	len = t->length + smbios_string_table_len(t->eos);
 	*current += len;
@@ -199,6 +202,7 @@ static int smbios_write_type2(ulong *current, int handle, ofnode node)
 						  CONFIG_SMBIOS_MANUFACTURER);
 	t->product_name = smbios_add_prop_default(t->eos, node, "product",
 						  CONFIG_SMBIOS_PRODUCT_NAME);
+	t->asset_tag_number = smbios_add_prop(t->eos, node, "asset-tag");
 	t->feature_flags = SMBIOS_BOARD_FEATURE_HOSTING;
 	t->board_type = SMBIOS_BOARD_MOTHERBOARD;
 
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
#10 lore raw

PATCH v3 6/6 smbios: Add documentation and devicetree binding

In reply to Simon Glass

Add information about how to set SMBIOS properties using the devicetree.

---

Changes in v3:
- Add onto the sysinfo binding

 doc/arch/x86.rst                            |  8 +++
 doc/device-tree-bindings/sysinfo/smbios.txt | 77 +++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 doc/device-tree-bindings/sysinfo/smbios.txt
doc/arch/x86.rst +8 -0
index c6b70ce61a3..cc307aa8d5e 100644
@@ -740,6 +740,14 @@ Note that this is a development feature only. It is not intended for use in
 production environments. Also it is not currently part of the automated tests
 so may break in the future.
 
+SMBIOS tables
+-------------
+
+To generate SMBIOS tables in U-Boot, for use by the OS, enable the
+CONFIG_GENERATE_SMBIOS_TABLE option. The easiest way to provide the values to
+use is via the device tree. For details see
+device-tree-bindings/sysinfo/smbios.txt
+
 TODO List
 ---------
 - Audio
doc/device-tree-bindings/sysinfo/smbios.txt new file +77 -0

77 lines not on this page · raw message

Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
#11 lore raw

PATCH v3 6/6 smbios: Add documentation and devicetree binding

Quoted 80 lines · Simon Glass

Add information about how to set SMBIOS properties using the devicetree.

---

Changes in v3:
- Add onto the sysinfo binding

 doc/arch/x86.rst                            |  8 +++
 doc/device-tree-bindings/sysinfo/smbios.txt | 77 +++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 doc/device-tree-bindings/sysinfo/smbios.txt
doc/arch/x86.rst +8 -0
index c6b70ce61a3..cc307aa8d5e 100644
@@ -740,6 +740,14 @@ Note that this is a development feature only. It is not intended for use in
 production environments. Also it is not currently part of the automated tests
 so may break in the future.
 
+SMBIOS tables
+-------------
+
+To generate SMBIOS tables in U-Boot, for use by the OS, enable the
+CONFIG_GENERATE_SMBIOS_TABLE option. The easiest way to provide the values to
+use is via the device tree. For details see
+device-tree-bindings/sysinfo/smbios.txt
+
 TODO List
 ---------
 - Audio
doc/device-tree-bindings/sysinfo/smbios.txt new file +42 -0
new file mode 100644
index 00000000000..b5223228025
@@ -0,0 +1,77 @@
+SMBIOS sysinfo information
+==========================
+
+This binding allows the values for the SMBIOS tables to be specified in the
+devicetree, as below.
+
+Required properties:
+
+  - compatible: "u-boot,smbios" or any other string depending on your board
+
+This driver allows providing board-specific features such as power control
+GPIOs. In addition, the SMBIOS values can be specified in the device tree,
+as below:
+
+An optional 'smbios' subnode can be used to provide these properties. Within
+that, the properties are broken down by table type, as in the System Management
+BIOS (Basic Input/Output System) Specification.
+
+Available subnodes for each table type are:
+
+  - 1 : system
+  - 2 : baseboard
+  - 3 : chassis
+
+Within each subnode the following tables are recognised:
+
+"system" subnode optional properties:
+
+  - manufacturer: Product manufacturer for system
+  - product:      Product name
+  - version:      Product version string
+  - serial:       Serial number for system (note that this can be overridden by
+                      the serial# environment variable)
+  - sku:          Product SKU (Stock-Keeping Unit)
+  - family:       Product family
+
+"baseboard" subnode optional properties:
+
+  - manufacturer: Product manufacturer for baseboard
+  - product:      Product name
+  - asset-tag:    Asset tag for the motherboard, sometimes used in organisations
+                      to track devices

doc/device-tree-bindings/sysinfo/smbios.txt line 52

Quoted 10 lines
doc/device-tree-bindings/sysinfo/smbios.txt new file +10 -0
+
+"chassis" subnode optional properties:
+
+  - manufacturer: Product manufacturer for chassis
+
+
+Example:
+
+sysinfo {
+	compatible = "sandbox,sysinfo-sandbox";

Most boards use don't use ACPI but device-trees for calling the operating system.
We try to keep our device-trees in sync with Linux. The device-tree available under $fdtcontroladdr should be usable to boot the OS.
We should avoid anything that could lead now or in the future to a conflict with the the OS usage of the device tree nodes.

Please, use in the example a compatibility string that is unique to U-Boot.

How about: "uboot,sandbox-sysinfo"?

Best regards

Heinrich

Quoted 26 lines
doc/device-tree-bindings/sysinfo/smbios.txt new file +25 -0
+
+	smbios {
+		/* Type 1 table */
+		system {
+			manufacturer = "Google";
+			product = "Coral";
+			version = "rev2";
+			serial = "123456789";
+			sku = "sku3";
+			family = "Google_Coral";
+		};
+
+		/* Type 2 table */
+		baseboard {
+			manufacturer = "Google";
+			product = "Coral";
+			asset-tag = "ABC123";
+		};
+
+		/* Type 3 table */
+		chassis {
+			manufacturer = "Google";
+		};
+	};
+};
#12 lore raw

PATCH v3 6/6 smbios: Add documentation and devicetree binding

Hi Heinrich,

Quoted 101 lines · Heinrich Schuchardt
Quoted 80 lines · Simon Glass

Add information about how to set SMBIOS properties using the devicetree.

---

Changes in v3:
- Add onto the sysinfo binding

 doc/arch/x86.rst                            |  8 +++
 doc/device-tree-bindings/sysinfo/smbios.txt | 77 +++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 doc/device-tree-bindings/sysinfo/smbios.txt
doc/arch/x86.rst +8 -0
index c6b70ce61a3..cc307aa8d5e 100644
@@ -740,6 +740,14 @@ Note that this is a development feature only. It is not intended for use in
 production environments. Also it is not currently part of the automated tests
 so may break in the future.
 
+SMBIOS tables
+-------------
+
+To generate SMBIOS tables in U-Boot, for use by the OS, enable the
+CONFIG_GENERATE_SMBIOS_TABLE option. The easiest way to provide the values to
+use is via the device tree. For details see
+device-tree-bindings/sysinfo/smbios.txt
+
 TODO List
 ---------
 - Audio
doc/device-tree-bindings/sysinfo/smbios.txt new file +42 -0
new file mode 100644
index 00000000000..b5223228025
@@ -0,0 +1,77 @@
+SMBIOS sysinfo information
+==========================
+
+This binding allows the values for the SMBIOS tables to be specified in the
+devicetree, as below.
+
+Required properties:
+
+  - compatible: "u-boot,smbios" or any other string depending on your board
+
+This driver allows providing board-specific features such as power control
+GPIOs. In addition, the SMBIOS values can be specified in the device tree,
+as below:
+
+An optional 'smbios' subnode can be used to provide these properties. Within
+that, the properties are broken down by table type, as in the System Management
+BIOS (Basic Input/Output System) Specification.
+
+Available subnodes for each table type are:
+
+  - 1 : system
+  - 2 : baseboard
+  - 3 : chassis
+
+Within each subnode the following tables are recognised:
+
+"system" subnode optional properties:
+
+  - manufacturer: Product manufacturer for system
+  - product:      Product name
+  - version:      Product version string
+  - serial:       Serial number for system (note that this can be overridden by
+                      the serial# environment variable)
+  - sku:          Product SKU (Stock-Keeping Unit)
+  - family:       Product family
+
+"baseboard" subnode optional properties:
+
+  - manufacturer: Product manufacturer for baseboard
+  - product:      Product name
+  - asset-tag:    Asset tag for the motherboard, sometimes used in organisations
+                      to track devices

doc/device-tree-bindings/sysinfo/smbios.txt line 52

Quoted 10 lines
doc/device-tree-bindings/sysinfo/smbios.txt new file +10 -0
+
+"chassis" subnode optional properties:
+
+  - manufacturer: Product manufacturer for chassis
+
+
+Example:
+
+sysinfo {
+     compatible = "sandbox,sysinfo-sandbox";

Most boards use don't use ACPI but device-trees for calling the operating system.
We try to keep our device-trees in sync with Linux. The device-tree available under $fdtcontroladdr should be usable to boot the OS.
We should avoid anything that could lead now or in the future to a conflict with the the OS usage of the device tree nodes.

Quoted 5 lines

Please, use in the example a compatibility string that is unique to U-Boot.

How about: "uboot,sandbox-sysinfo"?

See my other note on the same comment.

BTW the compatible string depends on the board vendor. We don't define it in this binding file.

In any case, as I say, this binding does not set the compatible string. It can be whatever the board wants.

I'd really like to send our bindings up to Linux. So far they have shown little interest in accepting these, although I don't think anyone has tried in years. It came up on the call last week.

Regards,
Simon