]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
spi: hisi-sfc-v3xx: factor out bus config and transfer functions
authorYicong Yang <yangyicong@hisilicon.com>
Thu, 24 Sep 2020 12:24:28 +0000 (20:24 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 25 Sep 2020 20:26:27 +0000 (21:26 +0100)
In hisi_sfc_v3xx_generic_exec_op(), we will write the data to the buffer,
configure and start the transfer, read the data to the buffer and check
whether occurs an error. Factor out the config and transfer start codes
as individual functions, to make the process a bit clearer.

Acked-by: John Garry <john.garry@huawei.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Link: https://lore.kernel.org/r/1600950270-52536-3-git-send-email-yangyicong@hisilicon.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-hisi-sfc-v3xx.c

index 69f5a7bcaf3d4da0019c5bf8107daddb53f57122..62d4ed8f1635f5510189a1852c1b57828572b59f 100644 (file)
@@ -198,12 +198,12 @@ static void hisi_sfc_v3xx_write_databuf(struct hisi_sfc_v3xx_host *host,
        }
 }
 
-static int hisi_sfc_v3xx_generic_exec_op(struct hisi_sfc_v3xx_host *host,
-                                        const struct spi_mem_op *op,
-                                        u8 chip_select)
+static int hisi_sfc_v3xx_start_bus(struct hisi_sfc_v3xx_host *host,
+                                  const struct spi_mem_op *op,
+                                  u8 chip_select)
 {
-       int ret = 0, len = op->data.nbytes, buswidth_mode;
-       u32 int_stat, config = 0;
+       int len = op->data.nbytes, buswidth_mode;
+       u32 config = 0;
 
        if (op->addr.nbytes)
                config |= HISI_SFC_V3XX_CMD_CFG_ADDR_EN_MSK;
@@ -227,9 +227,7 @@ static int hisi_sfc_v3xx_generic_exec_op(struct hisi_sfc_v3xx_host *host,
                config |= HISI_SFC_V3XX_CMD_CFG_DATA_EN_MSK;
        }
 
-       if (op->data.dir == SPI_MEM_DATA_OUT)
-               hisi_sfc_v3xx_write_databuf(host, op->data.buf.out, len);
-       else if (op->data.dir == SPI_MEM_DATA_IN)
+       if (op->data.dir == SPI_MEM_DATA_IN)
                config |= HISI_SFC_V3XX_CMD_CFG_RW_MSK;
 
        config |= op->dummy.nbytes << HISI_SFC_V3XX_CMD_CFG_DUMMY_CNT_OFF |
@@ -241,6 +239,23 @@ static int hisi_sfc_v3xx_generic_exec_op(struct hisi_sfc_v3xx_host *host,
 
        writel(config, host->regbase + HISI_SFC_V3XX_CMD_CFG);
 
+       return 0;
+}
+
+static int hisi_sfc_v3xx_generic_exec_op(struct hisi_sfc_v3xx_host *host,
+                                        const struct spi_mem_op *op,
+                                        u8 chip_select)
+{
+       u32 int_stat;
+       int ret;
+
+       if (op->data.dir == SPI_MEM_DATA_OUT)
+               hisi_sfc_v3xx_write_databuf(host, op->data.buf.out, op->data.nbytes);
+
+       ret = hisi_sfc_v3xx_start_bus(host, op, chip_select);
+       if (ret)
+               return ret;
+
        ret = hisi_sfc_v3xx_wait_cmd_idle(host);
        if (ret)
                return ret;
@@ -265,7 +280,7 @@ static int hisi_sfc_v3xx_generic_exec_op(struct hisi_sfc_v3xx_host *host,
        }
 
        if (op->data.dir == SPI_MEM_DATA_IN)
-               hisi_sfc_v3xx_read_databuf(host, op->data.buf.in, len);
+               hisi_sfc_v3xx_read_databuf(host, op->data.buf.in, op->data.nbytes);
 
        return 0;
 }