2023-08-08 17:02:39

by Péter Ujfalusi

Subject: [PATCH] tpm: tpm_tis: Fix UPX-i11 DMI_MATCH condition

The patch which made it to the kernel somehow changed the
match condition from
DMI_MATCH(DMI_PRODUCT_NAME, "UPX-TGL01")
to
DMI_MATCH(DMI_PRODUCT_VERSION, "UPX-TGL")

Revert back to the correct match condition to disable the
interrupt mode on the board.

Link: https://lore.kernel.org/lkml/[email protected]/
Fixes: edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")
---
drivers/char/tpm/tpm_tis.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index ac4daaf294a3..3c0f68b9e44f 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -183,7 +183,7 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
.ident = "UPX-TGL",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),
- DMI_MATCH(DMI_PRODUCT_VERSION, "UPX-TGL"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "UPX-TGL01"),
},
},
{}
--
2.41.0

2023-08-10 15:44:54

by Jarkko Sakkinen

Subject: Re: [PATCH] tpm: tpm_tis: Fix UPX-i11 DMI_MATCH condition

On Tue Aug 8, 2023 at 12:48 PM EEST, Peter Ujfalusi wrote:
> The patch which made it to the kernel somehow changed the
> match condition from
> DMI_MATCH(DMI_PRODUCT_NAME, "UPX-TGL01")
> to
> DMI_MATCH(DMI_PRODUCT_VERSION, "UPX-TGL")
>
> Revert back to the correct match condition to disable the
> interrupt mode on the board.
>
> Link: https://lore.kernel.org/lkml/[email protected]/
> Fixes: edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")
> ---
> drivers/char/tpm/tpm_tis.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index ac4daaf294a3..3c0f68b9e44f 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -183,7 +183,7 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
> .ident = "UPX-TGL",
> .matches = {
> DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),
> - DMI_MATCH(DMI_PRODUCT_VERSION, "UPX-TGL"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "UPX-TGL01"),
> },
> },
> {}

Acked-by: Jarkko Sakkinen <[email protected]>

BR, Jarkko