Skip to content

Commit d6ddd9b

Browse files
arndbalexandrebelloni
authored andcommitted
i3c: fix big-endian FIFO transfers
Short MMIO transfers that are not a multiple of four bytes in size need a special case for the final bytes, however the existing implementation is not endian-safe and introduces an incorrect byteswap on big-endian kernels. This usually does not cause problems because most systems are little-endian and most transfers are multiple of four bytes long, but still needs to be fixed to avoid the extra byteswap. Change the special case for both i3c_writel_fifo() and i3c_readl_fifo() to use non-byteswapping writesl() and readsl() with a single element instead of the byteswapping writel()/readl() that are meant for individual MMIO registers. As data is copied between a FIFO and a memory buffer, the writesl()/readsl() loops are typically based on __raw_readl()/ __raw_writel(), resulting in the order of bytes in the FIFO to match the order in the buffer, regardless of the CPU endianess. The earlier versions in the dw-i3c and i3c-master-cdns had a correct implementation, but the generic version that was recently added broke it. Fixes: 733b439 ("i3c: master: Add inline i3c_readl_fifo() and i3c_writel_fifo()") Cc: Manikanta Guntupalli <manikanta.guntupalli@amd.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Jorge Marques <jorge.marques@analog.com> Link: https://lore.kernel.org/r/20250924201837.3691486-1-arnd@kernel.org Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent 8a1f3fd commit d6ddd9b

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

drivers/i3c/internals.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ static inline void i3c_writel_fifo(void __iomem *addr, const void *buf,
3838
u32 tmp = 0;
3939

4040
memcpy(&tmp, buf + (nbytes & ~3), nbytes & 3);
41-
writel(tmp, addr);
41+
/*
42+
* writesl() instead of writel() to keep FIFO
43+
* byteorder on big-endian targets
44+
*/
45+
writesl(addr, &tmp, 1);
4246
}
4347
}
4448

@@ -55,7 +59,11 @@ static inline void i3c_readl_fifo(const void __iomem *addr, void *buf,
5559
if (nbytes & 3) {
5660
u32 tmp;
5761

58-
tmp = readl(addr);
62+
/*
63+
* readsl() instead of readl() to keep FIFO
64+
* byteorder on big-endian targets
65+
*/
66+
readsl(addr, &tmp, 1);
5967
memcpy(buf + (nbytes & ~3), &tmp, nbytes & 3);
6068
}
6169
}

0 commit comments

Comments
 (0)