Skip to contentSkip to conversation

tpm: tpm_tis: Fix UPX-i11 DMI_MATCH condition

PATCH In review Peter Ujfalusi 2 participants 2 messages Aug 8, 2023 – Aug 10, 2023

Subsystems (2)
Keys-trusted TPM device driver
lore
Share & tools
lore

Peter Ujfalusi

author
#0 lore raw

PATCH 1/1 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]/ open here
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(-)
drivers/char/tpm/tpm_tis.c +1 -1
index ac4daaf294a3..3c0f68b9e44f 100644
@@ -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"),
 		},
 	},
 	{}
Signature · 1 line
2.41.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 20 lines · Peter Ujfalusi

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]/ open here
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(-)
drivers/char/tpm/tpm_tis.c +0 -0
index ac4daaf294a3..3c0f68b9e44f 100644

drivers/char/tpm/tpm_tis.c static const struct dmi_system_id tpm_tis_dmi_table[] = { · line 189

Quoted 8 lines
drivers/char/tpm/tpm_tis.c +1 -1
@@ -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