Skip to contentSkip to conversation

tpm: tpm_tis: Fix UPX-i11 DMI_PRODUCT_VERSION string

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

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tpm: tpm_tis: Fix UPX-i11 DMI_PRODUCT_VERSION string

The patch which made it to the kernel somehow lost the "01" from the string, making the match to not work anymore.

Fixes edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")

---
Hi Jarkko,

Can you send this patch for the 6.5 cycle?
edb13d7bb034 was applied in 6.5-rc3 and I just updated my work tree to notice the regression.

Thank you,
Peter

 drivers/char/tpm/tpm_tis.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/tpm/tpm_tis.c +1 -1
index ac4daaf294a3..2bb9901a329a 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_VERSION, "UPX-TGL01"),
 		},
 	},
 	{}
Signature · 1 line
2.41.0
#1 lore raw
Quoted 23 lines · Peter Ujfalusi

The patch which made it to the kernel somehow lost the "01" from the string, making the match to not work anymore.

Fixes edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")

---
Hi Jarkko,

Can you send this patch for the 6.5 cycle?
edb13d7bb034 was applied in 6.5-rc3 and I just updated my work tree to notice the regression.

Thank you,
Peter

 drivers/char/tpm/tpm_tis.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/tpm/tpm_tis.c +0 -0
index ac4daaf294a3..2bb9901a329a 100644

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

Quoted 5 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_VERSION, "UPX-TGL01"),

The DMI property also got changed in the applied patch, it should have been DMI_PRODUCT_NAME, I will send v2 shortly, please ignore this version

Quoted 3 lines
drivers/char/tpm/tpm_tis.c +0 -0
 		},
 	},
 	{}
Signature · 1 line
Péter
maintainer
#2 lore raw
Quoted 21 lines · Péter Ujfalusi
Quoted 18 lines · Peter Ujfalusi

The patch which made it to the kernel somehow lost the "01" from the string, making the match to not work anymore.

Fixes edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")

---
Hi Jarkko,

Can you send this patch for the 6.5 cycle?
edb13d7bb034 was applied in 6.5-rc3 and I just updated my work tree to notice the regression.

Thank you,
Peter

 drivers/char/tpm/tpm_tis.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines

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

Quoted 10 lines
drivers/char/tpm/tpm_tis.c +1 -1
index ac4daaf294a3..2bb9901a329a 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_VERSION, "UPX-TGL01"),

The DMI property also got changed in the applied patch, it should have been DMI_PRODUCT_NAME, I will send v2 shortly, please ignore this version

sure

BR, Jarkko

maintainer
#3 lore raw
In reply to Peter Ujfalusi
Quoted 23 lines · Peter Ujfalusi

The patch which made it to the kernel somehow lost the "01" from the string, making the match to not work anymore.

Fixes edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")

---
Hi Jarkko,

Can you send this patch for the 6.5 cycle?
edb13d7bb034 was applied in 6.5-rc3 and I just updated my work tree to notice the regression.

Thank you,
Peter

 drivers/char/tpm/tpm_tis.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/tpm/tpm_tis.c +0 -0
index ac4daaf294a3..2bb9901a329a 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_VERSION, "UPX-TGL01"),
 		},
 	},
 	{}

Yes. I'm sending a PR for v6.5-rc6 tomorrow anyhow.

BR, Jarkko