summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0248-tpm_tis-fix-stall-after-iowrite-s.patch
diff options
context:
space:
mode:
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.patch8
1 files changed, 4 insertions, 4 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 9a7e6db48..1ba216990 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/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
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=d7ca6b216bbcdb3daf45864e995aecf3d94de9a2
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 939dc25a7833..147012f342bd 100644
+index 3abb4af80be6..11fce5e7b68a 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 939dc25a7833..147012f342bd 100644
static int interrupts = -1;
module_param(interrupts, int, 0444);
MODULE_PARM_DESC(interrupts, "Enable interrupts");
-@@ -174,7 +199,7 @@ static int tpm_tcg_write_bytes(struct tpm_tis_data *data, u32 addr, u16 len,
+@@ -190,7 +215,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 939dc25a7833..147012f342bd 100644
return 0;
}
-@@ -201,7 +226,7 @@ static int tpm_tcg_write32(struct tpm_tis_data *data, u32 addr, u32 value)
+@@ -217,7 +242,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);