narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[smbios] Allow access to multiple instances of SMBIOS structures 

Extend the syntax for numerical SMBIOS settings from

  smbios/<type>.<offset>.<length>

to

  smbios/[<instance>.]<type>.<offset>.<length>

Where SMBIOS provides multiple structures with the same <type>, this
extended syntax allows for access to structures other than the first.
If <instance> is omitted then it will default to zero, giving access
to the first instance (and so matching existing behaviour).

The 16-bit SMBIOS handle (which is an alternative way to disambiguate
multiple instances of the same type of structure) can be accessed, if
required, using

  smbios/<instance>.<type>.2.2:uint16

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/13/head
Michael Brown 2013-05-01 20:42:57 +01:00
parent a352fde45e
commit 8bc20c1aa0
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/ipxe/smbios.h
View File

@ -162,7 +162,7 @@ struct smbios {
#define SMBIOS_VERSION( major, minor ) ( ( (major) << 8 ) | (minor) ) #define SMBIOS_VERSION( major, minor ) ( ( (major) << 8 ) | (minor) )
extern int find_smbios ( struct smbios *smbios ); extern int find_smbios ( struct smbios *smbios );
extern int find_smbios_structure ( unsigned int type, extern int find_smbios_structure ( unsigned int type, unsigned int instance,
struct smbios_structure *structure ); struct smbios_structure *structure );
extern int read_smbios_structure ( struct smbios_structure *structure, extern int read_smbios_structure ( struct smbios_structure *structure,
void *data, size_t len ); void *data, size_t len );

6
src/interface/smbios/smbios.c
View File

@ -59,10 +59,11 @@ static size_t find_strings_terminator ( size_t offset ) {
* Find specific structure type within SMBIOS * Find specific structure type within SMBIOS
* *
* @v type Structure type to search for * @v type Structure type to search for
* @v instance Instance of this type of structure
* @v structure SMBIOS structure descriptor to fill in * @v structure SMBIOS structure descriptor to fill in
* @ret rc Return status code * @ret rc Return status code
*/ */
int find_smbios_structure ( unsigned int type, int find_smbios_structure ( unsigned int type, unsigned int instance,
struct smbios_structure *structure ) { struct smbios_structure *structure ) {
unsigned int count = 0; unsigned int count = 0;
size_t offset = 0; size_t offset = 0;
@ -105,7 +106,8 @@ int find_smbios_structure ( unsigned int type,
structure->header.len, structure->strings_len ); structure->header.len, structure->strings_len );
/* If this is the structure we want, return */ /* If this is the structure we want, return */
if ( structure->header.type == type ) { if ( ( structure->header.type == type ) &&
( instance-- == 0 ) ) {
structure->offset = offset; structure->offset = offset;
return 0; return 0;
} }

7
src/interface/smbios/smbios_settings.c
View File

@ -81,18 +81,21 @@ static int smbios_fetch ( struct settings *settings __unused,
struct setting *setting, struct setting *setting,
void *data, size_t len ) { void *data, size_t len ) {
struct smbios_structure structure; struct smbios_structure structure;
unsigned int tag_instance;
unsigned int tag_type; unsigned int tag_type;
unsigned int tag_offset; unsigned int tag_offset;
unsigned int tag_len; unsigned int tag_len;
int rc; int rc;
/* Split tag into type, offset and length */ /* Split tag into instance, type, offset and length */
tag_instance = ( ( setting->tag >> 24 ) & 0xff );
tag_type = ( ( setting->tag >> 16 ) & 0xff ); tag_type = ( ( setting->tag >> 16 ) & 0xff );
tag_offset = ( ( setting->tag >> 8 ) & 0xff ); tag_offset = ( ( setting->tag >> 8 ) & 0xff );
tag_len = ( setting->tag & 0xff ); tag_len = ( setting->tag & 0xff );
/* Find SMBIOS structure */ /* Find SMBIOS structure */
if ( ( rc = find_smbios_structure ( tag_type, &structure ) ) != 0 ) if ( ( rc = find_smbios_structure ( tag_type, tag_instance,
&structure ) ) != 0 )
return rc; return rc;
{ {