Skip to contentSkip to conversation

tpm/tpm_tis: Disable interrupts for Lenovo Thinkpad E14 Gen 2 and 13s-IML

PATCH In review Takashi Iwai 2 participants 9 messages Aug 7, 2023 – Aug 10, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tpm/tpm_tis: Disable interrupts for Lenovo Thinkpad E14 Gen 2 and 13s-IML

Like other Lenovo laptops, Thinkpad E14 Gen 2 and Thinkpad 13s-IML also require to disable the tpm_tis interrupts for avoiding a boot hang.

Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+
---
 drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/char/tpm/tpm_tis.c +16 -0
index a98773ac2e55..0633823dc515 100644
@@ -130,6 +130,22 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Laptop (13th Gen Intel Core)"),
 		},
 	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkPad E14 Gen 2",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad E14 Gen 2"),
+		},
+	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkBook 13s-IML",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ThinkBook 13s-IML"),
+		},
+	},
 	{
 		.callback = tpm_tis_disable_irq,
 		.ident = "ThinkPad T490s",
Signature · 1 line
2.35.3
maintainer
#1 lore raw
Quoted 42 lines · Takashi Iwai

Like other Lenovo laptops, Thinkpad E14 Gen 2 and Thinkpad 13s-IML also require to disable the tpm_tis interrupts for avoiding a boot hang.

Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+
---
 drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/char/tpm/tpm_tis.c +16 -0
index a98773ac2e55..0633823dc515 100644
@@ -130,6 +130,22 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Laptop (13th Gen Intel Core)"),
 		},
 	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkPad E14 Gen 2",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad E14 Gen 2"),
+		},
+	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkBook 13s-IML",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ThinkBook 13s-IML"),
+		},
+	},
 	{
 		.callback = tpm_tis_disable_irq,
 		.ident = "ThinkPad T490s",
Signature · 1 line
2.35.3

As almost all issues are with Lenovo, I would instead just put:

	{
		.callback = tpm_tis_disable_irq,
		.matches = {
			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		},
	},

And delete the existing entries with vendor as "LENOVO".

BR, Jarkko

#2 lore raw
Quoted 47 lines · Jarkko Sakkinen
Quoted 42 lines · Takashi Iwai

Like other Lenovo laptops, Thinkpad E14 Gen 2 and Thinkpad 13s-IML also require to disable the tpm_tis interrupts for avoiding a boot hang.

Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+
---
 drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/char/tpm/tpm_tis.c +16 -0
index a98773ac2e55..0633823dc515 100644
@@ -130,6 +130,22 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Laptop (13th Gen Intel Core)"),
 		},
 	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkPad E14 Gen 2",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad E14 Gen 2"),
+		},
+	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkBook 13s-IML",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ThinkBook 13s-IML"),
+		},
+	},
 	{
 		.callback = tpm_tis_disable_irq,
 		.ident = "ThinkPad T490s",
Signature · 1 line
2.35.3

As almost all issues are with Lenovo, I would instead just put:

Quoted 8 lines
	{
		.callback = tpm_tis_disable_irq,
		.matches = {
			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		},
	},

And delete the existing entries with vendor as "LENOVO".

Yeah, that will relieve pains better, too.

thanks,

Takashi

maintainer
#3 lore raw
Quoted 56 lines · Takashi Iwai
Quoted 54 lines · Jarkko Sakkinen
Quoted 42 lines · Takashi Iwai

Like other Lenovo laptops, Thinkpad E14 Gen 2 and Thinkpad 13s-IML also require to disable the tpm_tis interrupts for avoiding a boot hang.

Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+
---
 drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/char/tpm/tpm_tis.c +16 -0
index a98773ac2e55..0633823dc515 100644
@@ -130,6 +130,22 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Laptop (13th Gen Intel Core)"),
 		},
 	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkPad E14 Gen 2",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad E14 Gen 2"),
+		},
+	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkBook 13s-IML",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ThinkBook 13s-IML"),
+		},
+	},
 	{
 		.callback = tpm_tis_disable_irq,
 		.ident = "ThinkPad T490s",
Signature · 1 line
2.35.3

As almost all issues are with Lenovo, I would instead just put:

	{
		.callback = tpm_tis_disable_irq,
		.matches = {
			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		},
	},
Quoted 3 lines
Quoted 1 line

And delete the existing entries with vendor as "LENOVO".

Yeah, that will relieve pains better, too.

Please do it if possible then :-)

BR, Jarkko

#4 lore raw
Quoted 58 lines · Jarkko Sakkinen
Quoted 56 lines · Takashi Iwai
Quoted 54 lines · Jarkko Sakkinen
Quoted 42 lines · Takashi Iwai

