Skip to contentSkip to conversation

spi: spi-mem: Add SPI_MEM_NO_DATA to the spi_mem_data_dir enum

PATCH New Tudor.Ambarus at microchip.com 2 participants 2 messages Mar 20, 2020 – Apr 3, 2020 SPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi: spi-mem: Add SPI_MEM_NO_DATA to the spi_mem_data_dir enum

From: Tudor Ambarus <[email protected]>

Commit: 0ebb261a0b2d ("spi: spi-mem: Add SPI_MEM_NO_DATA to the spi_mem_data_dir enum") in linux.

When defining spi_mem_op templates we don't necessarily know the size that will be passed when the template is actually used, and basing the supports_op() check on op->data.nbytes to know whether there will be data transferred for a specific operation is not possible.

Add SPI_MEM_NO_DATA to the spi_mem_data_dir enum so that we can base our checks on op->data.dir instead of op->data.nbytes.

This also fixes a bug identified with the atmel-quaspi driver. The spi-nor core, when erasing sectors, fills the spi_mem_op template using SPI_MEM_OP_NO_DATA, which initializes all the data members with value zero. This is wrong because data.dir is treated as SPI_MEM_DATA_IN, which translates in our driver to read accesses for erases (RICR), while the controller expects write accesses (WICR).

---
 drivers/spi/spi-mem.c | 2 +-
 include/spi-mem.h     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/spi/spi-mem.c +1 -1
index e900c997bd7f..ffbe20c5b1e6 100644
@@ -153,7 +153,7 @@ bool spi_mem_default_supports_op(struct spi_slave *slave,
 	    spi_check_buswidth_req(slave, op->dummy.buswidth, true))
 		return false;
 
-	if (op->data.nbytes &&
+	if (op->data.dir != SPI_MEM_NO_DATA &&
 	    spi_check_buswidth_req(slave, op->data.buswidth,
 				   op->data.dir == SPI_MEM_DATA_OUT))
 		return false;
include/spi-mem.h +2 -0
index 36814efa8613..893f7bd73370 100644
@@ -60,10 +60,12 @@
 /**
  * enum spi_mem_data_dir - describes the direction of a SPI memory data
  *			   transfer from the controller perspective
+ * @SPI_MEM_NO_DATA: no data transferred
  * @SPI_MEM_DATA_IN: data coming from the SPI memory
  * @SPI_MEM_DATA_OUT: data sent the SPI memory
  */
 enum spi_mem_data_dir {
+	SPI_MEM_NO_DATA,
 	SPI_MEM_DATA_IN,
 	SPI_MEM_DATA_OUT,
 };
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 spi: spi-mem: Add SPI_MEM_NO_DATA to the spi_mem_data_dir enum

Quoted 21 lines · On Fri, Mar 20, 2020 at 3:05 PM <[email protected]> wrote:

From: Tudor Ambarus <[email protected]>

Commit: 0ebb261a0b2d ("spi: spi-mem: Add SPI_MEM_NO_DATA to the spi_mem_data_dir enum") in linux.

When defining spi_mem_op templates we don't necessarily know the size that will be passed when the template is actually used, and basing the supports_op() check on op->data.nbytes to know whether there will be data transferred for a specific operation is not possible.

Add SPI_MEM_NO_DATA to the spi_mem_data_dir enum so that we can base our checks on op->data.dir instead of op->data.nbytes.

This also fixes a bug identified with the atmel-quaspi driver. The spi-nor core, when erasing sectors, fills the spi_mem_op template using SPI_MEM_OP_NO_DATA, which initializes all the data members with value zero. This is wrong because data.dir is treated as SPI_MEM_DATA_IN, which translates in our driver to read accesses for erases (RICR), while the controller expects write accesses (WICR).

Quoted 2 lines

---