diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-15 15:21:57 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-15 15:21:57 -0400 |
| commit | f1d4a7c207d416596a8c0cff753780638a53d9f2 (patch) | |
| tree | e99570ee6a74c56ad0fed5c2a43e5754e80bd596 | |
| parent | 50eaa15273f2406f2b393c061ba0d9b63900adab (diff) | |
| download | longterm-queue-4.18-f1d4a7c207d416596a8c0cff753780638a53d9f2.tar.gz | |
iommu: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/iommu-arm-smmu-Avoid-constant-zero-in-TLBI-writes.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/queue/iommu-arm-smmu-Avoid-constant-zero-in-TLBI-writes.patch b/queue/iommu-arm-smmu-Avoid-constant-zero-in-TLBI-writes.patch index dc58ea2..103255e 100644 --- a/queue/iommu-arm-smmu-Avoid-constant-zero-in-TLBI-writes.patch +++ b/queue/iommu-arm-smmu-Avoid-constant-zero-in-TLBI-writes.patch @@ -1,4 +1,4 @@ -From 4e4abae311e4b44aaf61f18a826fd7136037f199 Mon Sep 17 00:00:00 2001 +From 33727e79612af3c99594a132be6c62dbd7fe57b9 Mon Sep 17 00:00:00 2001 From: Robin Murphy <robin.murphy@arm.com> Date: Mon, 3 Jun 2019 14:15:37 +0200 Subject: [PATCH] iommu/arm-smmu: Avoid constant zero in TLBI writes @@ -31,11 +31,11 @@ Cc: stable@vger.kernel.org Signed-off-by: Joerg Roedel <jroedel@suse.de> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c -index 5e54cc0a28b3..4f900c663fb8 100644 +index 57f410b66a9b..96ced0826dbd 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c -@@ -59,6 +59,15 @@ - +@@ -56,6 +56,15 @@ + #include "io-pgtable.h" #include "arm-smmu-regs.h" +/* @@ -50,7 +50,7 @@ index 5e54cc0a28b3..4f900c663fb8 100644 #define ARM_MMU500_ACTLR_CPRE (1 << 1) #define ARM_MMU500_ACR_CACHE_LOCK (1 << 26) -@@ -423,7 +432,7 @@ static void __arm_smmu_tlb_sync(struct arm_smmu_device *smmu, +@@ -398,7 +407,7 @@ static void __arm_smmu_tlb_sync(struct arm_smmu_device *smmu, { unsigned int spin_cnt, delay; @@ -59,7 +59,7 @@ index 5e54cc0a28b3..4f900c663fb8 100644 for (delay = 1; delay < TLB_LOOP_TIMEOUT; delay *= 2) { for (spin_cnt = TLB_SPIN_COUNT; spin_cnt > 0; spin_cnt--) { if (!(readl_relaxed(status) & sTLBGSTATUS_GSACTIVE)) -@@ -1763,8 +1772,8 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu) +@@ -1638,8 +1647,8 @@ static void arm_smmu_device_reset(struct arm_smmu_device *smmu) } /* Invalidate the TLB, just in case */ |