summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0248-tpm_tis-fix-stall-after-iowrite-s.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:15:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:15:14 +0000
commite549f10391e1fc78dab80e9b9ef524d214d4af40 (patch)
tree5358015c2d151febc170684ed8ddf2011b3ac4af /debian/patches-rt/0248-tpm_tis-fix-stall-after-iowrite-s.patch
parentMerging upstream version 4.19.282. (diff)
downloadlinux-e549f10391e1fc78dab80e9b9ef524d214d4af40.tar.xz
linux-e549f10391e1fc78dab80e9b9ef524d214d4af40.zip
Adding debian version 4.19.282-1.debian/4.19.282-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0248-tpm_tis-fix-stall-after-iowrite-s.patch')
-rw-r--r--debian/patches-rt/0248-tpm_tis-fix-stall-after-iowrite-s.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0248-tpm_tis-fix-stall-after-iowrite-s.patch b/debian/patches-rt/0248-tpm_tis-fix-stall-after-iowrite-s.patch
index c576819b3..9a7e6db48 100644
--- a/debian/patches-rt/0248-tpm_tis-fix-stall-after-iowrite-s.patch
+++ b/debian/patches-rt/0248-tpm_tis-fix-stall-after-iowrite-s.patch
@@ -1,7 +1,7 @@
From: Haris Okanovic <haris.okanovic@ni.com>
Date: Tue, 15 Aug 2017 15:13:08 -0500
-Subject: [PATCH 248/351] tpm_tis: fix stall after iowrite*()s
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=bfbcd15a1738d0dd3d63567813c6a2927520f286
+Subject: [PATCH 248/353] tpm_tis: fix stall after iowrite*()s
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=13c13176d3cb009c73dcba8f46807248a07dbb9f
ioread8() operations to TPM MMIO addresses can stall the cpu when
immediately following a sequence of iowrite*()'s to the same region.
@@ -25,7 +25,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
-index 5a3a4f095391..5ecca6585049 100644
+index 939dc25a7833..147012f342bd 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -54,6 +54,31 @@ static inline struct tpm_tis_tcg_phy *to_tpm_tis_tcg_phy(struct tpm_tis_data *da
@@ -60,7 +60,7 @@ index 5a3a4f095391..5ecca6585049 100644
static int interrupts = -1;
module_param(interrupts, int, 0444);
MODULE_PARM_DESC(interrupts, "Enable interrupts");
-@@ -173,7 +198,7 @@ static int tpm_tcg_write_bytes(struct tpm_tis_data *data, u32 addr, u16 len,
+@@ -174,7 +199,7 @@ static int tpm_tcg_write_bytes(struct tpm_tis_data *data, u32 addr, u16 len,
struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
while (len--)
@@ -69,7 +69,7 @@ index 5a3a4f095391..5ecca6585049 100644
return 0;
}
-@@ -200,7 +225,7 @@ static int tpm_tcg_write32(struct tpm_tis_data *data, u32 addr, u32 value)
+@@ -201,7 +226,7 @@ static int tpm_tcg_write32(struct tpm_tis_data *data, u32 addr, u32 value)
{
struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);