diff mbox series

tpm/tpm_tis: Disable interrupts categorically for Lenovo

Message ID	20230810182433.518523-1-jarkko@kernel.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Jarkko Sakkinen <jarkko@kernel.org> To: linux-integrity@vger.kernel.org Cc: Linus Torvalds <torvalds@linux-foundation.org>, Jarkko Sakkinen <jarkko@kernel.org>, stable@vger.kernel.org, "Takashi Iwai" <tiwai@suse.de>, Lino Sanfilippo <l.sanfilippo@kunbus.com>, linux-kernel@vger.kernel.org Subject: [PATCH] tpm/tpm_tis: Disable interrupts categorically for Lenovo Date: Thu, 10 Aug 2023 21:24:33 +0300 Message-Id: <20230810182433.518523-1-jarkko@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	tpm/tpm_tis: Disable interrupts categorically for Lenovo \| tpm/tpm_tis: Disable interrupts categorically for Lenovo

Commit Message

Jarkko Sakkinen Aug. 10, 2023, 6:24 p.m. UTC

  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: <stable@vger.kernel.org> # v6.4+
Reported-by: "Takashi Iwai" <tiwai@suse.de>
Closes: https://lore.kernel.org/linux-integrity/87il9qhxjq.wl-tiwai@suse.de/
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
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(-)

Comments

Takashi Iwai Aug. 11, 2023, 7:21 a.m. UTC | #1

On Thu, 10 Aug 2023 20:24:33 +0200,
Jarkko Sakkinen wrote:
> 
> 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: <stable@vger.kernel.org> # v6.4+
> Reported-by: "Takashi Iwai" <tiwai@suse.de>
> Closes: https://lore.kernel.org/linux-integrity/87il9qhxjq.wl-tiwai@suse.de/
> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
> ---
> 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:

Acked-by: Takashi Iwai <tiwai@suse.de>

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

Thanks!


Takashi

> 
> BR, Jarkko
>  drivers/char/tpm/tpm_tis.c | 34 ----------------------------------
>  1 file changed, 34 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index 3c0f68b9e44f..dd0f52d35073 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -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"),
>  		},
>  	},
>  	{
> -- 
> 2.39.2
>

Takashi Iwai Aug. 11, 2023, 7:22 a.m. UTC | #2

On Fri, 11 Aug 2023 09:21:09 +0200,
Takashi Iwai wrote:
> 
> On Thu, 10 Aug 2023 20:24:33 +0200,
> Jarkko Sakkinen wrote:
> > 
> > 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: <stable@vger.kernel.org> # v6.4+
> > Reported-by: "Takashi Iwai" <tiwai@suse.de>
> > Closes: https://lore.kernel.org/linux-integrity/87il9qhxjq.wl-tiwai@suse.de/
> > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
> > ---
> > 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:
> 
> Acked-by: Takashi Iwai <tiwai@suse.de>
> 
> 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:

Link: https://bugzilla.suse.com/show_bug.cgi?id=1213779


Takashi

Takashi Iwai Aug. 11, 2023, 3:26 p.m. UTC | #3

On Fri, 11 Aug 2023 09:21:09 +0200,
Takashi Iwai wrote:
> 
> On Thu, 10 Aug 2023 20:24:33 +0200,
> Jarkko Sakkinen wrote:
> > 
> > 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: <stable@vger.kernel.org> # v6.4+
> > Reported-by: "Takashi Iwai" <tiwai@suse.de>
> > Closes: https://lore.kernel.org/linux-integrity/87il9qhxjq.wl-tiwai@suse.de/
> > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
> > ---
> > 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:
> 
> Acked-by: Takashi Iwai <tiwai@suse.de>
> 
> I'll build a test kernel and ask reporters for testing the fix, too.

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


Takashi

Jarkko Sakkinen Aug. 11, 2023, 4:47 p.m. UTC | #4

On Fri Aug 11, 2023 at 10:21 AM EEST, Takashi Iwai wrote:
> On Thu, 10 Aug 2023 20:24:33 +0200,
> Jarkko Sakkinen wrote:
> > 
> > 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: <stable@vger.kernel.org> # v6.4+
> > Reported-by: "Takashi Iwai" <tiwai@suse.de>
> > Closes: https://lore.kernel.org/linux-integrity/87il9qhxjq.wl-tiwai@suse.de/
> > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
> > ---
> > 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:
>
> Acked-by: Takashi Iwai <tiwai@suse.de>
>
> I'll build a test kernel and ask reporters for testing the fix, too.

Added, thanks!

BR, Jarkko

Jarkko Sakkinen Aug. 11, 2023, 4:49 p.m. UTC | #5

On Fri Aug 11, 2023 at 10:22 AM EEST, Takashi Iwai wrote:
> On Fri, 11 Aug 2023 09:21:09 +0200,
> Takashi Iwai wrote:
> > 
> > On Thu, 10 Aug 2023 20:24:33 +0200,
> > Jarkko Sakkinen wrote:
> > > 
> > > 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: <stable@vger.kernel.org> # v6.4+
> > > Reported-by: "Takashi Iwai" <tiwai@suse.de>
> > > Closes: https://lore.kernel.org/linux-integrity/87il9qhxjq.wl-tiwai@suse.de/
> > > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
> > > ---
> > > 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:
> > 
> > Acked-by: Takashi Iwai <tiwai@suse.de>
> > 
> > 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:
>
> Link: https://bugzilla.suse.com/show_bug.cgi?id=1213779

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

Jarkko Sakkinen Aug. 11, 2023, 4:51 p.m. UTC | #6

On Fri Aug 11, 2023 at 6:26 PM EEST, Takashi Iwai wrote:
> On Fri, 11 Aug 2023 09:21:09 +0200,
> Takashi Iwai wrote:
> > 
> > On Thu, 10 Aug 2023 20:24:33 +0200,
> > Jarkko Sakkinen wrote:
> > > 
> > > 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: <stable@vger.kernel.org> # v6.4+
> > > Reported-by: "Takashi Iwai" <tiwai@suse.de>
> > > Closes: https://lore.kernel.org/linux-integrity/87il9qhxjq.wl-tiwai@suse.de/
> > > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
> > > ---
> > > 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:
> > 
> > Acked-by: Takashi Iwai <tiwai@suse.de>
> > 
> > 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

diff mbox series

Patch

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 3c0f68b9e44f..dd0f52d35073 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -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"),
 		},
 	},
 	{