Setting dtr field of spi_mem_op is useful when creating templates
for DTR ops in spinand.h. Also, 2 bytes cmd phases are required when
operating in Octal DTR SPI mode.
Create new templates for dtr mode cmd, address, dummy and data phase
in spi_mem_op, which set the dtr field to 1 and also allow passing
the nbytes for the cmd phase.
Signed-off-by: Apurva Nandan <[email protected]>
---
include/linux/spi/spi-mem.h | 87 ++++++++++++++++++++++++++-----------
1 file changed, 61 insertions(+), 26 deletions(-)
diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h
index 85e2ff7b840d..73e52a3ecf66 100644
--- a/include/linux/spi/spi-mem.h
+++ b/include/linux/spi/spi-mem.h
@@ -13,46 +13,81 @@
#include <linux/spi/spi.h>
-#define SPI_MEM_OP_CMD(__opcode, __buswidth) \
- { \
- .buswidth = __buswidth, \
- .opcode = __opcode, \
- .nbytes = 1, \
+#define SPI_MEM_OP_CMD_ALL_ARGS(__nbytes, __opcode, __buswidth, __dtr) \
+ { \
+ .buswidth = __buswidth, \
+ .opcode = __opcode, \
+ .nbytes = __nbytes, \
+ .dtr = __dtr, \
}
-#define SPI_MEM_OP_ADDR(__nbytes, __val, __buswidth) \
- { \
- .nbytes = __nbytes, \
- .val = __val, \
- .buswidth = __buswidth, \
+#define SPI_MEM_OP_CMD(__opcode, __buswidth) \
+ SPI_MEM_OP_CMD_ALL_ARGS(1, __opcode, __buswidth, 0)
+
+#define SPI_MEM_OP_CMD_DTR(__nbytes, __opcode, __buswidth) \
+ SPI_MEM_OP_CMD_ALL_ARGS(__nbytes, __opcode, __buswidth, 1)
+
+#define SPI_MEM_OP_ADDR_ALL_ARGS(__nbytes, __val, __buswidth, __dtr) \
+ { \
+ .nbytes = __nbytes, \
+ .val = __val, \
+ .buswidth = __buswidth, \
+ .dtr = __dtr, \
}
+#define SPI_MEM_OP_ADDR(__nbytes, __val, __buswidth) \
+ SPI_MEM_OP_ADDR_ALL_ARGS(__nbytes, __val, __buswidth, 0)
+
+#define SPI_MEM_OP_ADDR_DTR(__nbytes, __val, __buswidth) \
+ SPI_MEM_OP_ADDR_ALL_ARGS(__nbytes, __val, __buswidth, 1)
+
#define SPI_MEM_OP_NO_ADDR { }
-#define SPI_MEM_OP_DUMMY(__nbytes, __buswidth) \
- { \
- .nbytes = __nbytes, \
- .buswidth = __buswidth, \
+#define SPI_MEM_OP_DUMMY_ALL_ARGS(__nbytes, __buswidth, __dtr) \
+ { \
+ .nbytes = __nbytes, \
+ .buswidth = __buswidth, \
+ .dtr = __dtr, \
}
+#define SPI_MEM_OP_DUMMY(__nbytes, __buswidth) \
+ SPI_MEM_OP_DUMMY_ALL_ARGS(__nbytes, __buswidth, 0)
+
+#define SPI_MEM_OP_DUMMY_DTR(__nbytes, __buswidth) \
+ SPI_MEM_OP_DUMMY_ALL_ARGS(__nbytes, __buswidth, 1)
+
#define SPI_MEM_OP_NO_DUMMY { }
-#define SPI_MEM_OP_DATA_IN(__nbytes, __buf, __buswidth) \
- { \
- .dir = SPI_MEM_DATA_IN, \
- .nbytes = __nbytes, \
- .buf.in = __buf, \
- .buswidth = __buswidth, \
+#define SPI_MEM_OP_DATA_IN_ALL_ARGS(__nbytes, __buf, __buswidth, __dtr) \
+ { \
+ .dir = SPI_MEM_DATA_IN, \
+ .nbytes = __nbytes, \
+ .buf.in = __buf, \
+ .buswidth = __buswidth, \
+ .dtr = __dtr, \
}
-#define SPI_MEM_OP_DATA_OUT(__nbytes, __buf, __buswidth) \
- { \
- .dir = SPI_MEM_DATA_OUT, \
- .nbytes = __nbytes, \
- .buf.out = __buf, \
- .buswidth = __buswidth, \
+#define SPI_MEM_OP_DATA_IN(__nbytes, __buf, __buswidth) \
+ SPI_MEM_OP_DATA_IN_ALL_ARGS(__nbytes, __buf, __buswidth, 0)
+
+#define SPI_MEM_OP_DATA_IN_DTR(__nbytes, __buf, __buswidth) \
+ SPI_MEM_OP_DATA_IN_ALL_ARGS(__nbytes, __buf, __buswidth, 1)
+
+#define SPI_MEM_OP_DATA_OUT_ALL_ARGS(__nbytes, __buf, __buswidth, __dtr)\
+ { \
+ .dir = SPI_MEM_DATA_OUT, \
+ .nbytes = __nbytes, \
+ .buf.out = __buf, \
+ .buswidth = __buswidth, \
+ .dtr = __dtr, \
}
+#define SPI_MEM_OP_DATA_OUT(__nbytes, __buf, __buswidth) \
+ SPI_MEM_OP_DATA_OUT_ALL_ARGS(__nbytes, __buf, __buswidth, 0)
+
+#define SPI_MEM_OP_DATA_OUT_DTR(__nbytes, __buf, __buswidth) \
+ SPI_MEM_OP_DATA_OUT_ALL_ARGS(__nbytes, __buf, __buswidth, 1)
+
#define SPI_MEM_OP_NO_DATA { }
/**
--
2.17.1
On Tue, Jul 13, 2021 at 01:05:26PM +0000, Apurva Nandan wrote:
> Setting dtr field of spi_mem_op is useful when creating templates
> for DTR ops in spinand.h. Also, 2 bytes cmd phases are required when
> operating in Octal DTR SPI mode.
Acked-by: Mark Brown <[email protected]>
On Tue, 13 Jul 2021 13:05:26 +0000
Apurva Nandan <[email protected]> wrote:
> Setting dtr field of spi_mem_op is useful when creating templates
> for DTR ops in spinand.h. Also, 2 bytes cmd phases are required when
> operating in Octal DTR SPI mode.
>
> Create new templates for dtr mode cmd, address, dummy and data phase
> in spi_mem_op, which set the dtr field to 1 and also allow passing
> the nbytes for the cmd phase.
>
> Signed-off-by: Apurva Nandan <[email protected]>
> ---
> include/linux/spi/spi-mem.h | 87 ++++++++++++++++++++++++++-----------
> 1 file changed, 61 insertions(+), 26 deletions(-)
>
> diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h
> index 85e2ff7b840d..73e52a3ecf66 100644
> --- a/include/linux/spi/spi-mem.h
> +++ b/include/linux/spi/spi-mem.h
> @@ -13,46 +13,81 @@
>
> #include <linux/spi/spi.h>
>
> -#define SPI_MEM_OP_CMD(__opcode, __buswidth) \
> - { \
> - .buswidth = __buswidth, \
> - .opcode = __opcode, \
> - .nbytes = 1, \
> +#define SPI_MEM_OP_CMD_ALL_ARGS(__nbytes, __opcode, __buswidth, __dtr) \
> + { \
> + .buswidth = __buswidth, \
> + .opcode = __opcode, \
> + .nbytes = __nbytes, \
> + .dtr = __dtr, \
> }
>
> -#define SPI_MEM_OP_ADDR(__nbytes, __val, __buswidth) \
> - { \
> - .nbytes = __nbytes, \
> - .val = __val, \
> - .buswidth = __buswidth, \
> +#define SPI_MEM_OP_CMD(__opcode, __buswidth) \
> + SPI_MEM_OP_CMD_ALL_ARGS(1, __opcode, __buswidth, 0)
> +
> +#define SPI_MEM_OP_CMD_DTR(__nbytes, __opcode, __buswidth) \
> + SPI_MEM_OP_CMD_ALL_ARGS(__nbytes, __opcode, __buswidth, 1)
I don't see the benefit of those ALL_ARGS() macros compared to the
definition of the _DTR() variants using raw struct initializers, but if
you think we will add more optional args and really care about saving a
few lines of code, maybe it'd be better to have something like:
#define SPI_MEM_OP_DTR .dtr = true
#define SPI_MEM_OP_CMD_BYTES(val) .nbytes = val
#define SPI_MEM_OP_EXT_CMD(__opcode, __buswidth, ...) \
{ \
.buswidth = __buswidth, \
.opcode = __opcode, \
__VA_ARGS__, \
}
#define SPI_MEM_OP_CMD(__opcode, __buswidth) \
SPI_MEM_OP_EXT_CMD(__opcode, __buswidth, \
SPI_MEM_OP_CMD_BYTES(1))
#define SPI_MEM_OP_CMD_DTR(__nbytes, __opcode, __buswidth) \
SPI_MEM_OP_EXT_CMD(__opcode, __buswidth, \
SPI_MEM_OP_CMD_BYTES(__nbytes), \
SPI_MEM_OP_DTR)
so you don't have to patch all users every time you add an argument.