Skip to contentSkip to conversation

platform/x86: dell-laptop: Add 2-in-1 devices to the DMI whitelist

PATCH In review Alexander Abrosimov 5 participants 6 messages Jan 25, 2018 – Feb 7, 2018 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86: dell-laptop: Add 2-in-1 devices to the DMI whitelist

SMBIOS 3.0.0 Specification introduced new Chassis Types field values for 2-in-1 devices like tablets, convertibles and detachables. Dell's Inspiron 2-in-1 and XPS 2-in-1 fall into this category and they have to be added to the DMI whitelist, so rfkill and backlight can be controlled for them as for other laptops.

---
 drivers/platform/x86/dell-laptop.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/platform/x86/dell-laptop.c +18 -0
index cd4725e7e0b5..23fc94d70ea1 100644
@@ -110,6 +110,24 @@ static const struct dmi_system_id dell_device_table[] __initconst = {
 		},
 	},
 	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "30"), /*Tablet*/
+		},
+	},
+	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /*Convertible*/
+		},
+	},
+	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "32"), /*Detachable*/
+		},
+	},
+	{
 		.ident = "Dell Computer Corporation",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
Signature · 1 line
2.13.6
#1 lore raw
Quoted 7 lines · Alexander Abrosimov

SMBIOS 3.0.0 Specification introduced new Chassis Types field values for 2-in-1 devices like tablets, convertibles and detachables. Dell's Inspiron 2-in-1 and XPS 2-in-1 fall into this category and they have to be added to the DMI whitelist, so rfkill and backlight can be controlled for them as for other laptops.

Thanks Alexander. Looks good - just going to give Pali and +Mario a chance to respond before merging...

Quoted 37 lines
---
 drivers/platform/x86/dell-laptop.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/platform/x86/dell-laptop.c +18 -0
index cd4725e7e0b5..23fc94d70ea1 100644
@@ -110,6 +110,24 @@ static const struct dmi_system_id dell_device_table[] __initconst = {
 		},
 	},
 	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "30"), /*Tablet*/
+		},
+	},
+	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /*Convertible*/
+		},
+	},
+	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "32"), /*Detachable*/
+		},
+	},
+	{
 		.ident = "Dell Computer Corporation",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
Signature · 1 line
2.13.6
Signature · 2 lines
Darren Hart
VMware Open Source Technology Center
#2 lore raw
Quoted 11 lines · On Thursday 25 January 2018 15:02:39 Darren Hart wrote:
Quoted 7 lines · Alexander Abrosimov

SMBIOS 3.0.0 Specification introduced new Chassis Types field values for 2-in-1 devices like tablets, convertibles and detachables. Dell's Inspiron 2-in-1 and XPS 2-in-1 fall into this category and they have to be added to the DMI whitelist, so rfkill and backlight can be controlled for them as for other laptops.

Thanks Alexander. Looks good - just going to give Pali and +Mario a chance to respond before merging...

I have no comments for this. This should be confirmed by Mario or somebody else from Dell, which DMI names are used for a new products.

Quoted 38 lines
Quoted 37 lines
---
 drivers/platform/x86/dell-laptop.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/platform/x86/dell-laptop.c +18 -0
index cd4725e7e0b5..23fc94d70ea1 100644
@@ -110,6 +110,24 @@ static const struct dmi_system_id dell_device_table[] __initconst = {
 		},
 	},
 	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "30"), /*Tablet*/
+		},
+	},
+	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /*Convertible*/
+		},
+	},
+	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "32"), /*Detachable*/
+		},
+	},
+	{
 		.ident = "Dell Computer Corporation",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
Signature · 1 line
2.13.6
Signature · 2 lines
Pali Rohár
[email protected]
Reviewed-by
#3 lore raw
Quoted 19 lines

-----Original Message-----
From: Pali Rohár [mailto:[email protected]]
Sent: Thursday, January 25, 2018 5:06 PM
To: Darren Hart <[email protected]>
Cc: Alexander Abrosimov <[email protected]>; Matthew Garrett <[email protected]>; Limonciello, Mario <[email protected]>; Andy Shevchenko <[email protected]>; [email protected]; linux- [email protected]
Subject: Re: [PATCH] platform/x86: dell-laptop: Add 2-in-1 devices to the DMI whitelist

Quoted 7 lines · On Thursday 25 January 2018 15:02:39 Darren Hart wrote:
Quoted 6 lines · Alexander Abrosimov

SMBIOS 3.0.0 Specification introduced new Chassis Types field values for 2-in-1 devices like tablets, convertibles and detachables. Dell's Inspiron 2-in-1 and XPS 2-in-1 fall into this category and they have to be added to the DMI whitelist, so rfkill and backlight can be controlled for them as for other laptops.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Thanks Alexander. Looks good - just going to give Pali and +Mario a chance to respond before merging...

I have no comments for this. This should be confirmed by Mario or somebody else from Dell, which DMI names are used for a new products.

Yes these chassis types from SMBIOS 3.0 are covered by Dell specs and used for some products.

This patch looks good to me.

Quoted 46 lines
Quoted 6 lines

drivers/platform/x86/dell-

Quoted 6 lines
---
 drivers/platform/x86/dell-laptop.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/platform/x86/dell- renamed from drivers/platform/x86/dell-laptop.c +0 -0

laptop.c

Quoted 4 lines

drivers/platform/x86/dell-laptop.c static const struct dmi_system_id dell_device_table[]

Quoted 4 lines

index cd4725e7e0b5..23fc94d70ea1 100644

drivers/platform/x86/dell-laptop.c +0 -0
@@ -110,6 +110,24 @@ static const struct dmi_system_id dell_device_table[]

__initconst = {

Quoted 16 lines
Quoted 16 lines
drivers/platform/x86/dell-laptop.c +13 -0
 		},
 	},
 	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "30"), /*Tablet*/
