pull-request: can 2013-09-30

pull-request: can 2013-09-30

[Marc Kleine-Budde]

Hello David,

here is a fix for the v3.12 release cycle. Lothar Waßmann reported a problem in
the flexcan driver that leads to an imprecise external abort on imx6. The patch
by me fixes the problem. It was tested by Lothar on imx53 and imx6.

regards,
Marc

---

The following changes since commit 9a3bab6b05383f1e4c3716b3615500c51285959e:

  net: net_secret should not depend on TCP (2013-09-28 15:19:40 -0700)

are available in the git repository at:

  git://gitorious.org/linux-can/linux-can.git fixes-for-3.12

for you to fetch changes up to 0d1862ea1a5bb876cf05555a7307080cb75bf379:

  can: flexcan: fix flexcan_chip_start() on imx6 (2013-09-30 13:49:09 +0200)

----------------------------------------------------------------
Marc Kleine-Budde (1):
      can: flexcan: fix flexcan_chip_start() on imx6

 drivers/net/can/flexcan.c | 12 ------------
 1 file changed, 12 deletions(-)

[PATCH] can: flexcan: fix flexcan_chip_start() on imx6

[Marc Kleine-Budde]

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.

Cc: linux-stable <stable@vger.kernel.org>
Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Tested-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/flexcan.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 71c677e..3f21142 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -702,7 +702,6 @@ static int flexcan_chip_start(struct net_device *dev)
 {
 	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_device *dev)
 	netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
 	flexcan_write(reg_ctrl, &regs->ctrl);
 
-	for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) {
-		flexcan_write(0, &regs->cantxfg[i].can_ctrl);
-		flexcan_write(0, &regs->cantxfg[i].can_id);
-		flexcan_write(0, &regs->cantxfg[i].data[0]);
-		flexcan_write(0, &regs->cantxfg[i].data[1]);
-
-		/* put MB into rx queue */
-		flexcan_write(FLEXCAN_MB_CNT_CODE(0x4),
-			&regs->cantxfg[i].can_ctrl);
-	}
-
 	/* acceptance mask/acceptance code (accept everything) */
 	flexcan_write(0x0, &regs->rxgmask);
 	flexcan_write(0x0, &regs->rx14mask);
-- 
1.8.4.rc3

Re: pull-request: can 2013-09-30

[David Miller]

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon, 30 Sep 2013 13:59:02 +0200

> here is a fix for the v3.12 release cycle. Lothar Waßmann reported a problem in
> the flexcan driver that leads to an imprecise external abort on imx6. The patch
> by me fixes the problem. It was tested by Lothar on imx53 and imx6.

Pulled, thanks Marc.