smbios: Enhancements for more flexibility
Subsystems (3)
v3 cover smbios: Enhancements for more flexibility
This series includes various patches to allow more flexibility as to where the data for SMBIOS tables comes from:
- introduces some standard sysinfo options as a source, e.g. to read strapping pins to determine the board revision
- allows the U-Boot version number to be included
- allows the version number to be provided programmatically, e.g. to support the build system adding information after U-Boot is built
Documentation is added for how to obtain version information.
The code is also refactored a little to make it easier to maintain.
Changes in v3:
- Move to doc/ and .rst format
- Add examples for converting epoch values
- Use .rst file instead of README
- Fix comment for smbios_add_prop()
- Rename set_eos() to smbios_set_eos()
- Add missing DECLARE_GLOBAL_DATA_PTR
- Expand commit to explain why operations are required
- Use SMBIOS_STR_MAX for the max sysinfo string length
Changes in v2:
- Add a comment about dropping the century
- Zero the context's dev pointer if not used
- Correct documentation format
- Add new patch to fix sysinfo with CONFIG_IS_ENABLED()
- Add new patch to fix crash on coral
Simon Glass (12):
README: Add doumentation for version information
Makefile: Provide numeric versions
smbios: Move smbios_write_type to the C file
smbios: Use char consistently for the eos member
smbios: Set BIOS release version
smbios: Use a struct to keep track of context
smbios: Drop the eos parameter
smbios: Track the end of the string table
smbios: Add more options for the BIOS version string
sysinfo: Move #ifdef so that operations are always defined
x86: coral: Add sysinfo ops
smbios: Allow a few values to come from sysinfo
Makefile | 4 + board/google/chromebook_coral/coral.c | 5 + doc/Makefile | 1 - doc/develop/index.rst | 1 + doc/develop/version.rst | 101 +++++++++++ include/asm-generic/global_data.h | 6 + include/smbios.h | 26 +-- include/sysinfo.h | 13 +- lib/smbios.c | 248 +++++++++++++++++++------- 9 files changed, 328 insertions(+), 77 deletions(-) create mode 100644 doc/develop/version.rst
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 1/12 README: Add doumentation for version information
There are quite a few available version options in U-Boot. Add a list of the available Makefile variables and #defines, along with examples.
---
Changes in v3:
- Move to doc/ and .rst format
- Add examples for converting epoch values
doc/Makefile | 1 - doc/develop/index.rst | 1 + doc/develop/version.rst | 93 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 doc/develop/version.rst
doc/Makefile +0 -1
@@ -56,7 +56,6 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4) PYTHONDONTWRITEBYTECODE=1 \ BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \ $(SPHINXBUILD) \ - -W \ -b $2 \ -c $(abspath $(srctree)/$(src)) \ -d $(abspath $(BUILDDIR)/.doctrees/$3) \
doc/develop/index.rst +1 -0
@@ -13,6 +13,7 @@ Implementation global_data logging menus + version Debugging ---------
doc/develop/version.rst new file +93 -0
93 lines not on this page · raw message
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 1/12 README: Add doumentation for version information
Hi Simon,
Quoted 22 lines · Simon Glass
There are quite a few available version options in U-Boot. Add a list of the available
Makefilevariables and #defines, along with examples.Signed-off-by Simon Glass <[email protected]>---
Changes in v3:
- Move to doc/ and .rst format
- Add examples for converting epoch valuesdoc/Makefile | 1 - doc/develop/index.rst | 1 + doc/develop/version.rst | 93 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 doc/develop/version.rstdoc/Makefile +0
-0
doc/Makefile quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4) · line 59
Quoted 4 lines
doc/Makefile +0
-1@@ -56,7 +56,6 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4) PYTHONDONTWRITEBYTECODE=1 \ BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \ $(SPHINXBUILD) \ - -W \
Why is this change?
Quoted 104 lines
doc/Makefile +0
-0-b $2 \ -c $(abspath $(srctree)/$(src)) \ -d $(abspath $(BUILDDIR)/.doctrees/$3) \doc/develop/index.rst +1
-0@@ -13,6 +13,7 @@ Implementation global_data logging menus + version Debugging ---------doc/develop/version.rst new file +83
-0@@ -0,0 +1,93 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (c) 2013 The Chromium OS Authors. + +Version information +=================== + +U-Boot releases are named by year and patch level, for example 2020.10 means the +release that came out in October 2020. Release candidates are tagged every few +weeks as the project heads to the next release. So 2020.10-rc1 was the first +release candidate (RC), tagged soon after 2020.07 was released. + +See https://www.denx.de/wiki/view/U-Boot/ReleaseCycle for full details. + +Within the build system, various Makefile variables are created, making use of +VERSION, PATCHLEVEL and EXTRAVERSION defined at the top of 'Makefile'. There is +also SUBLEVEL available for downstream use. See also CONFIG_IDENT_STRING. + +Some variables end up in a generated header file at +include/generated/version_autogenerated.h and can be accessed from C source by +including <version.h> + +The following are available: + + UBOOTRELEASE (Makefile) + Full release version as a string. If this is not a tagged release, it also + includes the number of commits since the last tag as well as the the git + hash. If there are uncommitted changes a '-dirty' suffix is added too. + + This is written by scripts/setlocalversion (maintained by Linux) to + include/config/uboot.release and ends up in the UBOOTRELEASE Makefile + variable. + + Examples:: + + 2020.10-rc3 + 2021.01-rc5-00248-g60dd854f3ba-dirty + + PLAIN_VERSION (string #define) + This is UBOOTRELEASE but available in C source. + + Examples:: + + 2020.10 + 2021.01-rc5-00248-g60dd854f3ba-dirty + + UBOOTVERSION (Makefile) + This holds just the first three components of UBOOTRELEASE (i.e. not the + git hash, etc.) + + Examples:: + + 2020.10 + 2021.01-rc5 + + U_BOOT_VERSION (string #define) + "U-Boot " followed by UBOOTRELEASE, for example:: + + U-Boot 2020.10 + U-Boot 2021.01-rc5 + + This is used as part of the banner string when U-Boot starts. + + U_BOOT_VERSION_STRING (string #define) + U_BOOT_VERSION followed by build-time information + and CONFIG_IDENT_STRING. + + Examples:: + + U-Boot 2020.10 (Jan 06 2021 - 08:50:36 -0700) + U-Boot 2021.01-rc5-00248-g60dd854f3ba-dirty (Jan 06 2021 - 08:50:36 -0700) for spring + +Build date/time is also included. See the generated file +include/generated/timestamp_autogenerated.h for the available +fields. For example:: + + #define U_BOOT_DATE "Jan 06 2021" (US format only) + #define U_BOOT_TIME "08:50:36" (24-hour clock) + #define U_BOOT_TZ "-0700" (Time zone in hours) + #define U_BOOT_DMI_DATE "01/06/2021" (US format only) + #define U_BOOT_BUILD_DATE 0x20210106 (hex yyyymmdd format) + #define U_BOOT_EPOCH 1609948236 + +The Epoch is the number of seconds since midnight on 1/1/70. You can convert
doc/develop/version.rst line 93
Quoted 10 lines
doc/develop/version.rst new file +10
-0+this to a time with:: + + $ date -u -d @1609948236 + Wed 06 Jan 2021 03:50:36 PM UTC + $ date -d 'Wed 06 Jan 2021 03:50:36 PM UTC' +%s + 1609948236 + +Every time you build U-Boot this will update based on the time +on your build machine. See 'Reproducible builds' if you want to +avoid that.
Otherwise,
PATCH v3 2/12 Makefile: Provide numeric versions
In reply to Simon GlassFor SMBIOS we want to store the numeric version numbers in the tables. It does not make sense to parse the strings. Instead, add new #defines with the version and patchlevel.
---
Changes in v3:
- Use .rst file instead of README
Makefile | 4 ++++ doc/develop/version.rst | 8 ++++++++ 2 files changed, 12 insertions(+)
Makefile +4 -0
@@ -1849,9 +1849,13 @@ prepare: prepare0 # Generate some files # --------------------------------------------------------------------------- +# Use sed to remove leading zeros from PATCHLEVEL to avoid using octal numbers define filechk_version.h (echo \#define PLAIN_VERSION \"$(UBOOTRELEASE)\"; \ echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION; \ + echo \#define U_BOOT_VERSION_NUM $(VERSION); \ + echo \#define U_BOOT_VERSION_NUM_PATCH $$(echo $(PATCHLEVEL) | \ + sed -e "s/^0*//"); \ echo \#define CC_VERSION_STRING \"$$(LC_ALL=C $(CC) --version | head -n 1)\"; \ echo \#define LD_VERSION_STRING \"$$(LC_ALL=C $(LD) --version | head -n 1)\"; ) endef
doc/develop/version.rst +8 -0
@@ -69,6 +69,14 @@ The following are available: U-Boot 2020.10 (Jan 06 2021 - 08:50:36 -0700) U-Boot 2021.01-rc5-00248-g60dd854f3ba-dirty (Jan 06 2021 - 08:50:36 -0700) for spring + U_BOOT_VERSION_NUM (integer #define) + Release year, e.g. 2021 for release 2021.01. Note + this is an integer, not a string. + + U_BOOT_VERSION_NUM_PATCH (integer #define) + Patch number, e.g. 1 for release 2020.01. Note + this is an integer, not a string. + Build date/time is also included. See the generated file include/generated/timestamp_autogenerated.h for the available fields. For example::
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 3/12 smbios: Move smbios_write_type to the C file
In reply to Simon GlassThis type is not used outside the smbios.c file so there is no need for it to be in the header file. Move it.
---
(no changes since v1)
include/smbios.h | 10 ---------- lib/smbios.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-)
include/smbios.h +0 -10
@@ -219,16 +219,6 @@ static inline void fill_smbios_header(void *table, int type, header->handle = handle; } -/** -* Function prototype to write a specific type of SMBIOS structure -* -* @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,ofnode node); -/** * write_smbios_table() - Write SMBIOS table *
lib/smbios.c +10 -0
@@ -17,6 +17,16 @@#include <dm/uclass-internal.h> #endif +/** +* Function prototype to write a specific type of SMBIOS structure +* +* @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,ofnode node); +/** * struct smbios_write_method - Information about a table-writing function *
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 4/12 smbios: Use char consistently for the eos member
In reply to Simon GlassAt present a few of the structs use u8 instead of char. This is a string, so char is better. Update them.
---
(no changes since v1)
include/smbios.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/smbios.h +2 -2
@@ -183,14 +183,14 @@ struct __packed smbios_type32 {u16 handle;u8 reserved[6 ];u8 boot_status; -u8 eos[SMBIOS_STRUCT_EOS_BYTES ]; +char eos[SMBIOS_STRUCT_EOS_BYTES ]; };struct __packed smbios_type127 {u8 type;u8 length;u16 handle; -u8 eos[SMBIOS_STRUCT_EOS_BYTES ]; +char eos[SMBIOS_STRUCT_EOS_BYTES ]; };struct __packed smbios_header {
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 5/12 smbios: Set BIOS release version
In reply to Simon GlassWe may as well include the U-Boot release information in the type-0 table since it is designed for that purpose.
U-Boot uses release versions based on the year and month. The year cannot fit in a byte, so drop the century.
---
(no changes since v2)
Changes in v2:
- Add a comment about dropping the century
lib/smbios.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
lib/smbios.c +3 -2
@@ -143,8 +143,9 @@ static int smbios_write_type0(ulong *current, int handle, ofnode node)#endif t->bios_characteristics_ext2 =BIOS_CHARACTERISTICS_EXT2_TARGET ; - t->bios_major_release =0xff ; - t->bios_minor_release =0xff ; +/* bios_major_release has only one byte, so drop century */ + t->bios_major_release =U_BOOT_VERSION_NUM %100 ; + t->bios_minor_release =U_BOOT_VERSION_NUM_PATCH ; t->ec_major_release =0xff ; t->ec_minor_release =0xff ;
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 6/12 smbios: Use a struct to keep track of context
In reply to Simon GlassAt present we pass the ofnode to each function. We also pass the 'eos' pointer for adding new strings. We don't track the current end of the string table, so have smbios_string_table_len() to find that.
The code can be made more efficient if it keeps information in a context struct. This also makes it easier to add more features.
As a first step, switch the ofnode parameter to be a context pointer. Update smbios_add_prop() at the same time to avoid changing the same lines of code in consecutive patches.
---
(no changes since v2)
Changes in v2:
- Zero the context's dev pointer if not used
lib/smbios.c | 87 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 32 deletions(-)
lib/smbios.c +55 -32
@@ -17,15 +17,27 @@#include <dm/uclass-internal.h> #endif +/** +* struct smbios_ctx - context for writing SMBIOS tables +* +* @node: node containing the information to write (ofnode_null() if none) +* @dev: sysinfo device to use (NULL if none) +*/ +struct smbios_ctx { +ofnode node; +struct udevice *dev; +}; +/** * Function prototype to write a specific type of SMBIOS structure * * @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) +* @ctx: context for writing the tables * @return: size of the structure */ -typedef int (*smbios_write_type )(ulong *addr,int handle,ofnode node); +typedef int (*smbios_write_type )(ulong *addr,int handle, +struct smbios_ctx *ctx);/** * struct smbios_write_method - Information about a table-writing function
@@ -78,17 +90,18 @@ static int smbios_add_string(char *start, const char *str)* 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) +* @ctx: context for writing the tables * @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) +static int smbios_add_prop (char *start,struct smbios_ctx *ctx, +const char *prop) {if (IS_ENABLED (CONFIG_OF_CONTROL )) {const char *str; - str =ofnode_read_string (node, prop); + str =ofnode_read_string (ctx->node, prop);if (str)return smbios_add_string (start, str); }
@@ -118,7 +131,8 @@ static int smbios_string_table_len(char *start)return len +1 ; } -static int smbios_write_type0 (ulong *current,int handle,ofnode node) +static int smbios_write_type0 (ulong *current,int handle, +struct smbios_ctx *ctx) {struct smbios_type0 *t;int len =sizeof (struct smbios_type0 );
@@ -156,7 +170,8 @@ static int smbios_write_type0(ulong *current, int handle, ofnode node)return len; } -static int smbios_write_type1 (ulong *current,int handle,ofnode node) +static int smbios_write_type1 (ulong *current,int handle, +struct smbios_ctx *ctx) {struct smbios_type1 *t;int len =sizeof (struct smbios_type1 );
@@ -165,17 +180,17 @@ 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_prop (t->eos, node,"manufacturer" ); - t->product_name =smbios_add_prop (t->eos, node,"product" ); - t->version =smbios_add_prop (t->eos, node,"version" ); + t->manufacturer =smbios_add_prop (t->eos, ctx,"manufacturer" ); + t->product_name =smbios_add_prop (t->eos, ctx,"product" ); + t->version =smbios_add_prop (t->eos, ctx,"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->serial_number =smbios_add_prop (t->eos, ctx,"serial" ); } - t->sku_number =smbios_add_prop (t->eos, node,"sku" ); - t->family =smbios_add_prop (t->eos, node,"family" ); + t->sku_number =smbios_add_prop (t->eos, ctx,"sku" ); + t->family =smbios_add_prop (t->eos, ctx,"family" ); len = t->length +smbios_string_table_len (t->eos); *current += len;
@@ -184,7 +199,8 @@ static int smbios_write_type1(ulong *current, int handle, ofnode node)return len; } -static int smbios_write_type2 (ulong *current,int handle,ofnode node) +static int smbios_write_type2 (ulong *current,int handle, +struct smbios_ctx *ctx) {struct smbios_type2 *t;int len =sizeof (struct smbios_type2 );
@@ -192,9 +208,9 @@ 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_prop (t->eos, node,"manufacturer" ); - t->product_name =smbios_add_prop (t->eos, node,"product" ); - t->asset_tag_number =smbios_add_prop (t->eos, node,"asset-tag" ); + t->manufacturer =smbios_add_prop (t->eos, ctx,"manufacturer" ); + t->product_name =smbios_add_prop (t->eos, ctx,"product" ); + t->asset_tag_number =smbios_add_prop (t->eos, ctx,"asset-tag" ); t->feature_flags =SMBIOS_BOARD_FEATURE_HOSTING ; t->board_type =SMBIOS_BOARD_MOTHERBOARD ;
@@ -205,7 +221,8 @@ static int smbios_write_type2(ulong *current, int handle, ofnode node)return len; } -static int smbios_write_type3 (ulong *current,int handle,ofnode node) +static int smbios_write_type3 (ulong *current,int handle, +struct smbios_ctx *ctx) {struct smbios_type3 *t;int len =sizeof (struct smbios_type3 );
@@ -213,7 +230,7 @@ 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_prop (t->eos, node,"manufacturer" ); + t->manufacturer =smbios_add_prop (t->eos, ctx,"manufacturer" ); t->chassis_type =SMBIOS_ENCLOSURE_DESKTOP ; t->bootup_state =SMBIOS_STATE_SAFE ; t->power_supply_state =SMBIOS_STATE_SAFE ;
@@ -227,7 +244,8 @@ static int smbios_write_type3(ulong *current, int handle, ofnode node)return len; } -static void smbios_write_type4_dm (struct smbios_type4 *t,ofnode node) +static void smbios_write_type4_dm (struct smbios_type4 *t, +struct smbios_ctx *ctx) {u16 processor_family =SMBIOS_PROCESSOR_FAMILY_UNKNOWN ;const char *vendor ="Unknown" ;
@@ -259,7 +277,8 @@ static void smbios_write_type4_dm(struct smbios_type4 *t, ofnode node) t->processor_version =smbios_add_string (t->eos, name); } -static int smbios_write_type4 (ulong *current,int handle,ofnode node) +static int smbios_write_type4 (ulong *current,int handle, +struct smbios_ctx *ctx) {struct smbios_type4 *t;int len =sizeof (struct smbios_type4 );
@@ -268,7 +287,7 @@ static int smbios_write_type4(ulong *current, int handle, ofnode node)memset (t,0 ,sizeof (struct smbios_type4 ));fill_smbios_header (t,SMBIOS_PROCESSOR_INFORMATION , len, handle); t->processor_type =SMBIOS_PROCESSOR_TYPE_CENTRAL ; -smbios_write_type4_dm (t, node); +smbios_write_type4_dm (t, ctx); t->status =SMBIOS_PROCESSOR_STATUS_ENABLED ; t->processor_upgrade =SMBIOS_PROCESSOR_UPGRADE_NONE ; t->l1_cache_handle =0xffff ;
@@ -283,7 +302,8 @@ static int smbios_write_type4(ulong *current, int handle, ofnode node)return len; } -static int smbios_write_type32 (ulong *current,int handle,ofnode node) +static int smbios_write_type32 (ulong *current,int handle, +struct smbios_ctx *ctx) {struct smbios_type32 *t;int len =sizeof (struct smbios_type32 );
@@ -298,7 +318,8 @@ static int smbios_write_type32(ulong *current, int handle, ofnode node)return len; } -static int smbios_write_type127 (ulong *current,int handle,ofnode node) +static int smbios_write_type127 (ulong *current,int handle, +struct smbios_ctx *ctx) {struct smbios_type127 *t;int len =sizeof (struct smbios_type127 );
@@ -327,7 +348,7 @@ ulong write_smbios_table(ulong addr) {ofnode parent_node =ofnode_null ();struct smbios_entry *se; -struct udevice *dev; +struct smbios_ctx ctx;ulong table_addr;ulong tables;int len =0 ;
@@ -337,10 +358,13 @@ ulong write_smbios_table(ulong addr)int isize;int i; + ctx.node =ofnode_null ();if (IS_ENABLED (CONFIG_OF_CONTROL )) { -uclass_first_device (UCLASS_SYSINFO , &dev); -if (dev) - parent_node =dev_read_subnode (dev,"smbios" ); +uclass_first_device (UCLASS_SYSINFO , &ctx.dev); +if (ctx.dev) + parent_node =dev_read_subnode (ctx.dev,"smbios" ); + }else { + ctx.dev =NULL ; }/* 16 byte align the table address */
@@ -356,14 +380,13 @@ ulong write_smbios_table(ulong addr)/* populate minimum required tables */ for (i =0 ; i <ARRAY_SIZE (smbios_write_funcs); i++) {const struct smbios_write_method *method; -ofnode node =ofnode_null ();int tmp; method = &smbios_write_funcs[i];if (IS_ENABLED (CONFIG_OF_CONTROL ) && method->subnode_name) - node =ofnode_find_subnode (parent_node, - method->subnode_name); - tmp = method->write ((ulong *)&addr, handle++, node); + ctx.node =ofnode_find_subnode (parent_node, + method->subnode_name); + tmp = method->write ((ulong *)&addr, handle++, &ctx); max_struct_size =max (max_struct_size, tmp); len += tmp;
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 7/12 smbios: Drop the eos parameter
In reply to Simon GlassWe can store this in the context and avoid passing it to each function. This makes it easier to follow and will also allow keeping track of the end of the string table (in future patches).
Add an 'eos' field to the context and create a function to set it up.
---
Changes in v3:
- Fix comment for smbios_add_prop()
- Rename set_eos() to smbios_set_eos()
lib/smbios.c | 60 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 24 deletions(-)
lib/smbios.c +36 -24
@@ -22,10 +22,13 @@* * @node: node containing the information to write (ofnode_null() if none) * @dev: sysinfo device to use (NULL if none) +* @eos: end-of-string pointer for the table being processed. This is set +* up when we start processing a table */ struct smbios_ctx {ofnode node;struct udevice *dev; +char *eos; };/**
@@ -57,14 +60,15 @@ struct smbios_write_method {* This adds a string to the string area which is appended directly after * the formatted portion of an SMBIOS structure. * -* @start: string area start address +* @ctx: SMBIOS context * @str: string to add * @return: string number in the string area (1 or more) */ -static int smbios_add_string (char *start,const char *str) +static int smbios_add_string (struct smbios_ctx *ctx,const char *str) {int i =1 ; -char *p = start; +char *p = ctx->eos; +if (!*str) str ="Unknown" ;
@@ -89,26 +93,28 @@ static int smbios_add_string(char *start, const char *str)/** * smbios_add_prop() - Add a property from the device tree * -* @start: string area start address * @ctx: context for writing the tables * @prop: property to write * @return 0 if not found, else SMBIOS string number (1 or more) */ -static int smbios_add_prop (char *start,struct smbios_ctx *ctx, -const char *prop) +static int smbios_add_prop (struct smbios_ctx *ctx,const char *prop) { -if (IS_ENABLED (CONFIG_OF_CONTROL )) {const char *str; str =ofnode_read_string (ctx->node, prop);if (str) -return smbios_add_string (start, str); +return smbios_add_string (ctx, str); }return 0 ; } +static void smbios_set_eos (struct smbios_ctx *ctx,char *eos) +{ + ctx->eos = eos; +} +/** * smbios_string_table_len() - compute the string area size *
@@ -140,9 +146,10 @@ static int smbios_write_type0(ulong *current, int handle, t =map_sysmem (*current, len);memset (t,0 ,sizeof (struct smbios_type0 ));fill_smbios_header (t,SMBIOS_BIOS_INFORMATION , len, handle); - t->vendor =smbios_add_string (t->eos,"U-Boot" ); - t->bios_ver =smbios_add_string (t->eos,PLAIN_VERSION ); - t->bios_release_date =smbios_add_string (t->eos,U_BOOT_DMI_DATE ); +smbios_set_eos (ctx, t->eos); + t->vendor =smbios_add_string (ctx,"U-Boot" ); + t->bios_ver =smbios_add_string (ctx,PLAIN_VERSION ); + t->bios_release_date =smbios_add_string (ctx,U_BOOT_DMI_DATE );#ifdef CONFIG_ROM_SIZE t->bios_rom_size = (CONFIG_ROM_SIZE /65536 ) -1 ;#endif
@@ -180,17 +187,18 @@ static int smbios_write_type1(ulong *current, int handle, 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_prop (t->eos, ctx,"manufacturer" ); - t->product_name =smbios_add_prop (t->eos, ctx,"product" ); - t->version =smbios_add_prop (t->eos, ctx,"version" ); +smbios_set_eos (ctx, t->eos); + t->manufacturer =smbios_add_prop (ctx,"manufacturer" ); + t->product_name =smbios_add_prop (ctx,"product" ); + t->version =smbios_add_prop (ctx,"version" );if (serial_str) { - t->serial_number =smbios_add_string (t->eos, serial_str); + t->serial_number =smbios_add_string (ctx, serial_str);strncpy ((char *)t->uuid, serial_str,sizeof (t->uuid)); }else { - t->serial_number =smbios_add_prop (t->eos, ctx,"serial" ); + t->serial_number =smbios_add_prop (ctx,"serial" ); } - t->sku_number =smbios_add_prop (t->eos, ctx,"sku" ); - t->family =smbios_add_prop (t->eos, ctx,"family" ); + t->sku_number =smbios_add_prop (ctx,"sku" ); + t->family =smbios_add_prop (ctx,"family" ); len = t->length +smbios_string_table_len (t->eos); *current += len;
@@ -208,9 +216,10 @@ static int smbios_write_type2(ulong *current, int handle, 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_prop (t->eos, ctx,"manufacturer" ); - t->product_name =smbios_add_prop (t->eos, ctx,"product" ); - t->asset_tag_number =smbios_add_prop (t->eos, ctx,"asset-tag" ); +smbios_set_eos (ctx, t->eos); + t->manufacturer =smbios_add_prop (ctx,"manufacturer" ); + t->product_name =smbios_add_prop (ctx,"product" ); + t->asset_tag_number =smbios_add_prop (ctx,"asset-tag" ); t->feature_flags =SMBIOS_BOARD_FEATURE_HOSTING ; t->board_type =SMBIOS_BOARD_MOTHERBOARD ;
@@ -230,7 +239,8 @@ static int smbios_write_type3(ulong *current, int handle, 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_prop (t->eos, ctx,"manufacturer" ); +smbios_set_eos (ctx, t->eos); + t->manufacturer =smbios_add_prop (ctx,"manufacturer" ); t->chassis_type =SMBIOS_ENCLOSURE_DESKTOP ; t->bootup_state =SMBIOS_STATE_SAFE ; t->power_supply_state =SMBIOS_STATE_SAFE ;
@@ -273,8 +283,8 @@ static void smbios_write_type4_dm(struct smbios_type4 *t,#endif t->processor_family = processor_family; - t->processor_manufacturer =smbios_add_string (t->eos, vendor); - t->processor_version =smbios_add_string (t->eos, name); + t->processor_manufacturer =smbios_add_string (ctx, vendor); + t->processor_version =smbios_add_string (ctx, name); } static int smbios_write_type4(ulong *current, int handle,
@@ -286,6 +296,7 @@ static int smbios_write_type4(ulong *current, int handle, t =map_sysmem (*current, len);memset (t,0 ,sizeof (struct smbios_type4 ));fill_smbios_header (t,SMBIOS_PROCESSOR_INFORMATION , len, handle); +smbios_set_eos (ctx, t->eos); t->processor_type =SMBIOS_PROCESSOR_TYPE_CENTRAL ;smbios_write_type4_dm (t, ctx); t->status =SMBIOS_PROCESSOR_STATUS_ENABLED ;
@@ -311,6 +322,7 @@ static int smbios_write_type32(ulong *current, int handle, t =map_sysmem (*current, len);memset (t,0 ,sizeof (struct smbios_type32 ));fill_smbios_header (t,SMBIOS_SYSTEM_BOOT_INFORMATION , len, handle); +smbios_set_eos (ctx, t->eos); *current += len;unmap_sysmem (t);
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 7/12 smbios: Drop the eos parameter
Quoted 8 lines · Simon Glass
We can store this in the context and avoid passing it to each function. This makes it easier to follow and will also allow keeping track of the end of the string table (in future patches).
Add an 'eos' field to the context and create a function to set it up.
Signed-off-by Simon Glass <[email protected]>
Quoted 9 lines
---
Changes in v3:
- Fix comment forsmbios_add_prop()
- Renameset_eos()tosmbios_set_eos()lib/smbios.c | 60 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 24 deletions(-)
PATCH v3 8/12 smbios: Track the end of the string table
In reply to Simon GlassAdd a new member to the context struct which tracks the end of the string table. This allows us to avoid recalculating this at the end.
---
(no changes since v1)
lib/smbios.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-)
lib/smbios.c +15 -17
@@ -24,11 +24,15 @@* @dev: sysinfo device to use (NULL if none) * @eos: end-of-string pointer for the table being processed. This is set * up when we start processing a table +* @next_ptr: pointer to the start of the next string to be added. When the +* table is nopt empty, this points to the byte after the \0 of the +* previous string. */ struct smbios_ctx {ofnode node;struct udevice *dev;char *eos; +char *next_ptr; };/**
@@ -77,6 +81,7 @@ static int smbios_add_string(struct smbios_ctx *ctx, const char *str)strcpy (p, str); p +=strlen (str); *p++ ='\0' ; + ctx->next_ptr = p; *p++ ='\0' ;return i;
@@ -113,6 +118,7 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop)static void smbios_set_eos (struct smbios_ctx *ctx,char *eos) { ctx->eos = eos; + ctx->next_ptr = eos; }/**
@@ -120,21 +126,13 @@ static void smbios_set_eos(struct smbios_ctx *ctx, char *eos)* * This computes the size of the string area including the string terminator. * -* @start: string area start address +* @ctx: SMBIOS context * @return: string area size */ -static int smbios_string_table_len (char *start) +static int smbios_string_table_len (const struct smbios_ctx *ctx) { -char *p = start; -int i, len =0 ; - -while (*p) { - i =strlen (p) +1 ; - p += i; - len += i; - } - -return len +1 ; +/* Allow for the final \0 after all strings */ +return (ctx->next_ptr +1 ) - ctx->eos; } static int smbios_write_type0(ulong *current, int handle,
@@ -170,7 +168,7 @@ static int smbios_write_type0(ulong *current, int handle, t->ec_major_release =0xff ; t->ec_minor_release =0xff ; - len = t->length +smbios_string_table_len (t->eos); + len = t->length +smbios_string_table_len (ctx); *current += len;unmap_sysmem (t);
@@ -200,7 +198,7 @@ static int smbios_write_type1(ulong *current, int handle, t->sku_number =smbios_add_prop (ctx,"sku" ); t->family =smbios_add_prop (ctx,"family" ); - len = t->length +smbios_string_table_len (t->eos); + len = t->length +smbios_string_table_len (ctx); *current += len;unmap_sysmem (t);
@@ -223,7 +221,7 @@ static int smbios_write_type2(ulong *current, int handle, t->feature_flags =SMBIOS_BOARD_FEATURE_HOSTING ; t->board_type =SMBIOS_BOARD_MOTHERBOARD ; - len = t->length +smbios_string_table_len (t->eos); + len = t->length +smbios_string_table_len (ctx); *current += len;unmap_sysmem (t);
@@ -247,7 +245,7 @@ static int smbios_write_type3(ulong *current, int handle, t->thermal_state =SMBIOS_STATE_SAFE ; t->security_status =SMBIOS_SECURITY_NONE ; - len = t->length +smbios_string_table_len (t->eos); + len = t->length +smbios_string_table_len (ctx); *current += len;unmap_sysmem (t);
@@ -306,7 +304,7 @@ static int smbios_write_type4(ulong *current, int handle, t->l3_cache_handle =0xffff ; t->processor_family2 = t->processor_family; - len = t->length +smbios_string_table_len (t->eos); + len = t->length +smbios_string_table_len (ctx); *current += len;unmap_sysmem (t);
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 9/12 smbios: Add more options for the BIOS version string
In reply to Simon GlassAt present the version string is obtained from PLAIN_VERSION. Some boards may want to configure this using the device tree, since the build system can more easily insert things there after U-Boot itself is built. Add this option to the code.
Also in some cases the version needs to be generated programmatically, such as when it is stored elsewhere in the ROM and must be read first. To handle this, keep a pointer around so that it can be updated later. This works by storing the last string in the context, since it is easier than passing out a little-used extra parameter.
Provide a function to update the version string.
---
Changes in v3:
- Add missing DECLARE_GLOBAL_DATA_PTR
Changes in v2:
- Correct documentation format
include/asm-generic/global_data.h | 6 ++++ include/smbios.h | 12 +++++++ lib/smbios.c | 58 +++++++++++++++++++++++++++++-- 3 files changed, 73 insertions(+), 3 deletions(-)
include/asm-generic/global_data.h +6 -0
@@ -439,6 +439,12 @@ struct global_data {*/ struct acpi_ctx *acpi_ctx;#endif +#if CONFIG_IS_ENABLED (GENERATE_SMBIOS_TABLE ) +/** +* @smbios_version: Points to SMBIOS type 0 version +*/ +char *smbios_version; +#endif };/**
include/smbios.h +12 -0
@@ -257,4 +257,16 @@ const struct smbios_header *smbios_header(const struct smbios_entry *entry, int*/ const char *smbios_string (const struct smbios_header *header,int index); +/** +* smbios_update_version() - Update the version string +* +* This can be called after the SMBIOS tables are written (e.g. after the U-Boot +* main loop has started) to update the BIOS version string (SMBIOS table 0). +* +* @version: New version string to use +* @return 0 if OK, -ENOENT if no version string was previously written, +* -ENOSPC if the new string is too large to fit +*/ +int smbios_update_version (const char *version); +#endif /* _SMBIOS_H_ */
lib/smbios.c +55 -3
107 lines not on this page · raw message
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 9/12 smbios: Add more options for the BIOS version string
Quoted 21 lines · Simon Glass
At present the version string is obtained from
PLAIN_VERSION. Some boards may want to configure this using the device tree, since the build system can more easily insert things there after U-Boot itself is built. Add this option to the code.Also in some cases the version needs to be generated programmatically, such as when it is stored elsewhere in the ROM and must be read first. To handle this, keep a pointer around so that it can be updated later. This works by storing the last string in the context, since it is easier than passing out a little-used extra parameter.
Provide a function to update the version string.
Signed-off-by Simon Glass <[email protected]>Reviewed-by Bin Meng <[email protected]>---
Changes in v3:
- Add missingDECLARE_GLOBAL_DATA_PTR
Quoted 8 lines
Changes in v2:
- Correct documentation formatinclude/asm-generic/global_data.h | 6 ++++ include/smbios.h | 12 +++++++ lib/smbios.c | 58 +++++++++++++++++++++++++++++-- 3 files changed, 73 insertions(+), 3 deletions(-)
PATCH v3 10/12 sysinfo: Move #ifdef so that operations are always defined
In reply to Simon GlassAt present the struct is not available unless SYSINFO is enabled. This is annoying since code it is not possible to use compile-time checks like CONFIG_IS_ENABLED(SYSINFO) with this header.
Fix it by moving the #ifdef.
---
(no changes since v2)
Changes in v2:
- Add new patch to fix sysinfo with CONFIG_IS_ENABLED()
include/sysinfo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/sysinfo.h +1 -1
@@ -31,7 +31,6 @@* to read the serial number. */ -#if CONFIG_IS_ENABLED (SYSINFO )struct sysinfo_ops {/** * detect() - Run the hardware info detection procedure for this
@@ -102,6 +101,7 @@ struct sysinfo_ops {#define sysinfo_get_ops (dev) ((struct sysinfo_ops *)(dev)->driver->ops) +#if CONFIG_IS_ENABLED (SYSINFO )/** * sysinfo_detect() - Run the hardware info detection procedure for this device. *
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 11/12 x86: coral: Add sysinfo ops
In reply to Simon GlassThese ops are missing at present which is not permitted. Add an empty operation struct.
Note: If the uclass requires operations then the drivers should provide them. Otherwise, checking for missing operations must be done in every uclass operation, so it adds to code size.
---
Changes in v3:
- Expand commit to explain why operations are required
Changes in v2:
- Add new patch to fix crash on coral
board/google/chromebook_coral/coral.c | 5 +++++ 1 file changed, 5 insertions(+)
board/google/chromebook_coral/coral.c +5 -0
@@ -8,6 +8,7 @@#include <command.h> #include <dm.h> #include <log.h> +#include <sysinfo.h> #include <acpi/acpigen.h> #include <asm-generic/gpio.h> #include <asm/acpi_nhlt.h>
@@ -143,6 +144,9 @@ struct acpi_ops coral_acpi_ops = { .inject_dsdt = chromeos_acpi_gpio_generate, }; +struct sysinfo_ops coral_sysinfo_ops = { +}; +#if !CONFIG_IS_ENABLED (OF_PLATDATA )static const struct udevice_id coral_ids[] = { { .compatible = "google,coral" },
@@ -154,5 +158,6 @@ U_BOOT_DRIVER(coral_drv) = { .name = "coral", .id = UCLASS_SYSINFO, .of_match = of_match_ptr(coral_ids), + .ops = &coral_sysinfo_ops, ACPI_OPS_PTR(&coral_acpi_ops) };
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 11/12 x86: coral: Add sysinfo ops
Quoted 11 lines · Simon Glass
These ops are missing at present which is not permitted. Add an empty operation struct.
Note: If the uclass requires operations then the drivers should provide them. Otherwise, checking for missing operations must be done in every uclass operation, so it adds to code size.
Signed-off-by Simon Glass <[email protected]>---
Quoted 9 lines
Changes in v3:
- Expand commit to explain why operations are requiredChanges in v2:
- Add new patch to fix crash on coralboard/google/chromebook_coral/coral.c | 5 +++++ 1 file changed, 5 insertions(+)
PATCH v3 12/12 smbios: Allow a few values to come from sysinfo
In reply to Simon GlassWhile static configuration is useful it cannot cover every case. Sometimes board revisions are encoded in resistor straps and must be read at runtime.
The easiest way to provide this information is via sysinfo, since the board can then provide a driver to read whatever is needed.
Add some standard sysinfo options for this, and use them to obtain the required information.
---
Changes in v3:
- Use SMBIOS_STR_MAX for the max sysinfo string length
include/sysinfo.h | 11 +++++++++++ lib/smbios.c | 32 +++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-)
include/sysinfo.h +11 -0
@@ -31,6 +31,17 @@* to read the serial number. */ +/** enum sysinfo_id - Standard IDs defined by U-Boot */ +enum sysinfo_id { +SYSINFO_ID_NONE , + +SYSINFO_ID_SMBIOS_SYSTEM_VERSION , +SYSINFO_ID_SMBIOS_BASEBOARD_VERSION , + +/* First value available for downstream/board used */ +SYSINFO_ID_USER =0x1000 , +}; +struct sysinfo_ops {/** * detect() - Run the hardware info detection procedure for this
lib/smbios.c +29 -3
@@ -10,6 +10,7 @@#include <env.h> #include <mapmem.h> #include <smbios.h> +#include <sysinfo.h> #include <tables_csum.h> #include <version.h> #ifdef CONFIG_CPU
@@ -108,14 +109,25 @@ static int smbios_add_string(struct smbios_ctx *ctx, const char *str) }/** -* smbios_add_prop() - Add a property from the device tree +* smbios_add_prop_si() - Add a property from the devicetree or sysinfo +* +* Sysinfo is used if available, with a fallback to devicetree * * @ctx: context for writing the tables * @prop: property to write * @return 0 if not found, else SMBIOS string number (1 or more) */ -static int smbios_add_prop (struct smbios_ctx *ctx,const char *prop) +static int smbios_add_prop_si (struct smbios_ctx *ctx,const char *prop, +int sysinfo_id) { +if (sysinfo_id && ctx->dev) { +char val[SMBIOS_STR_MAX ]; +int ret; + + ret =sysinfo_get_str (ctx->dev, sysinfo_id,sizeof (val), val); +if (!ret) +return smbios_add_string (ctx, val); + }if (IS_ENABLED (CONFIG_OF_CONTROL )) {const char *str;
@@ -127,6 +139,17 @@ static int smbios_add_prop(struct smbios_ctx *ctx, const char *prop)return 0 ; } +/** +* smbios_add_prop() - Add a property from the devicetree +* +* @prop: property to write +* @return 0 if not found, else SMBIOS string number (1 or more) +*/ +static int smbios_add_prop (struct smbios_ctx *ctx,const char *prop) +{ +return smbios_add_prop_si (ctx, prop,SYSINFO_ID_NONE ); +} +static void smbios_set_eos (struct smbios_ctx *ctx,char *eos) { ctx->eos = eos;
@@ -240,7 +263,8 @@ static int smbios_write_type1(ulong *current, int handle,smbios_set_eos (ctx, t->eos); t->manufacturer =smbios_add_prop (ctx,"manufacturer" ); t->product_name =smbios_add_prop (ctx,"product" ); - t->version =smbios_add_prop (ctx,"version" ); + t->version =smbios_add_prop_si (ctx,"version" , +SYSINFO_ID_SMBIOS_SYSTEM_VERSION );if (serial_str) { t->serial_number =smbios_add_string (ctx, serial_str);strncpy ((char *)t->uuid, serial_str,sizeof (t->uuid));
@@ -269,6 +293,8 @@ static int smbios_write_type2(ulong *current, int handle,smbios_set_eos (ctx, t->eos); t->manufacturer =smbios_add_prop (ctx,"manufacturer" ); t->product_name =smbios_add_prop (ctx,"product" ); + t->version =smbios_add_prop_si (ctx,"version" , +SYSINFO_ID_SMBIOS_BASEBOARD_VERSION ); t->asset_tag_number =smbios_add_prop (ctx,"asset-tag" ); t->feature_flags =SMBIOS_BOARD_FEATURE_HOSTING ; t->board_type =SMBIOS_BOARD_MOTHERBOARD ;
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
PATCH v3 12/12 smbios: Allow a few values to come from sysinfo
Hi Simon,
Quoted 5 lines · Simon Glass
While static configuration is useful it cannot cover every case. Sometimes board revisions are encoded in resistor straps and must be read at runtime.
Quoted 8 lines
The easiest way to provide this information is via sysinfo, since the board can then provide a driver to read whatever is needed.
Add some standard sysinfo options for this, and use them to obtain the required information.
Signed-off-by Simon Glass <[email protected]>
I guess you used patman to automatically collect the Reviewed-by tag?
Is this blank line inserted by patman? If yes, we should fix patman to avoid this.
Quoted 10 lines
Reviewed-by Bin Meng <[email protected]>---
Changes in v3:
- UseSMBIOS_STR_MAXfor the max sysinfo string lengthinclude/sysinfo.h | 11 +++++++++++ lib/smbios.c | 32 +++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-)
Regards,
Bin
PATCH v3 12/12 smbios: Allow a few values to come from sysinfo
Hi Bin,
Quoted 15 lines · Bin Meng
Hi Simon,
Quoted 11 lines · Simon Glass
While static configuration is useful it cannot cover every case. Sometimes board revisions are encoded in resistor straps and must be read at runtime.
The easiest way to provide this information is via sysinfo, since the board can then provide a driver to read whatever is needed.
Add some standard sysinfo options for this, and use them to obtain the required information.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Simon Glass <[email protected]>I guess you used patman to automatically collect the Reviewed-by tag?
Is this blank line inserted by patman? If yes, we should fix patman to avoid this.
Yes I use patman to collect review tags and also to show comments. I find it much more convenient than using the web interface.
I believe that bug is fixed now, but let's see if it happens again.
Regards,
Simon