summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchel Humpherys <mitchelh@codeaurora.org>2015-11-09 11:50:58 -0800
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:14:32 -0700
commitfa8f99c506b31cd32cd9da8627bd1b3b1e813351 (patch)
tree26f22d0e455e8fbc70a307361073bc238742c88f
parent8ed2896540c4389a9e9b4f528e30d34c4f35b0ca (diff)
iommu/arm-smmu: Reduce TLB sync timeout
We're currently waiting for up to 1 second for the TLB sync command to finish. Unfortunately, this is long enough to trigger a watchdog bark since the time between the watchdog pet timer interrupt and the bark interrupt is only 1 second. Fix this by reducing the timeout to 500 milliseconds, which is still more than enough time for the TLB sync command to complete. CRs-Fixed: 929880 Change-Id: I467cd5fd9caa24b4f120a7fe8c8f57c73687006b Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
-rw-r--r--drivers/iommu/arm-smmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index e2fdd7b93600..b989b025e0a5 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -142,7 +142,7 @@
#define ARM_SMMU_GR0_sTLBGSYNC 0x70
#define ARM_SMMU_GR0_sTLBGSTATUS 0x74
#define sTLBGSTATUS_GSACTIVE (1 << 0)
-#define TLB_LOOP_TIMEOUT 1000000 /* 1s! */
+#define TLB_LOOP_TIMEOUT 500000 /* 500ms */
/* Stream mapping registers */
#define ARM_SMMU_GR0_SMR(n) (0x800 + ((n) << 2))