Skip to contentSkip to conversation

firmware: dmi: Add access to the SKU ID string

PATCH In review Simon Glass 3 participants 7 messages Apr 24, 2018 – Apr 27, 2018 Dmi/smbios support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firmware: dmi: Add access to the SKU ID string

This is used in some systems from user space for determining the identity of the device.

Expose this as a file so that that user-space tools don't need to read from /sys/firmware/dmi/tables/DMI

---

 drivers/firmware/dmi-id.c       | 2 ++
 drivers/firmware/dmi_scan.c     | 1 +
 include/linux/mod_devicetable.h | 1 +
 3 files changed, 4 insertions(+)
drivers/firmware/dmi-id.c +2 -0
index 951b6c79f166a..fe78c7f801163 100644
@@ -48,6 +48,7 @@ DEFINE_DMI_ATTR_WITH_SHOW(product_version,	0444, DMI_PRODUCT_VERSION);
 DEFINE_DMI_ATTR_WITH_SHOW(product_serial,	0400, DMI_PRODUCT_SERIAL);
 DEFINE_DMI_ATTR_WITH_SHOW(product_uuid,		0400, DMI_PRODUCT_UUID);
 DEFINE_DMI_ATTR_WITH_SHOW(product_family,	0444, DMI_PRODUCT_FAMILY);
+DEFINE_DMI_ATTR_WITH_SHOW(product_sku,		0444, DMI_PRODUCT_SKU);
 DEFINE_DMI_ATTR_WITH_SHOW(board_vendor,		0444, DMI_BOARD_VENDOR);
 DEFINE_DMI_ATTR_WITH_SHOW(board_name,		0444, DMI_BOARD_NAME);
 DEFINE_DMI_ATTR_WITH_SHOW(board_version,	0444, DMI_BOARD_VERSION);
@@ -193,6 +194,7 @@ static void __init dmi_id_init_attr_table(void)
 	ADD_DMI_ATTR(product_serial,    DMI_PRODUCT_SERIAL);
 	ADD_DMI_ATTR(product_uuid,      DMI_PRODUCT_UUID);
 	ADD_DMI_ATTR(product_family,    DMI_PRODUCT_FAMILY);
+	ADD_DMI_ATTR(product_sku,       DMI_PRODUCT_SKU);
 	ADD_DMI_ATTR(board_vendor,      DMI_BOARD_VENDOR);
 	ADD_DMI_ATTR(board_name,        DMI_BOARD_NAME);
 	ADD_DMI_ATTR(board_version,     DMI_BOARD_VERSION);
drivers/firmware/dmi_scan.c +1 -0
index 54e66adef2525..f2483548cde92 100644
@@ -447,6 +447,7 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
 		dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
 		dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
 		dmi_save_uuid(dm, DMI_PRODUCT_UUID, 8);
+		dmi_save_ident(dm, DMI_PRODUCT_SKU, 25);
 		dmi_save_ident(dm, DMI_PRODUCT_FAMILY, 26);
 		break;
 	case 2:		/* Base Board Information */
