Extend spi_mem_adjust_op_size() to take spi->max_write_size and
spi->max_read_size into account.

Signed-off-by: Vignesh R <vigne...@ti.com>
Tested-by: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com>
Tested-by: Stefan Roese <s...@denx.de>
Tested-by: Horatiu Vultur <horatiu.vul...@microchip.com>
---
 drivers/spi/spi-mem.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index 1da20b8de5c4..334af682dc65 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -412,6 +412,25 @@ int spi_mem_adjust_op_size(struct spi_slave *slave, struct 
spi_mem_op *op)
        if (ops->mem_ops && ops->mem_ops->adjust_op_size)
                return ops->mem_ops->adjust_op_size(slave, op);
 
+       if (!ops->mem_ops || !ops->mem_ops->exec_op) {
+               unsigned int len;
+
+               len = sizeof(op->cmd.opcode) + op->addr.nbytes +
+                       op->dummy.nbytes;
+               if (slave->max_write_size && len > slave->max_write_size)
+                       return -EINVAL;
+
+               if (op->data.dir == SPI_MEM_DATA_IN && slave->max_read_size)
+                       op->data.nbytes = min(op->data.nbytes,
+                                             slave->max_read_size);
+               else if (slave->max_write_size)
+                       op->data.nbytes = min(op->data.nbytes,
+                                             slave->max_write_size - len);
+
+               if (!op->data.nbytes)
+                       return -EINVAL;
+       }
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(spi_mem_adjust_op_size);
-- 
2.20.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to