sf: ops: Add spi_flash_copy_mmap function

When doing a memory mapped copy we may have DMA available and thus need to have this copy abstracted so that the driver can do it, rather than a simple memcpy. Signed-off-by: Tom Rini <trini@ti.com> Signed-off-by: Vignesh R <vigneshr@ti.com> Reviewed-by: Jagan Teki <jteki@openedev.com>

sf: ops: Add spi_flash_copy_mmap function
When doing a memory mapped copy we may have DMA available and thus need to have this copy abstracted so that the driver can do it, rather than a simple memcpy. Signed-off-by: Tom Rini <trini@ti.com> Signed-off-by: Vignesh R <vigneshr@ti.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
Tom Rini · Jagan Teki
1 parent 5b3b0d687e
Showing 2 changed files with 10 additions and 1 deletions Side-by-side Diff
drivers/mtd/spi/sf_ops.c
include/spi.h
@@ -14,6 +14,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <watchdog.h>
+#include <linux/compiler.h>
  
 #include "sf_internal.h"
  
@@ -378,6 +379,11 @@
 	return ret;
 }
  
+void __weak spi_flash_copy_mmap(void *data, void *offset, size_t len)
+{
+	memcpy(data, offset, len);
+}
+
 int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
 		size_t len, void *data)
 {
@@ -394,7 +400,7 @@
 			return ret;
 		}
 		spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP);
-		memcpy(data, flash->memory_map + offset, len);
+		spi_flash_copy_mmap(data, flash->memory_map + offset, len);
 		spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP_END);
 		spi_release_bus(flash->spi);
 		return 0;
@@ -272,6 +272,9 @@
 int  spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
 		void *din, unsigned long flags);
  
+/* Copy memory mapped data */
+void spi_flash_copy_mmap(void *data, void *offset, size_t len);
+
 /**
  * Determine if a SPI chipselect is valid.
  * This function is provided by the board if the low-level SPI driver
...	...	@@ -14,6 +14,7 @@
14	14	#include <spi.h>
15	15	#include <spi_flash.h>
16	16	#include <watchdog.h>
	17	+#include <linux/compiler.h>
17	18
18	19	#include "sf_internal.h"
19	20
...	...	@@ -378,6 +379,11 @@
378	379	return ret;
379	380	}
380	381
	382	+void __weak spi_flash_copy_mmap(void data, void offset, size_t len)
	383	+{
	384	+ memcpy(data, offset, len);
	385	+}
	386	+
381	387	int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
382	388	size_t len, void *data)
383	389	{
...	...	@@ -394,7 +400,7 @@
394	400	return ret;
395	401	}
396	402	spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP);
397		- memcpy(data, flash->memory_map + offset, len);
	403	+ spi_flash_copy_mmap(data, flash->memory_map + offset, len);
398	404	spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP_END);
399	405	spi_release_bus(flash->spi);
400	406	return 0;
...	...	@@ -272,6 +272,9 @@
272	272	int spi_xfer(struct spi_slave slave, unsigned int bitlen, const void dout,
273	273	void *din, unsigned long flags);
274	274
	275	+/* Copy memory mapped data */
	276	+void spi_flash_copy_mmap(void data, void offset, size_t len);
	277	+
275	278	/**
276	279	* Determine if a SPI chipselect is valid.
277	280	* This function is provided by the board if the low-level SPI driver