c6311fc4bb13f5f25d2e510fcd87cfd36af5a9c9
[openwrt/openwrt.git] / target / linux / layerscape / patches-4.4 / 1112-driver-spi-fsl-quad-Hang-memcpy-Unhandled-fault-alig.patch
1 From f1b7824a42505669476f203e126fc26dd1006af2 Mon Sep 17 00:00:00 2001
2 From: Yutang Jiang <yutang.jiang@nxp.com>
3 Date: Fri, 9 Sep 2016 22:57:55 +0800
4 Subject: [PATCH 112/113] driver: spi: fsl-quad: Hang memcpy: Unhandled fault:
5 alignment fault
6
7 vmap/iomap based on whether the buffer is in memory region or reserved region.
8 However, both map it as non-cacheable memory.
9 For armv8 specifically, non-cacheable mapping requests use a memory type
10 that has to be accessed aligned to the request size. memcpy() doesn't guarantee
11 that. memcpy_toio() can guarantee 4-bytes alignment.
12
13 Signed-off-by: Yunhui Cui <yunhui.cui@nxp.com>
14 Integrated-by: Yutang Jiang <yutang.jiang@nxp.com>
15 ---
16 drivers/mtd/spi-nor/fsl-quadspi.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 --- a/drivers/mtd/spi-nor/fsl-quadspi.c
20 +++ b/drivers/mtd/spi-nor/fsl-quadspi.c
21 @@ -1103,7 +1103,7 @@ static ssize_t fsl_qspi_read(struct spi_
22 len);
23
24 /* Read out the data directly from the AHB buffer.*/
25 - memcpy(buf, q->ahb_addr + q->chip_base_addr + from - q->memmap_offs,
26 + memcpy_toio(buf, q->ahb_addr + q->chip_base_addr + from - q->memmap_offs,
27 len);
28
29 return len;