From: Greg Kroah-Hartman Date: Fri, 8 May 2020 13:44:16 +0000 (+0200) Subject: drop queue-4.4/mtd-nand-pxa3xx_nand-fix-dmaengine-initialization.patch queue-4.4... X-Git-Tag: v4.4.223~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b0dc78b2b13a48d59b6eb557e26d64adfa86b3f;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.4/mtd-nand-pxa3xx_nand-fix-dmaengine-initialization.patch queue-4.4/spi-rockchip-modify-dma-max-burst-to-1.patch --- diff --git a/queue-4.4/mtd-nand-pxa3xx_nand-fix-dmaengine-initialization.patch b/queue-4.4/mtd-nand-pxa3xx_nand-fix-dmaengine-initialization.patch deleted file mode 100644 index 5d32ece82aa..00000000000 --- a/queue-4.4/mtd-nand-pxa3xx_nand-fix-dmaengine-initialization.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9097103f06332d099c5ab06d1e7f22f4bcaca6e2 Mon Sep 17 00:00:00 2001 -From: Robert Jarzmik -Date: Fri, 12 Feb 2016 23:29:04 +0100 -Subject: mtd: nand: pxa3xx_nand: fix dmaengine initialization - -From: Robert Jarzmik - -commit 9097103f06332d099c5ab06d1e7f22f4bcaca6e2 upstream. - -When the driver is initialized in a pure device-tree platform, the -driver's probe fails allocating the dma channel : -[ 525.624435] pxa3xx-nand 43100000.nand: no resource defined for data DMA -[ 525.632088] pxa3xx-nand 43100000.nand: alloc nand resource failed - -The reason is that the DMA IO resource is not acquired through platform -resources but by OF bindings. - -Fix this by ensuring that DMA IO resources are only queried in the non -device-tree case. - -Fixes: 8f5ba31aa565 ("mtd: nand: pxa3xx-nand: switch to dmaengine") -Signed-off-by: Robert Jarzmik -Acked-by: Ezequiel Garcia -Signed-off-by: Brian Norris -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/mtd/nand/pxa3xx_nand.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/mtd/nand/pxa3xx_nand.c -+++ b/drivers/mtd/nand/pxa3xx_nand.c -@@ -1750,7 +1750,7 @@ static int alloc_nand_resource(struct pl - if (ret < 0) - return ret; - -- if (use_dma) { -+ if (!np && use_dma) { - r = platform_get_resource(pdev, IORESOURCE_DMA, 0); - if (r == NULL) { - dev_err(&pdev->dev, diff --git a/queue-4.4/series b/queue-4.4/series index 1d18a46facb..dd693c4b611 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -130,7 +130,6 @@ mac80211-fix-bw-upgrade-for-tdls-peers.patch nfs-fix-an-lock-open-race-when-unlinking-an-open-file.patch net-get-rid-of-an-signed-integer-overflow-in-ip_idents_reserve.patch mtd-nand-denali-add-missing-nand_release-call-in-denali_remove.patch -mtd-nand-pxa3xx_nand-fix-dmaengine-initialization.patch asoc-intel-pass-correct-parameter-in-sst_alloc_stream_mrfld.patch asoc-tegra_alc5632-check-return-value.patch asoc-fsl_ssi-mark-sacnt-register-volatile.patch @@ -245,7 +244,6 @@ gfs2-fix-flock-panic-issue.patch blk-mq-fix-undefined-behaviour-in-order_to_size.patch dm-fix-second-blk_delay_queue-parameter-to-be-in-msec-units-not-jiffies.patch dmaengine-edma-add-probe-callback-to-edma_tptc_driver.patch -spi-rockchip-modify-dma-max-burst-to-1.patch openvswitch-update-checksum-in-push-pop-_mpls.patch cxgb4-cxgb4vf-fixes-regression-in-perf-when-tx-vlan-offload-is-disabled.patch net-bcmgenet-fix-skb_len-in-bcmgenet_xmit_single.patch diff --git a/queue-4.4/spi-rockchip-modify-dma-max-burst-to-1.patch b/queue-4.4/spi-rockchip-modify-dma-max-burst-to-1.patch deleted file mode 100644 index ac10cdf2240..00000000000 --- a/queue-4.4/spi-rockchip-modify-dma-max-burst-to-1.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 80abf8880cc6e1594c11b7c417f22dde60e25312 Mon Sep 17 00:00:00 2001 -From: Addy Ke -Date: Fri, 22 Jan 2016 19:06:52 +0800 -Subject: spi: rockchip: modify DMA max burst to 1 - -From: Addy Ke - -commit 80abf8880cc6e1594c11b7c417f22dde60e25312 upstream. - -Generic dma controller on Rockchips' platform cannot support -DMAFLUSHP instruction which make dma to flush the req of non-aligned -or non-multiple of what we need. That will cause an unrecoverable -dma bus error. The saftest way is to set dma max burst to 1. - -Signed-off-by: Addy ke -Fixes: 64e36824b32b06 ("spi/rockchip: add driver for Rockchip...") -Signed-off-by: Shawn Lin -cc: Heiko Stuebner -cc: Olof Johansson -cc: Doug Anderson -cc: Sonny Rao -Signed-off-by: Greg Kroah-Hartman - -Acked-by: Mark Brown -Signed-off-by: Caesar Wang -Signed-off-by: Vinod Koul - ---- - drivers/spi/spi-rockchip.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - ---- a/drivers/spi/spi-rockchip.c -+++ b/drivers/spi/spi-rockchip.c -@@ -199,6 +199,7 @@ struct rockchip_spi { - struct sg_table rx_sg; - struct rockchip_spi_dma_data dma_rx; - struct rockchip_spi_dma_data dma_tx; -+ struct dma_slave_caps dma_caps; - }; - - static inline void spi_enable_chip(struct rockchip_spi *rs, int enable) -@@ -457,7 +458,10 @@ static void rockchip_spi_prepare_dma(str - rxconf.direction = rs->dma_rx.direction; - rxconf.src_addr = rs->dma_rx.addr; - rxconf.src_addr_width = rs->n_bytes; -- rxconf.src_maxburst = rs->n_bytes; -+ if (rs->dma_caps.max_burst > 4) -+ rxconf.src_maxburst = 4; -+ else -+ rxconf.src_maxburst = 1; - dmaengine_slave_config(rs->dma_rx.ch, &rxconf); - - rxdesc = dmaengine_prep_slave_sg( -@@ -474,7 +478,10 @@ static void rockchip_spi_prepare_dma(str - txconf.direction = rs->dma_tx.direction; - txconf.dst_addr = rs->dma_tx.addr; - txconf.dst_addr_width = rs->n_bytes; -- txconf.dst_maxburst = rs->n_bytes; -+ if (rs->dma_caps.max_burst > 4) -+ txconf.dst_maxburst = 4; -+ else -+ txconf.dst_maxburst = 1; - dmaengine_slave_config(rs->dma_tx.ch, &txconf); - - txdesc = dmaengine_prep_slave_sg( -@@ -738,6 +745,7 @@ static int rockchip_spi_probe(struct pla - } - - if (rs->dma_tx.ch && rs->dma_rx.ch) { -+ dma_get_slave_caps(rs->dma_rx.ch, &(rs->dma_caps)); - rs->dma_tx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_TXDR); - rs->dma_rx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_RXDR); - rs->dma_tx.direction = DMA_MEM_TO_DEV;