* [PATCH] iommu: arm-smmu: avoid build warning
@ 2015-01-30 21:55 Arnd Bergmann
2015-02-02 10:20 ` Will Deacon
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2015-01-30 21:55 UTC (permalink / raw)
To: Joerg Roedel
Cc: Will Deacon, Mitchel Humpherys, joro, linux-arm-kernel, iommu,
linux-kernel
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: 859a732e4f713 ("iommu/arm-smmu: add support for iova_to_phys through ATS1PR")
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 1d6d43bb3395..fc13dd56953e 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -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);
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] iommu: arm-smmu: avoid build warning
2015-01-30 21:55 [PATCH] iommu: arm-smmu: avoid build warning Arnd Bergmann
@ 2015-02-02 10:20 ` Will Deacon
2015-02-03 17:54 ` joro
0 siblings, 1 reply; 3+ messages in thread
From: Will Deacon @ 2015-02-02 10:20 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Joerg Roedel, Mitchel Humpherys, joro, linux-arm-kernel, iommu,
linux-kernel
On Fri, Jan 30, 2015 at 09:55:55PM +0000, Arnd Bergmann wrote:
> 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: 859a732e4f713 ("iommu/arm-smmu: add support for iova_to_phys through ATS1PR")
>
> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> index 1d6d43bb3395..fc13dd56953e 100644
> --- a/drivers/iommu/arm-smmu.c
> +++ b/drivers/iommu/arm-smmu.c
> @@ -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);
> }
Thanks, Arnd.
Acked-by: Will Deacon <will.deacon@arm.com>
Joerg, could you pick this one up directly please? I don't have any other
ARM SMMU fixes queued at the moment.
Will
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] iommu: arm-smmu: avoid build warning
2015-02-02 10:20 ` Will Deacon
@ 2015-02-03 17:54 ` joro
0 siblings, 0 replies; 3+ messages in thread
From: joro @ 2015-02-03 17:54 UTC (permalink / raw)
To: Will Deacon
Cc: Arnd Bergmann, Joerg Roedel, Mitchel Humpherys, linux-arm-kernel,
iommu, linux-kernel
On Mon, Feb 02, 2015 at 10:20:49AM +0000, Will Deacon wrote:
> On Fri, Jan 30, 2015 at 09:55:55PM +0000, Arnd Bergmann wrote:
> > - reg = (iova & ~0xfff) >> 32;
> > + reg = ((u64)iova & ~0xfff) >> 32;
> > writel_relaxed(reg, cb_base + ARM_SMMU_CB_ATS1PR_HI);
> > }
>
> Thanks, Arnd.
>
> Acked-by: Will Deacon <will.deacon@arm.com>
>
> Joerg, could you pick this one up directly please? I don't have any other
> ARM SMMU fixes queued at the moment.
Done, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-03 17:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-30 21:55 [PATCH] iommu: arm-smmu: avoid build warning Arnd Bergmann
2015-02-02 10:20 ` Will Deacon
2015-02-03 17:54 ` joro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).