Message ID | 20230807140125.18486-1-tiwai@suse.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1529226vqr; Mon, 7 Aug 2023 08:30:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFMzGLHqI3V4MyGLCqzJOsWCiYWvHjAYIId0Pj+dyeFtC1vB6ytEVvkH+4m4xW+fJbiNOXB X-Received: by 2002:a17:907:272a:b0:99b:6e54:bd6e with SMTP id d10-20020a170907272a00b0099b6e54bd6emr6925779ejl.56.1691422249682; Mon, 07 Aug 2023 08:30:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691422249; cv=none; d=google.com; s=arc-20160816; b=JUewFHX94Wnh6YK9gnrNly+vm8SWSyA7KXG+EfdomPLQgeMelcEo7GaViDrk9UwN9O qlzuG0adH4BUVaGOStl5Io7UB5VTXoIQSR0/gDkOPDszgiMhZtaf8r2Yeh+GlPGU5vZp gVKwMvaiHzMLoArbGA4ELssLV4QgtBXAJ6OA7DBVWx0smfAsSZZbCkDVQVCkwVsr1ctG 5YWdTOGJHGkIv3X4yjmnG/JZ/rM8p5N5ZBFg/aN9x6YJQ3ppN0rUwTr2s9bLNzKDM9dl ds7FphHoZ+VhgUg13KnfL17t0wKHF5Fmp/c+ARMOhJdzbeYRo5ibyXYSF7VKH6nsWsvt LKnw== 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:dkim-signature; bh=8YiVCjwWL8Hw6O2ccp24AagZioe0mi6UgFUQbptbfTQ=; fh=8YNU7+BaH9CzQI0gaKhrGp8AXLCWUt6KQW2ZdCb/eSc=; b=LtVIS2sUv64A/gJxFpE1naTDxZ6bY3IkarX3ww4xDhTwYVRpCFENShGKERqRz9FLIf lNU35GOGMJ8qpJ57B9s9UWNmaCs1kBWWEAWe9iLUDYrpEaSbzoTYjS5O5WdqCzfSIQf6 tjU1LSHG4wNTbAsvV6jriflx+V+m/gLGYEM+VqS9BP2nWJbwI+g4diIJkfXpAtwVsdwW XiXsVbUnMe/GUessfQh2gfBsbXMhMsvds90N958ta3A0oZTFkocC3ZZX+3D37LWLVNkU agT1ml010IBG5uWkZPU+8cTe7FQubxIAZWeSQWj1YZmlUQ7FhqCW+rKjWNnqZiY2F/p3 gWBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ojHriN3J; dkim=neutral (no key) header.i=@suse.de; 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=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k4-20020a170906a38400b0099cac979982si5235470ejz.1047.2023.08.07.08.30.24; Mon, 07 Aug 2023 08:30:49 -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=@suse.de header.s=susede2_rsa header.b=ojHriN3J; dkim=neutral (no key) header.i=@suse.de; 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=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231907AbjHGOET (ORCPT <rfc822;aaronkmseo@gmail.com> + 99 others); Mon, 7 Aug 2023 10:04:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234751AbjHGODF (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 7 Aug 2023 10:03:05 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17D9C2697; Mon, 7 Aug 2023 07:01:32 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 913E91FE02; Mon, 7 Aug 2023 14:01:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691416891; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8YiVCjwWL8Hw6O2ccp24AagZioe0mi6UgFUQbptbfTQ=; b=ojHriN3JOY/bSBqLl4QSvaLU6jbFDGQGR0v2JeL2AKiZsLR7dRarRb97H4wY1Zrs6DMr9/ HxLizwI6NeLgMFPwAnhRhlO95xOKpp1IyvNt7t4E7wbtCPvhFxLH2XRBxbB9qfPayWPavN OUqS7qiJt09MSsJ7Yts01g8YuV0PUQY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691416891; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8YiVCjwWL8Hw6O2ccp24AagZioe0mi6UgFUQbptbfTQ=; b=Y+sP2eHxATKVQfT5cS0Uy/ZWbDN6cZQSzqvC0PksykMgKYZVWkPIXKZuxwhTmk4czYH6Qz +WpohGqTxSlVSTBA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6128513910; Mon, 7 Aug 2023 14:01:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id gq62Fjv50GQvLAAAMHmgww (envelope-from <tiwai@suse.de>); Mon, 07 Aug 2023 14:01:31 +0000 From: Takashi Iwai <tiwai@suse.de> To: Peter Huewe <peterhuewe@gmx.de>, Jarkko Sakkinen <jarkko@kernel.org> Cc: Jason Gunthorpe <jgg@ziepe.ca>, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] tpm/tpm_tis: Disable interrupts for Lenovo Thinkpad E14 Gen 2 and 13s-IML Date: Mon, 7 Aug 2023 16:01:25 +0200 Message-Id: <20230807140125.18486-1-tiwai@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, 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: 1773584777094824358 X-GMAIL-MSGID: 1773584777094824358 |
Series |
tpm/tpm_tis: Disable interrupts for Lenovo Thinkpad E14 Gen 2 and 13s-IML
|
|
Commit Message
Takashi Iwai
Aug. 7, 2023, 2:01 p.m. UTC
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: <stable@vger.kernel.org> # v6.4+
Link: https://bugzilla.suse.com/show_bug.cgi?id=1213779
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
Comments
On Mon Aug 7, 2023 at 2:01 PM UTC, Takashi Iwai wrote: > 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: <stable@vger.kernel.org> # v6.4+ > Link: https://bugzilla.suse.com/show_bug.cgi?id=1213779 > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > --- > drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > index a98773ac2e55..0633823dc515 100644 > --- a/drivers/char/tpm/tpm_tis.c > +++ b/drivers/char/tpm/tpm_tis.c > @@ -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", > -- > 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
On Mon, 07 Aug 2023 21:14:20 +0200, Jarkko Sakkinen wrote: > > On Mon Aug 7, 2023 at 2:01 PM UTC, Takashi Iwai wrote: > > 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: <stable@vger.kernel.org> # v6.4+ > > Link: https://bugzilla.suse.com/show_bug.cgi?id=1213779 > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > > > --- > > drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++ > > 1 file changed, 16 insertions(+) > > > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > > index a98773ac2e55..0633823dc515 100644 > > --- a/drivers/char/tpm/tpm_tis.c > > +++ b/drivers/char/tpm/tpm_tis.c > > @@ -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", > > -- > > 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". Yeah, that will relieve pains better, too. thanks, Takashi
On Tue Aug 8, 2023 at 9:12 AM EEST, Takashi Iwai wrote: > On Mon, 07 Aug 2023 21:14:20 +0200, > Jarkko Sakkinen wrote: > > > > On Mon Aug 7, 2023 at 2:01 PM UTC, Takashi Iwai wrote: > > > 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: <stable@vger.kernel.org> # v6.4+ > > > Link: https://bugzilla.suse.com/show_bug.cgi?id=1213779 > > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > > > > > --- > > > drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++ > > > 1 file changed, 16 insertions(+) > > > > > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > > > index a98773ac2e55..0633823dc515 100644 > > > --- a/drivers/char/tpm/tpm_tis.c > > > +++ b/drivers/char/tpm/tpm_tis.c > > > @@ -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", > > > -- > > > 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". > > Yeah, that will relieve pains better, too. Please do it if possible then :-) BR, Jarkko
On Thu, 10 Aug 2023 17:08:04 +0200, Jarkko Sakkinen wrote: > > On Tue Aug 8, 2023 at 9:12 AM EEST, Takashi Iwai wrote: > > On Mon, 07 Aug 2023 21:14:20 +0200, > > Jarkko Sakkinen wrote: > > > > > > On Mon Aug 7, 2023 at 2:01 PM UTC, Takashi Iwai wrote: > > > > 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: <stable@vger.kernel.org> # v6.4+ > > > > Link: https://bugzilla.suse.com/show_bug.cgi?id=1213779 > > > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > > > > > > > --- > > > > drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++ > > > > 1 file changed, 16 insertions(+) > > > > > > > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > > > > index a98773ac2e55..0633823dc515 100644 > > > > --- a/drivers/char/tpm/tpm_tis.c > > > > +++ b/drivers/char/tpm/tpm_tis.c > > > > @@ -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", > > > > -- > > > > 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". > > > > 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
On Thu Aug 10, 2023 at 6:16 PM EEST, Takashi Iwai wrote: > On Thu, 10 Aug 2023 17:08:04 +0200, > Jarkko Sakkinen wrote: > > > > On Tue Aug 8, 2023 at 9:12 AM EEST, Takashi Iwai wrote: > > > On Mon, 07 Aug 2023 21:14:20 +0200, > > > Jarkko Sakkinen wrote: > > > > > > > > On Mon Aug 7, 2023 at 2:01 PM UTC, Takashi Iwai wrote: > > > > > 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: <stable@vger.kernel.org> # v6.4+ > > > > > Link: https://bugzilla.suse.com/show_bug.cgi?id=1213779 > > > > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > > > > > > > > > --- > > > > > drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++ > > > > > 1 file changed, 16 insertions(+) > > > > > > > > > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > > > > > index a98773ac2e55..0633823dc515 100644 > > > > > --- a/drivers/char/tpm/tpm_tis.c > > > > > +++ b/drivers/char/tpm/tpm_tis.c > > > > > @@ -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", > > > > > -- > > > > > 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". > > > > > > 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. I'll submit a patch asap, and cc you. I put the conclusions to the description. BR, Jarkko
On Thu, 10 Aug 2023 19:35:16 +0200, Jarkko Sakkinen wrote: > > On Thu Aug 10, 2023 at 6:16 PM EEST, Takashi Iwai wrote: > > On Thu, 10 Aug 2023 17:08:04 +0200, > > Jarkko Sakkinen wrote: > > > > > > On Tue Aug 8, 2023 at 9:12 AM EEST, Takashi Iwai wrote: > > > > On Mon, 07 Aug 2023 21:14:20 +0200, > > > > Jarkko Sakkinen wrote: > > > > > > > > > > On Mon Aug 7, 2023 at 2:01 PM UTC, Takashi Iwai wrote: > > > > > > 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: <stable@vger.kernel.org> # v6.4+ > > > > > > Link: https://bugzilla.suse.com/show_bug.cgi?id=1213779 > > > > > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > > > > > > > > > > > --- > > > > > > drivers/char/tpm/tpm_tis.c | 16 ++++++++++++++++ > > > > > > 1 file changed, 16 insertions(+) > > > > > > > > > > > > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c > > > > > > index a98773ac2e55..0633823dc515 100644 > > > > > > --- a/drivers/char/tpm/tpm_tis.c > > > > > > +++ b/drivers/char/tpm/tpm_tis.c > > > > > > @@ -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", > > > > > > -- > > > > > > 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". > > > > > > > > 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. > > I'll submit a patch asap, and cc you. I put the conclusions > to the description. Great, thanks! Takashi
On Thu Aug 10, 2023 at 8:48 PM EEST, Takashi Iwai wrote: > > I'll submit a patch asap, and cc you. I put the conclusions > > to the description. > > Great, thanks! It is out now: https://lore.kernel.org/linux-integrity/20230810182433.518523-1-jarkko@kernel.org/T/#u BR, Jarkko
On Thu Aug 10, 2023 at 9:26 PM EEST, Jarkko Sakkinen wrote: > On Thu Aug 10, 2023 at 8:48 PM EEST, Takashi Iwai wrote: > > > I'll submit a patch asap, and cc you. I put the conclusions > > > to the description. > > > > Great, thanks! > > It is out now: > > https://lore.kernel.org/linux-integrity/20230810182433.518523-1-jarkko@kernel.org/T/#u I put this also hanging to my -next branch (mirrored to linux-next). BR, Jarkko
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index a98773ac2e55..0633823dc515 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -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",