+		},
+	},
+	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /*Convertible*/
+		},
+	},
+	{
+		.matches = {
Quoted 8 lines

drivers/platform/x86/dell-laptop.c static const struct dmi_system_id dell_device_table[] __initconst = {

Quoted 8 lines
drivers/platform/x86/dell-laptop.c +5 -0
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "32"), /*Detachable*/
+		},
+	},
+	{
 		.ident = "Dell Computer Corporation",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer

Corporation"),

Quoted 5 lines
Quoted 4 lines

--
2.13.6

--
Pali Rohár
[email protected]

#4 lore raw

Darren, I have checked change on git.kernel.org and it seems to be merged twice:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/platform/x86/dell-laptop.c?id=fe486138788ba435ffa918c8d7aba05a77b6289a

How it can be fixed?

2018-01-26 17:42 GMT+03:00 <[email protected]>:

Quoted 80 lines
Quoted 20 lines

-----Original Message-----
From: Pali Rohár [mailto:[email protected]]
Sent: Thursday, January 25, 2018 5:06 PM
To: Darren Hart <[email protected]>
Cc: Alexander Abrosimov <[email protected]>; Matthew Garrett <[email protected]>; Limonciello, Mario <[email protected]>; Andy Shevchenko <[email protected]>; [email protected]; linux- [email protected]
Subject: Re: [PATCH] platform/x86: dell-laptop: Add 2-in-1 devices to the DMI whitelist

Quoted 7 lines · On Thursday 25 January 2018 15:02:39 Darren Hart wrote:
Quoted 6 lines · Alexander Abrosimov

SMBIOS 3.0.0 Specification introduced new Chassis Types field values for 2-in-1 devices like tablets, convertibles and detachables. Dell's Inspiron 2-in-1 and XPS 2-in-1 fall into this category and they have to be added to the DMI whitelist, so rfkill and backlight can be controlled for them as for other laptops.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Thanks Alexander. Looks good - just going to give Pali and +Mario a chance to respond before merging...

I have no comments for this. This should be confirmed by Mario or somebody else from Dell, which DMI names are used for a new products.

Yes these chassis types from SMBIOS 3.0 are covered by Dell specs and used for some products.

This patch looks good to me.

Quoted 46 lines
Quoted 6 lines

drivers/platform/x86/dell-

Quoted 6 lines
---
 drivers/platform/x86/dell-laptop.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/platform/x86/dell- renamed from drivers/platform/x86/dell-laptop.c +0 -0

laptop.c

Quoted 4 lines

drivers/platform/x86/dell-laptop.c static const struct dmi_system_id dell_device_table[]

Quoted 4 lines

index cd4725e7e0b5..23fc94d70ea1 100644

drivers/platform/x86/dell-laptop.c +0 -0
@@ -110,6 +110,24 @@ static const struct dmi_system_id dell_device_table[]

__initconst = {

Quoted 16 lines
Quoted 16 lines
drivers/platform/x86/dell-laptop.c +13 -0
          },
  },
  {
+         .matches = {
+                 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                 DMI_MATCH(DMI_CHASSIS_TYPE, "30"), /*Tablet*/
+         },
+ },
+ {
+         .matches = {
+                 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                 DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /*Convertible*/
+         },
+ },
+ {
+         .matches = {
Quoted 8 lines

drivers/platform/x86/dell-laptop.c static const struct dmi_system_id dell_device_table[] __initconst = {

Quoted 8 lines
drivers/platform/x86/dell-laptop.c +5 -0
+                 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                 DMI_MATCH(DMI_CHASSIS_TYPE, "32"), /*Detachable*/
+         },
+ },
+ {
          .ident = "Dell Computer Corporation",
          .matches = {
                  DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer

Corporation"),

Quoted 5 lines
Quoted 4 lines

--
2.13.6

--
Pali Rohár
[email protected]

Signature · 2 lines
Best Regards,
Abrosimov Alexander, mailto:[email protected]
#5 lore raw
Quoted 4 lines · Alexander Abrosimov

Darren, I have checked change on git.kernel.org and it seems to be merged twice:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/platform/x86/dell-laptop.c?id=fe486138788ba435ffa918c8d7aba05a77b6289a

How it can be fixed?

First of all, please, do not top post!

WRT the report, as I can see it's not fatal or anyhow affecting the normal workflow.
Thus, just sent a regular patch to remove duplicate entries.

I don't see necessity to send that fix to stable@ because it wouldn't fix any bugs or regressions.

Signature · 2 lines
With Best Regards,
Andy Shevchenko