Message ID | 1398770316-19715-5-git-send-email-kaixu.xia@linaro.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 1aa91b6dd44a9517dee42913ecf9f51650b32cb6 |
Headers | show |
On 04/29/2014 04:48 PM, Xia Kaixu wrote: > From: Arnd Bergmann <arnd@arndb.de> > > dma_addr_t may be 64 bit wide, which causes a build failure > when doing a division on it. Here it is safe to cast to an > u32 type, which avoids the problem. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org> > Cc: Mark Brown <broonie@kernel.org> > Cc: Liam Girdwood <lgirdwood@gmail.com> > Cc: Ben Dooks <ben-linux@fluff.org> > Cc: Kukjin Kim <kgene.kim@samsung.com> > Cc: Sangbeom Kim <sbkim73@samsung.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-samsung-soc@vger.kernel.org > Cc: alsa-devel@alsa-project.org > --- Tested with ARM_LPAE enabled. Without this patch, getting following error. sound/built-in.o: In function `iis_irq': sound/soc/samsung/idma.c:277: undefined reference to `__aeabi_uldivmod' Tested-by: Tushar Behera <tushar.behera@linaro.org> > sound/soc/samsung/idma.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c > index 3d5cf15..e9891b4 100644 > --- a/sound/soc/samsung/idma.c > +++ b/sound/soc/samsung/idma.c > @@ -274,7 +274,7 @@ static irqreturn_t iis_irq(int irqno, void *dev_id) > > addr = readl(idma.regs + I2SLVL0ADDR) - idma.lp_tx_addr; > addr += prtd->periodsz; > - addr %= (prtd->end - prtd->start); > + addr %= (u32)(prtd->end - prtd->start); > addr += idma.lp_tx_addr; > > writel(addr, idma.regs + I2SLVL0ADDR); >
On Tue, Apr 29, 2014 at 07:18:25PM +0800, Xia Kaixu wrote: > From: Arnd Bergmann <arnd@arndb.de> > > dma_addr_t may be 64 bit wide, which causes a build failure > when doing a division on it. Here it is safe to cast to an > u32 type, which avoids the problem. Applied, thanks.
diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c index 3d5cf15..e9891b4 100644 --- a/sound/soc/samsung/idma.c +++ b/sound/soc/samsung/idma.c @@ -274,7 +274,7 @@ static irqreturn_t iis_irq(int irqno, void *dev_id) addr = readl(idma.regs + I2SLVL0ADDR) - idma.lp_tx_addr; addr += prtd->periodsz; - addr %= (prtd->end - prtd->start); + addr %= (u32)(prtd->end - prtd->start); addr += idma.lp_tx_addr; writel(addr, idma.regs + I2SLVL0ADDR);