| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20220104163100.56850d0b@collabora.com>
Date: Tue, 4 Jan 2022 16:31:00 +0100
From: Boris Brezillon <boris.brezillon@...labora.com>
To: Apurva Nandan <a-nandan@...com>
Cc: Miquel Raynal <miquel.raynal@...tlin.com>,
Richard Weinberger <richard@....at>,
Vignesh Raghavendra <vigneshr@...com>,
Mark Brown <broonie@...nel.org>,
Patrice Chotard <patrice.chotard@...s.st.com>,
Christophe Kerello <christophe.kerello@...s.st.com>,
Daniel Palmer <daniel@...f.com>,
Alexander Lobakin <alobakin@...me>,
<linux-mtd@...ts.infradead.org>, <linux-kernel@...r.kernel.org>,
<linux-spi@...r.kernel.org>, <p.yadav@...com>
Subject: Re: [PATCH v3 01/17] spi: spi-mem: Add DTR templates for cmd,
address, dummy and data phase
On Sat, 1 Jan 2022 13:12:34 +0530
Apurva Nandan <a-nandan@...com> 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 <a-nandan@...com>
> ---
> include/linux/spi/spi-mem.h | 41 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 41 insertions(+)
>
> diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h
> index 85e2ff7b840d..682378a9c600 100644
> --- a/include/linux/spi/spi-mem.h
> +++ b/include/linux/spi/spi-mem.h
> @@ -20,6 +20,14 @@
> .nbytes = 1, \
> }
>
> +#define SPI_MEM_OP_CMD_DTR(__nbytes, __opcode, __buswidth) \
> + { \
> + .nbytes = __nbytes, \
> + .opcode = __opcode, \
> + .buswidth = __buswidth, \
> + .dtr = 1, \
> + }
> +
> #define SPI_MEM_OP_ADDR(__nbytes, __val, __buswidth) \
> { \
> .nbytes = __nbytes, \
> @@ -27,6 +35,14 @@
> .buswidth = __buswidth, \
> }
>
> +#define SPI_MEM_OP_ADDR_DTR(__nbytes, __val, __buswidth) \
> + { \
> + .nbytes = __nbytes, \
> + .val = __val, \
> + .buswidth = __buswidth, \
> + .dtr = 1, \
> + }
> +
> #define SPI_MEM_OP_NO_ADDR { }
>
> #define SPI_MEM_OP_DUMMY(__nbytes, __buswidth) \
> @@ -35,6 +51,13 @@
> .buswidth = __buswidth, \
> }
>
> +#define SPI_MEM_OP_DUMMY_DTR(__nbytes, __buswidth) \
> + { \
> + .nbytes = __nbytes, \
> + .buswidth = __buswidth, \
> + .dtr = 1, \
> + }
> +
> #define SPI_MEM_OP_NO_DUMMY { }
>
> #define SPI_MEM_OP_DATA_IN(__nbytes, __buf, __buswidth) \
> @@ -45,6 +68,15 @@
> .buswidth = __buswidth, \
> }
>
> +#define SPI_MEM_OP_DATA_IN_DTR(__nbytes, __buf, __buswidth) \
> + { \
> + .dir = SPI_MEM_DATA_IN, \
> + .nbytes = __nbytes, \
> + .buf.in = __buf, \
> + .buswidth = __buswidth, \
> + .dtr = 1, \
> + }
> +
> #define SPI_MEM_OP_DATA_OUT(__nbytes, __buf, __buswidth) \
> { \
> .dir = SPI_MEM_DATA_OUT, \
> @@ -53,6 +85,15 @@
> .buswidth = __buswidth, \
> }
>
> +#define SPI_MEM_OP_DATA_OUT_DTR(__nbytes, __buf, __buswidth) \
> + { \
> + .dir = SPI_MEM_DATA_OUT, \
> + .nbytes = __nbytes, \
> + .buf.out = __buf, \
> + .buswidth = __buswidth, \
> + .dtr = 1, \
> + }
> +
> #define SPI_MEM_OP_NO_DATA { }
>
> /**
How about:
diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h
index 85e2ff7b840d..9a8d42803026 100644
--- a/include/linux/spi/spi-mem.h
+++ b/include/linux/spi/spi-mem.h
@@ -13,44 +13,59 @@
#include <linux/spi/spi.h>
-#define SPI_MEM_OP_CMD(__opcode, __buswidth) \
+#define SPI_MEM_OP_DTR .dtr = 1
+
+#define SPI_MEM_OP_CMD(__opcode, __buswidth, ...) \
{ \
.buswidth = __buswidth, \
.opcode = __opcode, \
.nbytes = 1, \
+ __VA_ARGS__ \
}
-#define SPI_MEM_OP_ADDR(__nbytes, __val, __buswidth) \
+#define SPI_MEM_OP_EXT_CMD(__nbytes, __opcode, __buswidth, ...) \
+ { \
+ .buswidth = __buswidth, \
+ .opcode = __opcode, \
+ .nbytes = __nbytes, \
+ __VA_ARGS__ \
+ }
+
+#define SPI_MEM_OP_ADDR(__nbytes, __val, __buswidth, ...) \
{ \
.nbytes = __nbytes, \
.val = __val, \
.buswidth = __buswidth, \
+ __VA_ARGS__ \
}
#define SPI_MEM_OP_NO_ADDR { }
-#define SPI_MEM_OP_DUMMY(__nbytes, __buswidth) \
+#define SPI_MEM_OP_DUMMY(__nbytes, __buswidth, ...) \
{ \
.nbytes = __nbytes, \
.buswidth = __buswidth, \
+ __VA_ARGS__ \
}
#define SPI_MEM_OP_NO_DUMMY { }
-#define SPI_MEM_OP_DATA_IN(__nbytes, __buf, __buswidth) \
+#define SPI_MEM_OP_DATA_IN(__nbytes, __buf, __buswidth, ...) \
{ \
.dir = SPI_MEM_DATA_IN, \
.nbytes = __nbytes, \
.buf.in = __buf, \
.buswidth = __buswidth, \
+ __VA_ARGS__ \
}
-#define SPI_MEM_OP_DATA_OUT(__nbytes, __buf, __buswidth) \
+#define SPI_MEM_OP_DATA_OUT(__nbytes, __buf, __buswidth, ...) \
{ \
.dir = SPI_MEM_DATA_OUT, \
.nbytes = __nbytes, \
.buf.out = __buf, \
.buswidth = __buswidth, \
+ __VA_ARGS__ \
}
#define SPI_MEM_OP_NO_DATA { }
and you get to define a DTR op like that:
struct spi_mem_op op =
SPI_MEM_OP(SPI_MEM_OP_EXT_CMD(2, 0x1234, 8, SPI_MEM_OP_DTR),
SPI_MEM_OP_ADDR(4, 0xdeadbeef, 8, SPI_MEM_OP_DTR),
SPI_MEM_OP_DATA_OUT(128, buf, 8, SPI_MEM_OP_DTR));
This also means we can extend the struct without having to define new macros.
Powered by blists - more mailing lists