include/linux/mod_devicetable.h +1 -0
index 7d361be2e24f4..cb8487e29d3ae 100644
@@ -491,6 +491,7 @@ enum dmi_field {
 	DMI_PRODUCT_SERIAL,
 	DMI_PRODUCT_UUID,
 	DMI_PRODUCT_FAMILY,
+	DMI_PRODUCT_SKU,
 	DMI_BOARD_VENDOR,
 	DMI_BOARD_NAME,
 	DMI_BOARD_VERSION,
Signature · 1 line
2.17.0.484.g0c8726318c-goog
#1 lore raw
Quoted 5 lines · Simon Glass

This is used in some systems from user space for determining the identity of the device.

Expose this as a file so that that user-space tools don't need to read from /sys/firmware/dmi/tables/DMI

sysfs is an ABI and needs to be documented, I don't see that in this patch, pls add.

Quoted 56 lines

---

 drivers/firmware/dmi-id.c       | 2 ++
 drivers/firmware/dmi_scan.c     | 1 +
 include/linux/mod_devicetable.h | 1 +
 3 files changed, 4 insertions(+)
drivers/firmware/dmi-id.c +2 -0
index 951b6c79f166a..fe78c7f801163 100644
@@ -48,6 +48,7 @@ DEFINE_DMI_ATTR_WITH_SHOW(product_version,	0444, DMI_PRODUCT_VERSION);
 DEFINE_DMI_ATTR_WITH_SHOW(product_serial,	0400, DMI_PRODUCT_SERIAL);
 DEFINE_DMI_ATTR_WITH_SHOW(product_uuid,		0400, DMI_PRODUCT_UUID);
 DEFINE_DMI_ATTR_WITH_SHOW(product_family,	0444, DMI_PRODUCT_FAMILY);
+DEFINE_DMI_ATTR_WITH_SHOW(product_sku,		0444, DMI_PRODUCT_SKU);
 DEFINE_DMI_ATTR_WITH_SHOW(board_vendor,		0444, DMI_BOARD_VENDOR);
 DEFINE_DMI_ATTR_WITH_SHOW(board_name,		0444, DMI_BOARD_NAME);
 DEFINE_DMI_ATTR_WITH_SHOW(board_version,	0444, DMI_BOARD_VERSION);
@@ -193,6 +194,7 @@ static void __init dmi_id_init_attr_table(void)
 	ADD_DMI_ATTR(product_serial,    DMI_PRODUCT_SERIAL);
 	ADD_DMI_ATTR(product_uuid,      DMI_PRODUCT_UUID);
 	ADD_DMI_ATTR(product_family,    DMI_PRODUCT_FAMILY);
+	ADD_DMI_ATTR(product_sku,       DMI_PRODUCT_SKU);
 	ADD_DMI_ATTR(board_vendor,      DMI_BOARD_VENDOR);
 	ADD_DMI_ATTR(board_name,        DMI_BOARD_NAME);
 	ADD_DMI_ATTR(board_version,     DMI_BOARD_VERSION);
drivers/firmware/dmi_scan.c +1 -0
index 54e66adef2525..f2483548cde92 100644
@@ -447,6 +447,7 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
 		dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
 		dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
 		dmi_save_uuid(dm, DMI_PRODUCT_UUID, 8);
+		dmi_save_ident(dm, DMI_PRODUCT_SKU, 25);
 		dmi_save_ident(dm, DMI_PRODUCT_FAMILY, 26);
 		break;
 	case 2:		/* Base Board Information */
include/linux/mod_devicetable.h +1 -0
index 7d361be2e24f4..cb8487e29d3ae 100644
@@ -491,6 +491,7 @@ enum dmi_field {
 	DMI_PRODUCT_SERIAL,
 	DMI_PRODUCT_UUID,
 	DMI_PRODUCT_FAMILY,
+	DMI_PRODUCT_SKU,
 	DMI_BOARD_VENDOR,
 	DMI_BOARD_NAME,
 	DMI_BOARD_VERSION,
Signature · 1 line
2.17.0.484.g0c8726318c-goog
Signature · 1 line
~Vinod
#2 lore raw

Hi Vinod,

Quoted 9 lines · Vinod Koul
Quoted 5 lines · Simon Glass

This is used in some systems from user space for determining the identity of the device.

Expose this as a file so that that user-space tools don't need to read from /sys/firmware/dmi/tables/DMI

sysfs is an ABI and needs to be documented, I don't see that in this patch, pls add.

Thanks for taking a look. The only mention of the dmi/id I can find is in Kconfig:

config DMIID
bool "Export DMI identification via sysfs to userspace" depends on DMI
default y
help
Say Y here if you want to query SMBIOS/DMI system identification information from userspace through /sys/class/dmi/id/ or if you want DMI-based module auto-loading.

Are you suggesting that I create a list of the things in the /id node, or something else?

Regards,
Simon

#3 lore raw
Quoted 7 lines · Simon Glass

Hi Vinod,

Quoted 4 lines · Vinod Koul
Quoted 3 lines · Simon Glass

This is used in some systems from user space for determining the identity of the device.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Expose this as a file so that that user-space tools don't need to read from /sys/firmware/dmi/tables/DMI

sysfs is an ABI and needs to be documented, I don't see that in this patch, pls add.

Thanks for taking a look. The only mention of the dmi/id I can find is in Kconfig:

Sorry I should have been explicit. All sysfs entries are ABI to userspace. So they are documented in kernel and the meaning of files should not typically get modfied over time.
Please read Documentation/ABI/README

For DMI, quick grep told me you should add to Documentation/ABI/testing/sysfs-firmware-dmi-tables

HTH

Signature · 1 line
~Vinod
#4 lore raw
Quoted 20 lines · Vinod Koul
Quoted 10 lines · Simon Glass

Hi Vinod,

Quoted 6 lines · Vinod Koul
Quoted 4 lines · Simon Glass

This is used in some systems from user space for determining the identity of the device.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Expose this as a file so that that user-space tools don't need to read from /sys/firmware/dmi/tables/DMI

sysfs is an ABI and needs to be documented, I don't see that in this patch, pls add.

Thanks for taking a look. The only mention of the dmi/id I can find is in Kconfig:

Quoted 7 lines

Sorry I should have been explicit. All sysfs entries are ABI to userspace. So they are documented in kernel and the meaning of files should not typically get modfied over time.
Please read Documentation/ABI/README

For DMI, quick grep told me you should add to Documentation/ABI/testing/sysfs-firmware-dmi-tables

No. This is a different interface to user-space (binary tables, instead of already decoded, selected attributes.)

There is currently no formal documentation of the /sys/devices/virtual/dmi/id contents, so there's no file Simon can modify to mention product_sku. Instead, documentation of the whole directory should be added in a separate patch.

Signature · 2 lines
Jean Delvare
SUSE L3 Support
#5 lore raw
In reply to Simon Glass

Hi Simon,

Quoted 6 lines · Simon Glass

This is used in some systems from user space for determining the identity of the device.

Expose this as a file so that that user-space tools don't need to read from /sys/firmware/dmi/tables/DMI

Quoted 8 lines

---

 drivers/firmware/dmi-id.c       | 2 ++
 drivers/firmware/dmi_scan.c     | 1 +
 include/linux/mod_devicetable.h | 1 +
 3 files changed, 4 insertions(+)

(...)

Looks good to me. Applied, thanks. For consistency I have moved product SKU before product family in all files, same order as in the DMI entry itself.

Signature · 2 lines
Jean Delvare
SUSE L3 Support
#6 lore raw

Hi Jean,

Quoted 18 lines · Jean Delvare

Hi Simon,

Quoted 6 lines · Simon Glass

This is used in some systems from user space for determining the identity of the device.

Expose this as a file so that that user-space tools don't need to read from /sys/firmware/dmi/tables/DMI

Quoted 8 lines

---

 drivers/firmware/dmi-id.c       | 2 ++
 drivers/firmware/dmi_scan.c     | 1 +
 include/linux/mod_devicetable.h | 1 +
 3 files changed, 4 insertions(+)

(...)

Quoted 3 lines

Looks good to me. Applied, thanks. For consistency I have moved product SKU before product family in all files, same order as in the DMI entry itself.

Sounds good, thanks.

- Simon