hvmloader: add SMBIOS type 2 info for customized string
PATCH v2 1/1 hvmloader: add SMBIOS type 2 info for customized string
Extend smbios type 2 struct to match specification, add support to write it when customized string provided and no smbios passed in.
---
CC: Jan Beulich <[email protected]>
CC: Igor Druzhinin <[email protected]>
CC: Sergey Dyasli <[email protected]>
CC: Andrew Cooper <[email protected]>
v2
1: write the struct if any of the strings is provided 2: add contained_handles as flexible array member 3: update commit message and fix style issue
--- tools/firmware/hvmloader/smbios.c | 69 ++++++++++++++++++++++++- tools/firmware/hvmloader/smbios_types.h | 7 +++ xen/include/public/hvm/hvm_xs_strings.h | 6 +++ 3 files changed, 80 insertions(+), 2 deletions(-)
tools/firmware/hvmloader/smbios.c +67 -2
@@ -497,9 +497,11 @@ static void * smbios_type_2_init(void *start) {struct smbios_type_2 *p = (struct smbios_type_2 *)start; +const char *s;uint8_t *ptr;void *pts;uint32_t length; +unsigned int counter =0 ; pts =get_smbios_pt_struct (2 , &length);if ( (pts !=NULL )&&(length >0 ) )
@@ -518,8 +520,71 @@ smbios_type_2_init(void *start)return (start + length); } -/* Only present when passed in */ -return start; +memset (p,0 ,sizeof (*p)); + p->header.type =2 ; + p->header.length =sizeof (struct smbios_type_2 ); + p->header.handle =SMBIOS_HANDLE_TYPE2 ; + p->feature_flags =0x09 ;/* Board is a hosting board and replaceable */ + p->chassis_handle =SMBIOS_HANDLE_TYPE3 ; + p->board_type =0x0a ;/* Motherboard */ + start +=sizeof (*p); + + s =xenstore_read (HVM_XS_BASEBOARD_MANUFACTURER ,NULL ); +if ( (s !=NULL ) && (*s !='\0' ) ) + { +strcpy (start, s); + start +=strlen (s) +1 ; + p->manufacturer_str = ++counter; + } + + s =xenstore_read (HVM_XS_BASEBOARD_PRODUCT_NAME ,NULL ); +if ( (s !=NULL ) && (*s !='\0' ) ) + { +strcpy (start, s); + start +=strlen (s) +1 ; + p->product_name_str = ++counter; + } + + s =xenstore_read (HVM_XS_BASEBOARD_VERSION ,NULL ); +if ( (s !=NULL ) && (*s !='\0' ) ) + { +strcpy (start, s); + start +=strlen (s) +1 ; + p->version_str = ++counter; + } + + s =xenstore_read (HVM_XS_BASEBOARD_SERIAL_NUMBER ,NULL ); +if ( (s !=NULL ) && (*s !='\0' ) ) + { +strcpy (start, s); + start +=strlen (s) +1 ; + p->serial_number_str = ++counter; + } + + s =xenstore_read (HVM_XS_BASEBOARD_ASSET_TAG ,NULL ); +if ( (s !=NULL ) && (*s !='\0' ) ) + { +strcpy (start, s); + start +=strlen (s) +1 ; + p->asset_tag_str = ++counter; + } + + s =xenstore_read (HVM_XS_BASEBOARD_LOCATION_IN_CHASSIS ,NULL ); +if ( (s !=NULL ) && (*s !='\0' ) ) + { +strcpy (start, s); + start +=strlen (s) +1 ; + p->location_in_chassis_str = ++counter; + } + +if ( counter ) + { + *(uint8_t *)start =0 ; +return start +1 ; + } + +/* Only present when passed in or with customized string */ +return start -sizeof (*p); }/* Type 3 -- System Enclosure */
tools/firmware/hvmloader/smbios_types.h +7 -0
@@ -90,6 +90,13 @@ struct smbios_type_2 {uint8_t product_name_str;uint8_t version_str;uint8_t serial_number_str; +uint8_t asset_tag_str; +uint8_t feature_flags; +uint8_t location_in_chassis_str; +uint16_t chassis_handle; +uint8_t board_type; +uint8_t contained_handle_count; +uint16_t contained_handles[]; } __attribute__ ((packed));/* System Enclosure - Contained Elements */
xen/include/public/hvm/hvm_xs_strings.h +6 -0
@@ -69,6 +69,12 @@#define HVM_XS_SYSTEM_PRODUCT_NAME "bios-strings/system-product-name"#define HVM_XS_SYSTEM_VERSION "bios-strings/system-version"#define HVM_XS_SYSTEM_SERIAL_NUMBER "bios-strings/system-serial-number" +#define HVM_XS_BASEBOARD_MANUFACTURER "bios-strings/baseboard-manufacturer" +#define HVM_XS_BASEBOARD_PRODUCT_NAME "bios-strings/baseboard-product-name" +#define HVM_XS_BASEBOARD_VERSION "bios-strings/baseboard-version" +#define HVM_XS_BASEBOARD_SERIAL_NUMBER "bios-strings/baseboard-serial-number" +#define HVM_XS_BASEBOARD_ASSET_TAG "bios-strings/baseboard-asset-tag" +#define HVM_XS_BASEBOARD_LOCATION_IN_CHASSIS "bios-strings/baseboard-location-in-chassis"#define HVM_XS_ENCLOSURE_MANUFACTURER "bios-strings/enclosure-manufacturer"#define HVM_XS_ENCLOSURE_SERIAL_NUMBER "bios-strings/enclosure-serial-number"#define HVM_XS_ENCLOSURE_ASSET_TAG "bios-strings/enclosure-asset-tag"
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 13 lines
Quoted 1 line
Quoted 1 line · On 29.03.19 at 04:28, <[email protected]> wrote:
Extend smbios type 2 struct to match specification, add support to write it when customized string provided and no smbios passed in.
Signed-off-by Xin Li <[email protected]>Reviewed-by Jan Beulich <[email protected]>---
CC: Jan Beulich <[email protected]>
CC: Igor Druzhinin <[email protected]>
CC: Sergey Dyasli <[email protected]>
CC: Andrew Cooper <[email protected]>
Quoted 4 lines
v2
1: write the struct if any of the strings is provided 2: addcontained_handlesas flexible array member 3: update commit message and fix style issue
So this is the 3rd variant of v2 that you've sent, without making it clear what the difference is. I suppose you've addressed my one remaining cosmetic request and added my R-b, but we should be at v4 then.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 3 lines
So this is the 3rd variant of v2 that you've sent, without making it clear what the difference is. I suppose you've addressed my one remaining cosmetic request and added my R-b, but we should be at v4 then.
Yes. Since these are all style change, I kept the version number 2. Sorry for the confusion.
Kind Regards
Xin(Talons)
________________________________________
From: Jan Beulich <[email protected]>
Sent: Friday, March 29, 2019 7:08 PM
To: Xin Li
Cc: Andrew Cooper; Igor Druzhinin; Sergey Dyasli; Xin Li (Talons); [email protected]
Subject: Re: [PATCH v2 1/1] hvmloader: add SMBIOS type 2 info for customized string
Quoted 13 lines
Quoted 1 line
Quoted 1 line · On 29.03.19 at 04:28, <[email protected]> wrote:
Extend smbios type 2 struct to match specification, add support to write it when customized string provided and no smbios passed in.
Signed-off-by Xin Li <[email protected]>Reviewed-by Jan Beulich <[email protected]>---
CC: Jan Beulich <[email protected]>
CC: Igor Druzhinin <[email protected]>
CC: Sergey Dyasli <[email protected]>
CC: Andrew Cooper <[email protected]>
Quoted 4 lines
v2
1: write the struct if any of the strings is provided 2: addcontained_handlesas flexible array member 3: update commit message and fix style issue
So this is the 3rd variant of v2 that you've sent, without making it clear what the difference is. I suppose you've addressed my one remaining cosmetic request and added my R-b, but we should be at v4 then.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel