smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

smbios: Pass smbios_info to smbios_next_table()

Browse Source 
At present smbios_next_table() does not support SMBIOS v2 tables. Pass
in the info struct so that it can check for the end of the tables.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-08-15 06:41:27 -06:00
parent 31d89f2dac
commit 69f0425961
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/smbios.c
View File

@@ -401,7 +401,7 @@ static int do_smbios(struct cmd_tbl *cmdtp, int flag, int argc,
(unsigned long long)map_to_sysmem(info.table));
for (struct smbios_header *pos = info.table; pos;
pos = smbios_next_table(pos)) {
pos = smbios_next_table(&info, pos)) {
printf("\nHandle 0x%04x, DMI type %d, %d bytes at 0x%llx\n",
pos->handle, pos->type, pos->length,
(unsigned long long)map_to_sysmem(pos));

4
include/smbios.h
View File

@@ -413,10 +413,12 @@ const char *smbios_get_string(void *table, int index);
/**
* smbios_next_table() - Find the next table
*
* @info: SMBIOS info
* @table: Table to start from
* Return: Pointer to the next table, or NULL if @table is the last
*/
struct smbios_header *smbios_next_table(struct smbios_header *table);
struct smbios_header *smbios_next_table(const struct smbios_info *info,
struct smbios_header *table);
/**
* smbios_locate() - Locate the SMBIOS tables

7
lib/smbios-parser.c
View File

@@ -32,10 +32,13 @@ const char *smbios_get_string(void *table, int index)
return str;
}
struct smbios_header *smbios_next_table(struct smbios_header *table)
struct smbios_header *smbios_next_table(const struct smbios_info *info,
struct smbios_header *table)
{
const char *str;
if ((ulong)table - (ulong)info->table >= info->max_size)
return NULL;
if (table->type == SMBIOS_END_OF_TABLE)
return NULL;
@@ -317,7 +320,7 @@ int smbios_locate(ulong addr, struct smbios_info *info)
info->count = 0;
for (struct smbios_header *pos = info->table; pos;
pos = smbios_next_table(pos))
pos = smbios_next_table(info, pos))
info->count++;
return 0;