From 693c017637468acbda5bf427803846f8a87771c0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 11 Oct 2013 10:21:20 -0700 Subject: [PATCH] delete can-flexcan-fix-flexcan_chip_start-on-imx6.patch --- ...excan-fix-flexcan_chip_start-on-imx6.patch | 54 ------------------- queue-3.10/series | 1 - ...excan-fix-flexcan_chip_start-on-imx6.patch | 54 ------------------- queue-3.11/series | 1 - ...excan-fix-flexcan_chip_start-on-imx6.patch | 54 ------------------- queue-3.4/series | 1 - 6 files changed, 165 deletions(-) delete mode 100644 queue-3.10/can-flexcan-fix-flexcan_chip_start-on-imx6.patch delete mode 100644 queue-3.11/can-flexcan-fix-flexcan_chip_start-on-imx6.patch delete mode 100644 queue-3.4/can-flexcan-fix-flexcan_chip_start-on-imx6.patch diff --git a/queue-3.10/can-flexcan-fix-flexcan_chip_start-on-imx6.patch b/queue-3.10/can-flexcan-fix-flexcan_chip_start-on-imx6.patch deleted file mode 100644 index 4e5850f77db..00000000000 --- a/queue-3.10/can-flexcan-fix-flexcan_chip_start-on-imx6.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0d1862ea1a5bb876cf05555a7307080cb75bf379 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Fri, 27 Sep 2013 12:15:05 +0200 -Subject: can: flexcan: fix flexcan_chip_start() on imx6 - -From: Marc Kleine-Budde - -commit 0d1862ea1a5bb876cf05555a7307080cb75bf379 upstream. - -In the flexcan_chip_start() function first the flexcan core is going through -the soft reset sequence, then the RX FIFO is enabled. - -With the hardware is put into FIFO mode, message buffers 1...7 are reserved by -the FIFO engine. The remaining message buffers are in reset default values. -This patch removes the bogus initialization of the message buffers, as it -causes an imprecise external abort on imx6. - -Reported-by: Lothar Waßmann -Tested-by: Lothar Waßmann -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/can/flexcan.c | 12 ------------ - 1 file changed, 12 deletions(-) - ---- a/drivers/net/can/flexcan.c -+++ b/drivers/net/can/flexcan.c -@@ -711,7 +711,6 @@ static int flexcan_chip_start(struct net - { - struct flexcan_priv *priv = netdev_priv(dev); - struct flexcan_regs __iomem *regs = priv->base; -- unsigned int i; - int err; - u32 reg_mcr, reg_ctrl; - -@@ -781,17 +780,6 @@ static int flexcan_chip_start(struct net - netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl); - flexcan_write(reg_ctrl, ®s->ctrl); - -- for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) { -- flexcan_write(0, ®s->cantxfg[i].can_ctrl); -- flexcan_write(0, ®s->cantxfg[i].can_id); -- flexcan_write(0, ®s->cantxfg[i].data[0]); -- flexcan_write(0, ®s->cantxfg[i].data[1]); -- -- /* put MB into rx queue */ -- flexcan_write(FLEXCAN_MB_CNT_CODE(0x4), -- ®s->cantxfg[i].can_ctrl); -- } -- - /* acceptance mask/acceptance code (accept everything) */ - flexcan_write(0x0, ®s->rxgmask); - flexcan_write(0x0, ®s->rx14mask); diff --git a/queue-3.10/series b/queue-3.10/series index b06412f2306..b99eb37fc42 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -90,7 +90,6 @@ mm-avoid-reinserting-isolated-balloon-pages-into-lru-lists.patch iscsi-target-only-perform-wait_for_tasks-when-performing-shutdown.patch net-update-the-sysctl-permissions-handler-to-test-effective-uid-gid.patch irq-force-hardirq-exit-s-softirq-processing-on-its-own-stack.patch -can-flexcan-fix-flexcan_chip_start-on-imx6.patch revert-drm-radeon-add-missing-hdmi-callbacks-for-rv6xx.patch dmaengine-imx-dma-fix-lockdep-issue-between-irqhandler-and-tasklet.patch dmaengine-imx-dma-fix-callback-path-in-tasklet.patch diff --git a/queue-3.11/can-flexcan-fix-flexcan_chip_start-on-imx6.patch b/queue-3.11/can-flexcan-fix-flexcan_chip_start-on-imx6.patch deleted file mode 100644 index 254fcd926e8..00000000000 --- a/queue-3.11/can-flexcan-fix-flexcan_chip_start-on-imx6.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0d1862ea1a5bb876cf05555a7307080cb75bf379 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Fri, 27 Sep 2013 12:15:05 +0200 -Subject: can: flexcan: fix flexcan_chip_start() on imx6 - -From: Marc Kleine-Budde - -commit 0d1862ea1a5bb876cf05555a7307080cb75bf379 upstream. - -In the flexcan_chip_start() function first the flexcan core is going through -the soft reset sequence, then the RX FIFO is enabled. - -With the hardware is put into FIFO mode, message buffers 1...7 are reserved by -the FIFO engine. The remaining message buffers are in reset default values. -This patch removes the bogus initialization of the message buffers, as it -causes an imprecise external abort on imx6. - -Reported-by: Lothar Waßmann -Tested-by: Lothar Waßmann -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/can/flexcan.c | 12 ------------ - 1 file changed, 12 deletions(-) - ---- a/drivers/net/can/flexcan.c -+++ b/drivers/net/can/flexcan.c -@@ -702,7 +702,6 @@ static int flexcan_chip_start(struct net - { - struct flexcan_priv *priv = netdev_priv(dev); - struct flexcan_regs __iomem *regs = priv->base; -- unsigned int i; - int err; - u32 reg_mcr, reg_ctrl; - -@@ -772,17 +771,6 @@ static int flexcan_chip_start(struct net - netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl); - flexcan_write(reg_ctrl, ®s->ctrl); - -- for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) { -- flexcan_write(0, ®s->cantxfg[i].can_ctrl); -- flexcan_write(0, ®s->cantxfg[i].can_id); -- flexcan_write(0, ®s->cantxfg[i].data[0]); -- flexcan_write(0, ®s->cantxfg[i].data[1]); -- -- /* put MB into rx queue */ -- flexcan_write(FLEXCAN_MB_CNT_CODE(0x4), -- ®s->cantxfg[i].can_ctrl); -- } -- - /* acceptance mask/acceptance code (accept everything) */ - flexcan_write(0x0, ®s->rxgmask); - flexcan_write(0x0, ®s->rx14mask); diff --git a/queue-3.11/series b/queue-3.11/series index 0c1a4f7af4f..f146022ce80 100644 --- a/queue-3.11/series +++ b/queue-3.11/series @@ -109,7 +109,6 @@ mm-avoid-reinserting-isolated-balloon-pages-into-lru-lists.patch iscsi-target-only-perform-wait_for_tasks-when-performing-shutdown.patch net-update-the-sysctl-permissions-handler-to-test-effective-uid-gid.patch irq-force-hardirq-exit-s-softirq-processing-on-its-own-stack.patch -can-flexcan-fix-flexcan_chip_start-on-imx6.patch drm-radeon-fix-hdmi-callbacks-for-rv6xx-incorrectly-added-to-r520.patch dmaengine-imx-dma-fix-lockdep-issue-between-irqhandler-and-tasklet.patch dmaengine-imx-dma-fix-callback-path-in-tasklet.patch diff --git a/queue-3.4/can-flexcan-fix-flexcan_chip_start-on-imx6.patch b/queue-3.4/can-flexcan-fix-flexcan_chip_start-on-imx6.patch deleted file mode 100644 index 4a99563b0a5..00000000000 --- a/queue-3.4/can-flexcan-fix-flexcan_chip_start-on-imx6.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0d1862ea1a5bb876cf05555a7307080cb75bf379 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Fri, 27 Sep 2013 12:15:05 +0200 -Subject: can: flexcan: fix flexcan_chip_start() on imx6 - -From: Marc Kleine-Budde - -commit 0d1862ea1a5bb876cf05555a7307080cb75bf379 upstream. - -In the flexcan_chip_start() function first the flexcan core is going through -the soft reset sequence, then the RX FIFO is enabled. - -With the hardware is put into FIFO mode, message buffers 1...7 are reserved by -the FIFO engine. The remaining message buffers are in reset default values. -This patch removes the bogus initialization of the message buffers, as it -causes an imprecise external abort on imx6. - -Reported-by: Lothar Waßmann -Tested-by: Lothar Waßmann -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/can/flexcan.c | 12 ------------ - 1 file changed, 12 deletions(-) - ---- a/drivers/net/can/flexcan.c -+++ b/drivers/net/can/flexcan.c -@@ -667,7 +667,6 @@ static int flexcan_chip_start(struct net - { - struct flexcan_priv *priv = netdev_priv(dev); - struct flexcan_regs __iomem *regs = priv->base; -- unsigned int i; - int err; - u32 reg_mcr, reg_ctrl; - -@@ -733,17 +732,6 @@ static int flexcan_chip_start(struct net - netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl); - flexcan_write(reg_ctrl, ®s->ctrl); - -- for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) { -- flexcan_write(0, ®s->cantxfg[i].can_ctrl); -- flexcan_write(0, ®s->cantxfg[i].can_id); -- flexcan_write(0, ®s->cantxfg[i].data[0]); -- flexcan_write(0, ®s->cantxfg[i].data[1]); -- -- /* put MB into rx queue */ -- flexcan_write(FLEXCAN_MB_CNT_CODE(0x4), -- ®s->cantxfg[i].can_ctrl); -- } -- - /* acceptance mask/acceptance code (accept everything) */ - flexcan_write(0x0, ®s->rxgmask); - flexcan_write(0x0, ®s->rx14mask); diff --git a/queue-3.4/series b/queue-3.4/series index 09b434e73d2..e4994e01ed8 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -37,7 +37,6 @@ ib_srpt-destroy-cm_id-before-destroying-qp.patch ib_srpt-always-set-response-for-task-management.patch rtlwifi-align-private-space-in-rtl_priv-struct.patch p54usb-add-usb-id-for-corega-wlusb2gtst-usb-adapter.patch -can-flexcan-fix-flexcan_chip_start-on-imx6.patch dmaengine-imx-dma-fix-lockdep-issue-between-irqhandler-and-tasklet.patch dmaengine-imx-dma-fix-callback-path-in-tasklet.patch dmaengine-imx-dma-fix-slow-path-issue-in-prep_dma_cyclic.patch -- 2.47.3