]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
i3c: master: dw: Use i3c_writel_fifo() and i3c_readl_fifo()
authorJorge Marques <jorge.marques@analog.com>
Tue, 24 Jun 2025 09:06:06 +0000 (11:06 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Wed, 30 Jul 2025 23:21:10 +0000 (01:21 +0200)
Use common inline i3c_writel_fifo()/i3c_readl_fifo() methods to
simplify code since the FIFO of controller is a 32bit width.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20250624-i3c-writesl-readsl-v3-3-63ccf0870f01@analog.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/i3c/master/dw-i3c-master.c

index ae19926656738bef7cfff24fd67026da4753c9f8..cc872b48169151af81d10ee843f1002da4f4f33a 100644 (file)
@@ -23,6 +23,7 @@
 #include <linux/reset.h>
 #include <linux/slab.h>
 
+#include "../internals.h"
 #include "dw-i3c-master.h"
 
 #define DEVICE_CTRL                    0x0
@@ -336,37 +337,19 @@ static int dw_i3c_master_get_free_pos(struct dw_i3c_master *master)
 static void dw_i3c_master_wr_tx_fifo(struct dw_i3c_master *master,
                                     const u8 *bytes, int nbytes)
 {
-       writesl(master->regs + RX_TX_DATA_PORT, bytes, nbytes / 4);
-       if (nbytes & 3) {
-               u32 tmp = 0;
-
-               memcpy(&tmp, bytes + (nbytes & ~3), nbytes & 3);
-               writesl(master->regs + RX_TX_DATA_PORT, &tmp, 1);
-       }
-}
-
-static void dw_i3c_master_read_fifo(struct dw_i3c_master *master,
-                                   int reg,  u8 *bytes, int nbytes)
-{
-       readsl(master->regs + reg, bytes, nbytes / 4);
-       if (nbytes & 3) {
-               u32 tmp;
-
-               readsl(master->regs + reg, &tmp, 1);
-               memcpy(bytes + (nbytes & ~3), &tmp, nbytes & 3);
-       }
+       i3c_writel_fifo(master->regs + RX_TX_DATA_PORT, bytes, nbytes);
 }
 
 static void dw_i3c_master_read_rx_fifo(struct dw_i3c_master *master,
                                       u8 *bytes, int nbytes)
 {
-       return dw_i3c_master_read_fifo(master, RX_TX_DATA_PORT, bytes, nbytes);
+       i3c_readl_fifo(master->regs + RX_TX_DATA_PORT, bytes, nbytes);
 }
 
 static void dw_i3c_master_read_ibi_fifo(struct dw_i3c_master *master,
                                        u8 *bytes, int nbytes)
 {
-       return dw_i3c_master_read_fifo(master, IBI_QUEUE_STATUS, bytes, nbytes);
+       i3c_readl_fifo(master->regs + IBI_QUEUE_STATUS, bytes, nbytes);
 }
 
 static struct dw_i3c_xfer *