From: Ivan Morozko Ivan.Morozko@oktetlabs.ru
There is no reason to have a separate and highly restricted version of spi-mem driver for NODM case, it's quite easily fix DM based driver version and use it for all cases.
Signed-off-by: Ivan Morozko Ivan.Morozko@oktetlabs.ru Reviewed-by: Mikhail Kshevetskiy mikhail.kshevetskiy@oktetlabs.ru --- drivers/spi/Makefile | 3 +- drivers/spi/spi-mem-nodm.c | 107 ------------------------------------- drivers/spi/spi-mem.c | 37 ++++++++----- include/spi.h | 1 + 4 files changed, 26 insertions(+), 122 deletions(-) delete mode 100644 drivers/spi/spi-mem-nodm.c
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 54881a7412..6dff4eed83 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -8,12 +8,11 @@ ifdef CONFIG_DM_SPI obj-y += spi-uclass.o obj-$(CONFIG_SANDBOX) += spi-emul-uclass.o obj-$(CONFIG_SOFT_SPI) += soft_spi.o -obj-$(CONFIG_SPI_MEM) += spi-mem.o obj-$(CONFIG_TI_QSPI) += ti_qspi.o else obj-y += spi.o -obj-$(CONFIG_SPI_MEM) += spi-mem-nodm.o endif +obj-$(CONFIG_SPI_MEM) += spi-mem.o
obj-$(CONFIG_ALTERA_SPI) += altera_spi.o obj-$(CONFIG_ATH79_SPI) += ath79_spi.o diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c deleted file mode 100644 index 765f05fe54..0000000000 --- a/drivers/spi/spi-mem-nodm.c +++ /dev/null @@ -1,107 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ - */ - -#include <log.h> -#include <malloc.h> -#include <spi.h> -#include <spi-mem.h> - -int spi_mem_exec_op(struct spi_slave *slave, - const struct spi_mem_op *op) -{ - unsigned int pos = 0; - const u8 *tx_buf = NULL; - u8 *rx_buf = NULL; - u8 *op_buf; - int op_len; - u32 flag; - int ret; - int i; - - if (op->data.nbytes) { - if (op->data.dir == SPI_MEM_DATA_IN) - rx_buf = op->data.buf.in; - else - tx_buf = op->data.buf.out; - } - - op_len = sizeof(op->cmd.opcode) + op->addr.nbytes + op->dummy.nbytes; - op_buf = calloc(1, op_len); - - ret = spi_claim_bus(slave); - if (ret < 0) - return ret; - - op_buf[pos++] = op->cmd.opcode; - - if (op->addr.nbytes) { - for (i = 0; i < op->addr.nbytes; i++) - op_buf[pos + i] = op->addr.val >> - (8 * (op->addr.nbytes - i - 1)); - - pos += op->addr.nbytes; - } - - if (op->dummy.nbytes) - memset(op_buf + pos, 0xff, op->dummy.nbytes); - - /* 1st transfer: opcode + address + dummy cycles */ - flag = SPI_XFER_BEGIN; - /* Make sure to set END bit if no tx or rx data messages follow */ - if (!tx_buf && !rx_buf) - flag |= SPI_XFER_END; - - ret = spi_xfer(slave, op_len * 8, op_buf, NULL, flag); - if (ret) - return ret; - - /* 2nd transfer: rx or tx data path */ - if (tx_buf || rx_buf) { - ret = spi_xfer(slave, op->data.nbytes * 8, tx_buf, - rx_buf, SPI_XFER_END); - if (ret) - return ret; - } - - spi_release_bus(slave); - - for (i = 0; i < pos; i++) - debug("%02x ", op_buf[i]); - debug("| [%dB %s] ", - tx_buf || rx_buf ? op->data.nbytes : 0, - tx_buf || rx_buf ? (tx_buf ? "out" : "in") : "-"); - for (i = 0; i < op->data.nbytes; i++) - debug("%02x ", tx_buf ? tx_buf[i] : rx_buf[i]); - debug("[ret %d]\n", ret); - - free(op_buf); - - if (ret < 0) - return ret; - - return 0; -} - -int spi_mem_adjust_op_size(struct spi_slave *slave, - struct spi_mem_op *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; -} diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c index d344701aeb..e4544edaad 100644 --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c @@ -105,6 +105,19 @@ void spi_controller_dma_unmap_mem_op_data(struct spi_controller *ctlr, EXPORT_SYMBOL_GPL(spi_controller_dma_unmap_mem_op_data); #endif /* __UBOOT__ */
+static inline +struct spi_controller_mem_ops *spi_get_mem_ops(struct spi_slave *slave) +{ +#ifdef CONFIG_DM_SPI + struct udevice *bus = slave->dev->parent; + struct dm_spi_ops *ops = spi_get_ops(bus); + + return ops->mem_ops; +#else + return slave->mem_ops; +#endif +} + static int spi_check_buswidth_req(struct spi_slave *slave, u8 buswidth, bool tx) { u32 mode = slave->mode; @@ -181,11 +193,10 @@ EXPORT_SYMBOL_GPL(spi_mem_default_supports_op); bool spi_mem_supports_op(struct spi_slave *slave, const struct spi_mem_op *op) { - struct udevice *bus = slave->dev->parent; - struct dm_spi_ops *ops = spi_get_ops(bus); + struct spi_controller_mem_ops *mem_ops = spi_get_mem_ops(slave);
- if (ops->mem_ops && ops->mem_ops->supports_op) - return ops->mem_ops->supports_op(slave, op); + if (mem_ops && mem_ops->supports_op) + return mem_ops->supports_op(slave, op);
return spi_mem_default_supports_op(slave, op); } @@ -205,8 +216,7 @@ EXPORT_SYMBOL_GPL(spi_mem_supports_op); */ int spi_mem_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) { - struct udevice *bus = slave->dev->parent; - struct dm_spi_ops *ops = spi_get_ops(bus); + struct spi_controller_mem_ops *mem_ops = spi_get_mem_ops(slave); unsigned int pos = 0; const u8 *tx_buf = NULL; u8 *rx_buf = NULL; @@ -222,7 +232,7 @@ int spi_mem_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) if (ret < 0) return ret;
- if (ops->mem_ops && ops->mem_ops->exec_op) { + if (mem_ops && mem_ops->exec_op) { #ifndef __UBOOT__ /* * Flush the message queue before executing our SPI memory @@ -243,7 +253,8 @@ int spi_mem_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) mutex_lock(&ctlr->bus_lock_mutex); mutex_lock(&ctlr->io_mutex); #endif - ret = ops->mem_ops->exec_op(slave, op); + + ret = mem_ops->exec_op(slave, op);
#ifndef __UBOOT__ mutex_unlock(&ctlr->io_mutex); @@ -425,13 +436,12 @@ EXPORT_SYMBOL_GPL(spi_mem_exec_op); */ int spi_mem_adjust_op_size(struct spi_slave *slave, struct spi_mem_op *op) { - struct udevice *bus = slave->dev->parent; - struct dm_spi_ops *ops = spi_get_ops(bus); + struct spi_controller_mem_ops *mem_ops = spi_get_mem_ops(slave);
- if (ops->mem_ops && ops->mem_ops->adjust_op_size) - return ops->mem_ops->adjust_op_size(slave, op); + if (mem_ops && mem_ops->adjust_op_size) + return mem_ops->adjust_op_size(slave, op);
- if (!ops->mem_ops || !ops->mem_ops->exec_op) { + if (!mem_ops || !mem_ops->exec_op) { unsigned int len;
len = sizeof(op->cmd.opcode) + op->addr.nbytes + @@ -450,6 +460,7 @@ int spi_mem_adjust_op_size(struct spi_slave *slave, struct spi_mem_op *op)
if (!op->data.nbytes) return -EINVAL; + }
return 0; diff --git a/include/spi.h b/include/spi.h index 5cc6d6e008..825737b120 100644 --- a/include/spi.h +++ b/include/spi.h @@ -138,6 +138,7 @@ struct spi_slave { #else unsigned int bus; unsigned int cs; + struct spi_controller_mem_ops *mem_ops; #endif uint mode; unsigned int wordlen;