Like other Lenovo laptops, Thinkpad E14 Gen 2 and Thinkpad 13s-IML also require to disable the tpm_tis interrupts for avoiding a boot hang.

Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+
---
 drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/char/tpm/tpm_tis.c +16 -0
index a98773ac2e55..0633823dc515 100644
@@ -130,6 +130,22 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Laptop (13th Gen Intel Core)"),
 		},
 	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkPad E14 Gen 2",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad E14 Gen 2"),
+		},
+	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkBook 13s-IML",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ThinkBook 13s-IML"),
+		},
+	},
 	{
 		.callback = tpm_tis_disable_irq,
 		.ident = "ThinkPad T490s",
Signature · 1 line
2.35.3

As almost all issues are with Lenovo, I would instead just put:

	{
		.callback = tpm_tis_disable_irq,
		.matches = {
			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		},
	},
Quoted 5 lines
Quoted 3 lines
Quoted 1 line

And delete the existing entries with vendor as "LENOVO".

Yeah, that will relieve pains better, too.

Please do it if possible then :-)

Do you mean that I should resubmit a new patch? Honestly speaking, it'd be easier if you can do it directly. I'm merely a sort of messenger, I don't own / test the device by myself...

But if inevitably required, I can resubmit a patch, of course.

thanks,

Takashi

maintainer
#5 lore raw
Quoted 64 lines · Takashi Iwai
Quoted 62 lines · Jarkko Sakkinen
Quoted 59 lines · Takashi Iwai
Quoted 47 lines · Jarkko Sakkinen
Quoted 42 lines · Takashi Iwai

Like other Lenovo laptops, Thinkpad E14 Gen 2 and Thinkpad 13s-IML also require to disable the tpm_tis interrupts for avoiding a boot hang.

Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+
---
 drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/char/tpm/tpm_tis.c +16 -0
index a98773ac2e55..0633823dc515 100644
@@ -130,6 +130,22 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Laptop (13th Gen Intel Core)"),
 		},
 	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkPad E14 Gen 2",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad E14 Gen 2"),
+		},
+	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkBook 13s-IML",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ThinkBook 13s-IML"),
+		},
+	},
 	{
 		.callback = tpm_tis_disable_irq,
 		.ident = "ThinkPad T490s",
Signature · 1 line
2.35.3

As almost all issues are with Lenovo, I would instead just put:

Quoted 8 lines
	{
		.callback = tpm_tis_disable_irq,
		.matches = {
			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		},
	},

And delete the existing entries with vendor as "LENOVO".

Yeah, that will relieve pains better, too.

Quoted 8 lines
Quoted 1 line

Please do it if possible then :-)

Do you mean that I should resubmit a new patch? Honestly speaking, it'd be easier if you can do it directly. I'm merely a sort of messenger, I don't own / test the device by myself...

But if inevitably required, I can resubmit a patch, of course.

I'll submit a patch asap, and cc you. I put the conclusions to the description.

BR, Jarkko

#6 lore raw
Quoted 73 lines · Jarkko Sakkinen
Quoted 71 lines · Takashi Iwai
Quoted 58 lines · Jarkko Sakkinen
Quoted 56 lines · Takashi Iwai
Quoted 54 lines · Jarkko Sakkinen
Quoted 42 lines · Takashi Iwai

Like other Lenovo laptops, Thinkpad E14 Gen 2 and Thinkpad 13s-IML also require to disable the tpm_tis interrupts for avoiding a boot hang.

Fixes e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Cc <[email protected]> # v6.4+
---
 drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/char/tpm/tpm_tis.c +16 -0
index a98773ac2e55..0633823dc515 100644
@@ -130,6 +130,22 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "Laptop (13th Gen Intel Core)"),
 		},
 	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkPad E14 Gen 2",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad E14 Gen 2"),
+		},
+	},
+	{
+		.callback = tpm_tis_disable_irq,
+		.ident = "ThinkBook 13s-IML",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ThinkBook 13s-IML"),
+		},
+	},
 	{
 		.callback = tpm_tis_disable_irq,
 		.ident = "ThinkPad T490s",
Signature · 1 line
2.35.3

As almost all issues are with Lenovo, I would instead just put:

	{
		.callback = tpm_tis_disable_irq,
		.matches = {
			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		},
	},
Quoted 5 lines
Quoted 3 lines
Quoted 1 line

And delete the existing entries with vendor as "LENOVO".

Yeah, that will relieve pains better, too.

Please do it if possible then :-)

Do you mean that I should resubmit a new patch? Honestly speaking, it'd be easier if you can do it directly. I'm merely a sort of messenger, I don't own / test the device by myself...

Quoted 4 lines
Quoted 1 line

But if inevitably required, I can resubmit a patch, of course.

I'll submit a patch asap, and cc you. I put the conclusions to the description.

Great, thanks!

Takashi