* [PATCH 1/2] tpm: tpm_tis: Fix UPX-i11 DMI_MATCH condition
[not found] <20230811234002.2656180-1-jarkko@kernel.org>
@ 2023-08-11 23:40 ` Jarkko Sakkinen
2023-08-11 23:40 ` [PATCH 2/2] tpm_tis: Opt-in interrupts Jarkko Sakkinen
1 sibling, 0 replies; 2+ messages in thread
From: Jarkko Sakkinen @ 2023-08-11 23:40 UTC (permalink / raw)
To: linux-integrity
Cc: Linus Torvalds, Peter Ujfalusi, stable, Jarkko Sakkinen,
Peter Huewe, Jason Gunthorpe, linux-kernel
From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
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.
Cc: stable@vger.kernel.org # v6.4+
Fixes: edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")
Link: https://lore.kernel.org/lkml/20230524085844.11580-1-peter.ujfalusi@linux.intel.com/
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
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.39.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH 2/2] tpm_tis: Opt-in interrupts
[not found] <20230811234002.2656180-1-jarkko@kernel.org>
2023-08-11 23:40 ` [PATCH 1/2] tpm: tpm_tis: Fix UPX-i11 DMI_MATCH condition Jarkko Sakkinen
@ 2023-08-11 23:40 ` Jarkko Sakkinen
1 sibling, 0 replies; 2+ messages in thread
From: Jarkko Sakkinen @ 2023-08-11 23:40 UTC (permalink / raw)
To: linux-integrity
Cc: Linus Torvalds, Jarkko Sakkinen, stable, Peter Huewe,
Jason Gunthorpe, Lino Sanfilippo, linux-kernel
Cc: stable@vger.kernel.org # v6.4+
Link: https://lore.kernel.org/linux-integrity/CAHk-=whRVp4h8uWOX1YO+Y99+44u4s=XxMK4v00B6F1mOfqPLg@mail.gmail.com/
Fixes: e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
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 3c0f68b9e44f..7fa3d91042b2 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -89,7 +89,7 @@ static inline void tpm_tis_iowrite32(u32 b, void __iomem *iobase, u32 addr)
tpm_tis_flush(iobase);
}
-static int interrupts = -1;
+static int interrupts;
module_param(interrupts, int, 0444);
MODULE_PARM_DESC(interrupts, "Enable interrupts");
--
2.39.2
^ permalink raw reply related [flat|nested] 2+ messages in thread