Commit ce4b461b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Vinod Koul
Browse files

dmaengine: apple-admac: Use {low,upp}er_32_bits() to split 64-bit address 



If CONFIG_PHYS_ADDR_T_64BIT is not set:

    drivers/dma/apple-admac.c: In function ‘admac_cyclic_write_one_desc’:
    drivers/dma/apple-admac.c:213:22: error: right shift count >= width of type [-Werror=shift-count-overflow]
      213 |  writel_relaxed(addr >> 32,       ad->base + REG_DESC_WRITE(channo));
          |                      ^~

Fix this by using the {low,upp}er_32_bits() helper macros to obtain the
address parts.

Reported-by: default avatar <noreply@ellerman.id.au>
Fixes: b127315d ("dmaengine: apple-admac: Add Apple ADMAC driver")
Acked-by: default avatarMartin Povišer <povik+lin@cutebit.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20220616141312.1953819-1-geert@linux-m68k.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 81ce6f3d

drivers/dma/apple-admac.c

+4 −4
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ static void admac_cyclic_write_one_desc(struct admac_data *ad, int channo, 
	dev_dbg(ad->dev, "ch%d descriptor: addr=0x%pad len=0x%zx flags=0x%lx\n",

		channo, &addr, tx->period_len, FLAG_DESC_NOTIFY);



	writel_relaxed(addr,             ad->base + REG_DESC_WRITE(channo));

	writel_relaxed(addr >> 32,       ad->base + REG_DESC_WRITE(channo));

	writel_relaxed(lower_32_bits(addr), ad->base + REG_DESC_WRITE(channo));

	writel_relaxed(upper_32_bits(addr), ad->base + REG_DESC_WRITE(channo));

	writel_relaxed(tx->period_len,      ad->base + REG_DESC_WRITE(channo));

	writel_relaxed(FLAG_DESC_NOTIFY,    ad->base + REG_DESC_WRITE(channo));