Commit a4188bee authored Jan 30, 2015 by Arnd Bergmann Committed by Joerg Roedel Feb 03, 2015

iommu/arm-smmu: Avoid build warning



ARM allmodconfig gained a new warning when dma_addr_t is 32-bit wide:

drivers/iommu/arm-smmu.c: In function 'arm_smmu_iova_to_phys_hard':
drivers/iommu/arm-smmu.c:1255:3: warning: right shift count >= width of type

This changes the calculation so that the effective type is always
64-bit.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 859a732e ("iommu/arm-smmu: add support for iova_to_phys through ATS1PR")
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent 16753322

drivers/iommu/arm-smmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1252,7 +1252,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
		} else {
		u32 reg = iova & ~0xfff;
		writel_relaxed(reg, cb_base + ARM_SMMU_CB_ATS1PR_LO);
		reg = (iova & ~0xfff) >> 32;
		reg = ((u64)iova & ~0xfff) >> 32;
		writel_relaxed(reg, cb_base + ARM_SMMU_CB_ATS1PR_HI);
		}

Admin message