can: flexcan: fix flexcan_chip_start() on imx6 (0d1862ea) · Commits · 戴 / test

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -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);

Admin message