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;
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date:   Mon, 07 Aug 2023 19:14:20 +0000
Message-Id: <CUMJWFCIG9EI.13F7LU8TYAUE1@seitikki>
Cc:     "Jason Gunthorpe" <jgg@ziepe.ca>,
        <linux-integrity@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] tpm/tpm_tis: Disable interrupts for Lenovo Thinkpad E14
 Gen 2 and 13s-IML
From:   "Jarkko Sakkinen" <jarkko@kernel.org>
To:     "Takashi Iwai" <tiwai@suse.de>, "Peter Huewe" <peterhuewe@gmx.de>
References: <20230807140125.18486-1-tiwai@suse.de>
In-Reply-To: <20230807140125.18486-1-tiwai@suse.de>
Precedence: bulk

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=3D1213779
> 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[=
] =3D {
>  			DMI_MATCH(DMI_PRODUCT_NAME, "Laptop (13th Gen Intel Core)"),
>  		},
>  	},
> +	{
> +		.callback =3D tpm_tis_disable_irq,
> +		.ident =3D "ThinkPad E14 Gen 2",
> +		.matches =3D {
> +			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad E14 Gen 2"),
> +		},
> +	},
> +	{
> +		.callback =3D tpm_tis_disable_irq,
> +		.ident =3D "ThinkBook 13s-IML",
> +		.matches =3D {
> +			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ThinkBook 13s-IML"),
> +		},
> +	},
>  	{
>  		.callback =3D tpm_tis_disable_irq,
>  		.ident =3D "ThinkPad T490s",
> --=20
> 2.35.3

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

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

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

BR, Jarkko