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