Skip to contentSkip to conversation

tpm/tpm_tis: Disable interrupts categorically for Lenovo

PATCH In review Jarkko Sakkinen 3 participants 8 messages Aug 10, 2023 – Aug 14, 2023

Subsystems (3)
lore
Share & tools
lore

Jarkko Sakkinen

author maintainer
#0 lore raw

PATCH 1/1 tpm/tpm_tis: Disable interrupts categorically for Lenovo

By large most of the entries in tpm_tis_dmi_table[] are for Lenovo laptops, and they keep on coming. Therefore, disable IRQs categorically for Lenovo.

Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+

---
This will be included into v6.5-rc6 PR, as long as Takashi ack's it. I'm planning to send tomorrow morning (GMT+3).

BR, Jarkko

 drivers/char/tpm/tpm_tis.c | 34 ----------------------------------
 1 file changed, 34 deletions(-)
drivers/char/tpm/tpm_tis.c +0 -34
index 3c0f68b9e44f..dd0f52d35073 100644
@@ -132,42 +132,8 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
 	},
 	{
 		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkPad T490s",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T490s"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkStation P360 Tiny",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkStation P360 Tiny"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkPad L490",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L490"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkPad L590",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L590"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkStation P620",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkStation P620"),
 		},
 	},
 	{
Signature · 1 line
2.39.2
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Jarkko Sakkinen

By large most of the entries in tpm_tis_dmi_table[] are for Lenovo laptops, and they keep on coming. Therefore, disable IRQs categorically for Lenovo.

Quoted 8 lines
Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+

---
This will be included into v6.5-rc6 PR, as long as Takashi ack's it. I'm planning to send tomorrow morning (GMT+3).

Feel free to take my ack:

I'll build a test kernel and ask reporters for testing the fix, too.

Thanks!

Takashi

Quoted 55 lines

BR, Jarkko

 drivers/char/tpm/tpm_tis.c | 34 ----------------------------------
 1 file changed, 34 deletions(-)
drivers/char/tpm/tpm_tis.c +0 -34
index 3c0f68b9e44f..dd0f52d35073 100644
@@ -132,42 +132,8 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
 	},
 	{
 		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkPad T490s",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T490s"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkStation P360 Tiny",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkStation P360 Tiny"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkPad L490",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L490"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkPad L590",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L590"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkStation P620",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkStation P620"),
 		},
 	},
 	{
Signature · 1 line
2.39.2
#2 lore raw
Quoted 16 lines · Takashi Iwai
Quoted 4 lines · Jarkko Sakkinen

By large most of the entries in tpm_tis_dmi_table[] are for Lenovo laptops, and they keep on coming. Therefore, disable IRQs categorically for Lenovo.

Quoted 8 lines
Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+

---
This will be included into v6.5-rc6 PR, as long as Takashi ack's it. I'm planning to send tomorrow morning (GMT+3).

Quoted 5 lines

Feel free to take my ack:

I'll build a test kernel and ask reporters for testing the fix, too.

Also, it's worth to put the link to the original bug report:

Takashi

author maintainer
#3 lore raw
Quoted 20 lines · Takashi Iwai
Quoted 18 lines · Takashi Iwai
Quoted 4 lines · Jarkko Sakkinen

By large most of the entries in tpm_tis_dmi_table[] are for Lenovo laptops, and they keep on coming. Therefore, disable IRQs categorically for Lenovo.

Quoted 8 lines
Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+

---
This will be included into v6.5-rc6 PR, as long as Takashi ack's it. I'm planning to send tomorrow morning (GMT+3).

Feel free to take my ack:

Quoted 7 lines
Quoted 3 lines

I'll build a test kernel and ask reporters for testing the fix, too.

Also, it's worth to put the link to the original bug report:

These days it is recommended afaik to use "Closes:" so I used that (checkpatch even complains if it does not exist when you have a reported-by tag).

BR, Jarkko

#4 lore raw
In reply to Takashi Iwai
Quoted 16 lines · Takashi Iwai
Quoted 4 lines · Jarkko Sakkinen

By large most of the entries in tpm_tis_dmi_table[] are for Lenovo laptops, and they keep on coming. Therefore, disable IRQs categorically for Lenovo.

Quoted 8 lines
Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+

---
This will be included into v6.5-rc6 PR, as long as Takashi ack's it. I'm planning to send tomorrow morning (GMT+3).

Quoted 5 lines

Feel free to take my ack:

I'll build a test kernel and ask reporters for testing the fix, too.

FYI, the test results are all positive, so far.

Takashi

author maintainer
#5 lore raw
Quoted 18 lines · Takashi Iwai
Quoted 16 lines · Takashi Iwai
Quoted 12 lines · Jarkko Sakkinen

By large most of the entries in tpm_tis_dmi_table[] are for Lenovo laptops, and they keep on coming. Therefore, disable IRQs categorically for Lenovo.

Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+

---
This will be included into v6.5-rc6 PR, as long as Takashi ack's it. I'm planning to send tomorrow morning (GMT+3).

Quoted 7 lines
Quoted 5 lines

Feel free to take my ack:

I'll build a test kernel and ask reporters for testing the fix, too.

FYI, the test results are all positive, so far.

Thanks a lot.

Can you check this that it looks good to you:

https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git/commit/?h=next&id=bfc4b8c073a6dcfd39d413a7fa1c5ce1ede9f326

Tested-by?

BR, Jarkko

author maintainer
#6 lore raw
In reply to Takashi Iwai
Quoted 15 lines · Takashi Iwai
Quoted 4 lines · Jarkko Sakkinen

By large most of the entries in tpm_tis_dmi_table[] are for Lenovo laptops, and they keep on coming. Therefore, disable IRQs categorically for Lenovo.

Quoted 8 lines
Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+

---
This will be included into v6.5-rc6 PR, as long as Takashi ack's it. I'm planning to send tomorrow morning (GMT+3).

Quoted 5 lines

Feel free to take my ack:

I'll build a test kernel and ask reporters for testing the fix, too.

Added, thanks!

BR, Jarkko

Acked-by on v1 1/1
#7 lore raw
In reply to Jarkko Sakkinen
Quoted 8 lines · Jarkko Sakkinen

By large most of the entries in tpm_tis_dmi_table[] are for Lenovo laptops, and they keep on coming. Therefore, disable IRQs categorically for Lenovo.

Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+
Quoted 58 lines

---
This will be included into v6.5-rc6 PR, as long as Takashi ack's it. I'm planning to send tomorrow morning (GMT+3).

BR, Jarkko

 drivers/char/tpm/tpm_tis.c | 34 ----------------------------------
 1 file changed, 34 deletions(-)
drivers/char/tpm/tpm_tis.c +0 -34
index 3c0f68b9e44f..dd0f52d35073 100644
@@ -132,42 +132,8 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
 	},
 	{
 		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkPad T490s",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T490s"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkStation P360 Tiny",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkStation P360 Tiny"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkPad L490",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L490"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkPad L590",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L590"),
-		},
-	},
-	{
-		.callback = tpm_tis_disable_irq,
-		.ident = "ThinkStation P620",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkStation P620"),
 		},
 	},
 	{
Signature · 1 line
2.39.2