Message ID | 20230810182433.518523-1-jarkko@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp628460vqi; Thu, 10 Aug 2023 12:11:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFeMRXxpucdgGqU0uY4MshTeE7Re7vKWgnQhArHXRjbg3Rz7o937nimTGeRWmGDWi84IIWM X-Received: by 2002:a17:90a:4f86:b0:26b:e80:11de with SMTP id q6-20020a17090a4f8600b0026b0e8011demr1951882pjh.25.1691694690100; Thu, 10 Aug 2023 12:11:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691694690; cv=none; d=google.com; s=arc-20160816; b=sLWC0vBu5IsrdGQIkXYndv4cRFhhG7F6SdHYUfyhJEqtjqeDRnqAOz1USsVdj12WYv obJX39AyflTuY47lF+9yjDcCWiA7IxPTKMDYYDm5cay3CBi5WMqKi+gBC2sb4Jl7o2fA ZNCmzP25I59v4TWy2M7ennuOuAMg3jDEP4ion+/sqDBJkQLTwELjg/fnanP7PNtPX2xr jt8slgTYexU2CRgYinCbVX9I8CJEQWeq9PZdoBFf3IgXxy1QGTwNwd0MdK+bXm58Ski7 fOSE+KL1MX3aaR6xSwI5yCgcPYD3mYVVVEOpSAYFaeyriUVUbUd8ibYNffEUCqb2GORS ll7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=NrdfgtFy1ETshwIdb/RKwav53mkM2I2aHMXfFKo4hig=; fh=OU7eviUdAWu82BQ+LVqBcsp/CZMZSpOIlTyuCD788Cg=; b=wwXjFJY81GbOT4rbNz68PyaODSlk44Xi4KI+BILHyz90ZaoB5+nrMZ3r1YbEVgWTfj A7QAyn16g1MZMufOx4EQEcmnVikIdDGjjQ3CGhBUov3l15OSIxqIa36V+0PebsgrFfBW WDh+rtpEiRDB+BznFSmqUEBf9HD6f1F57zVAPzpBoS4YlvwFanAS90TW5Hit24744iyw ZOFdagNjLmG6XevizkXxrEdJdiAasdiVgxCDv08Sq19R/4GipPHCPLj9HXKv+ssG2Tij 46G/nh9la5blpcAgoYLlIO6BCQ5UtNlkeazOIxYANz6HHhSheKjo0O/aivhq5rxS4t7J qAxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jW7AsVU+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bj13-20020a17090b088d00b0026900e0537dsi1967178pjb.38.2023.08.10.12.11.16; Thu, 10 Aug 2023 12:11:30 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jW7AsVU+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235421AbjHJSYo (ORCPT <rfc822;lanlanxiyiji@gmail.com> + 99 others); Thu, 10 Aug 2023 14:24:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233190AbjHJSYn (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 10 Aug 2023 14:24:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0BE8128; Thu, 10 Aug 2023 11:24:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 80EF9665C4; Thu, 10 Aug 2023 18:24:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A025C433C7; Thu, 10 Aug 2023 18:24:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691691881; bh=czylyOg9wVKVXz+1ynqLtwzRuhlhf3XOTcyXD0fa8gw=; h=From:To:Cc:Subject:Date:From; b=jW7AsVU+LdkOSneIGoW9k+7Wt+lS8Cc+SW2VXuTppoScN/vOq8cUpkwJuoOUbGAsx 5S6amd7/YaMWHm2BFfFMqXFmUVam1CrKcx7CJ0UERNwMre1q68fKlrspsmdsKpyvQ6 sMobct+rslQquiz9jStWof0YztZ6hJ34Xaf53kA7ePA4xi0ODTgm1PlPM/4j1hqkyr FJRyctepqSFNNNh+Gdjm4fAI+eXUvWCnAMaetGIKpTEkx8UXOo/qNewJ/8sdXiaUYx Z6/5gqW9gpuVlgl8YcVSaHWOnBtyXdOoll5Mf6ord86z6zgUwt0nGGFrOz4UEPtgan kWVwH0TiqqjNw== 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> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773870451267097012 X-GMAIL-MSGID: 1773870451267097012 |
Series |
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
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 >
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
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
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
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
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 --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"), }, }, {