From 57c6531afc90152ee3160f15ce31dff9f2bfcf1f Mon Sep 17 00:00:00 2001 From: Mitchel Humpherys Date: Tue, 13 Jan 2015 12:14:26 -0800 Subject: [PATCH] iommu/arm-smmu: adjust readl_poll_timeout_atomic time The meaning of the arguments to readl_poll_timeout_atomic have changed since the arm-smmu code was written that uses it. Sync up to the new API semantics. Change-Id: Ibdcd53fb61303e1261f7f6378b3395700ce38b6e Signed-off-by: Mitchel Humpherys --- drivers/iommu/arm-smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 6dac151ee330..e8f2a36fb5bc 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1861,7 +1861,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain, } if (readl_poll_timeout_atomic(cb_base + ARM_SMMU_CB_ATSR, tmp, - !(tmp & ATSR_ACTIVE), 10, 5)) { + !(tmp & ATSR_ACTIVE), 5, 50)) { spin_unlock_irqrestore(&smmu_domain->lock, flags); dev_err(dev, "iova to phys timed out on 0x%pa. Falling back to software table walk.\n",