From: Mitchel Humpherys Date: Mon, 9 Nov 2015 19:50:58 +0000 (-0800) Subject: iommu/arm-smmu: Reduce TLB sync timeout X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fa8f99c506b31cd32cd9da8627bd1b3b1e813351;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git 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 --- 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))