Soon the SPI-NAND core will need a way to request a SPI controller to enable ECC support for a given operation. This is because of the pipelined integration of certain ECC engines, which are directly managed by the SPI controller itself. Introduce a spi_mem_op additional field for this purpose: ecc_en. So far this field is left unset and checked to be false by all the SPI controller drivers in their ->supports_op() hook, as they all call spi_mem_default/dtr_supports_op(). Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx> --- drivers/spi/spi-mem.c | 11 ++++++++--- include/linux/spi/spi-mem.h | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c index 013efaaaac75..9e06cd918273 100644 --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c @@ -162,7 +162,7 @@ static bool spi_mem_check_buswidth(struct spi_mem *mem, static bool spi_mem_generic_supports_op(struct spi_mem *mem, const struct spi_mem_op *op, - bool dtr) + bool dtr, bool ecc) { if (!dtr) { if (op->cmd.dtr || op->addr.dtr || @@ -176,20 +176,25 @@ static bool spi_mem_generic_supports_op(struct spi_mem *mem, return false; } + if (!ecc) { + if (op->ecc_en) + return false; + } + return spi_mem_check_buswidth(mem, op); } bool spi_mem_dtr_supports_op(struct spi_mem *mem, const struct spi_mem_op *op) { - return spi_mem_generic_supports_op(mem, op, true); + return spi_mem_generic_supports_op(mem, op, true, false); } EXPORT_SYMBOL_GPL(spi_mem_dtr_supports_op); bool spi_mem_default_supports_op(struct spi_mem *mem, const struct spi_mem_op *op) { - return spi_mem_generic_supports_op(mem, op, false); + return spi_mem_generic_supports_op(mem, op, false, false); } EXPORT_SYMBOL_GPL(spi_mem_default_supports_op); diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h index 85e2ff7b840d..3be594be24c0 100644 --- a/include/linux/spi/spi-mem.h +++ b/include/linux/spi/spi-mem.h @@ -94,6 +94,7 @@ enum spi_mem_data_dir { * operation does not involve transferring data * @data.buf.in: input buffer (must be DMA-able) * @data.buf.out: output buffer (must be DMA-able) + * @ecc_en: error correction is required */ struct spi_mem_op { struct { @@ -126,6 +127,8 @@ struct spi_mem_op { const void *out; } buf; } data; + + bool ecc_en; }; #define SPI_MEM_OP(__cmd, __addr, __dummy, __data) \ -- 2.27.0