diff mbox series

[v1] mtd: rawnand: meson: fix unaligned DMA buffers handling

Message ID 20230615080815.3291006-1-AVKrasnov@sberdevices.ru
State New
Headers
Series [v1] mtd: rawnand: meson: fix unaligned DMA buffers handling |

Commit Message

Arseniy Krasnov June 15, 2023, 8:08 a.m. UTC 
  Meson NAND controller requires 8 bytes alignment for DMA addresses,
otherwise it "aligns" passed address by itself thus accessing invalid
location in the provided buffer. This patch makes unaligned buffers to
be reallocated to become valid.

Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
Cc: <Stable@vger.kernel.org>
Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
---
 drivers/mtd/nand/raw/meson_nand.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Miquel Raynal June 19, 2023, 8:39 a.m. UTC | #1 
On Thu, 2023-06-15 at 08:08:15 UTC, Arseniy Krasnov wrote:
> Meson NAND controller requires 8 bytes alignment for DMA addresses,
> otherwise it "aligns" passed address by itself thus accessing invalid
> location in the provided buffer. This patch makes unaligned buffers to
> be reallocated to become valid.
> 
> Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
> Cc: <Stable@vger.kernel.org>
> Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.

Miquel
diff mbox series

Patch

diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index c5628f7ac3b1..aa2b64dde74b 100644
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -77,6 +77,7 @@ 
 #define GENCMDIADDRH(aih, addr)		((aih) | (((addr) >> 16) & 0xffff))
 
 #define DMA_DIR(dir)		((dir) ? NFC_CMD_N2M : NFC_CMD_M2N)
+#define DMA_ADDR_ALIGN		8
 
 #define ECC_CHECK_RETURN_FF	(-1)
 
@@ -1001,6 +1002,9 @@  static int meson_nfc_read_page_hwecc(struct nand_chip *nand, u8 *buf,
 
 static bool meson_nfc_is_buffer_dma_safe(const void *buffer)
 {
+	if ((uintptr_t)buffer % DMA_ADDR_ALIGN)
+		return false;
+
 	if (virt_addr_valid(buffer) && (!object_is_on_stack(buffer)))
 		return true;
 	return false;