diff options
| author | David Jander <david@protonic.nl> | 2014-08-27 11:58:05 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-05 14:14:44 +0000 |
| commit | d4e9b1e7832c1825381a165e4cb2d35c4a5167df (patch) | |
| tree | 6624498cdc29465195c8d3919a47a5d4d6510b27 /drivers/net/can | |
| parent | ba69191491a2d19fb8e7ebcef754d0e0ccb0f145 (diff) | |
| download | linux-stable-d4e9b1e7832c1825381a165e4cb2d35c4a5167df.tar.gz linux-stable-d4e9b1e7832c1825381a165e4cb2d35c4a5167df.tar.bz2 linux-stable-d4e9b1e7832c1825381a165e4cb2d35c4a5167df.zip | |
can: flexcan: correctly initialize mailboxes
commit fc05b884a31dbf259cc73cc856e634ec3acbebb6 upstream.
Apparently mailboxes may contain random data at startup, causing some of them
being prepared for message reception. This causes overruns being missed or even
confusing the IRQ check for trasmitted messages, increasing the transmit
counter instead of the error counter.
This patch initializes all mailboxes after the FIFO as RX_INACTIVE.
Signed-off-by: David Jander <david@protonic.nl>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/flexcan.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index f846bf63e347..0e06098ca05d 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -805,6 +805,7 @@ static int flexcan_chip_start(struct net_device *dev) struct flexcan_regs __iomem *regs = priv->base; int err; u32 reg_mcr, reg_ctrl; + int i; /* enable module */ err = flexcan_chip_enable(priv); @@ -869,6 +870,12 @@ static int flexcan_chip_start(struct net_device *dev) netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl); flexcan_write(reg_ctrl, ®s->ctrl); + /* clear and invalidate all mailboxes first */ + for (i = FLEXCAN_TX_BUF_ID; i < ARRAY_SIZE(regs->cantxfg); i++) { + flexcan_write(FLEXCAN_MB_CODE_RX_INACTIVE, + ®s->cantxfg[i].can_ctrl); + } + /* mark TX mailbox as INACTIVE */ flexcan_write(FLEXCAN_MB_CODE_TX_INACTIVE, ®s->cantxfg[FLEXCAN_TX_BUF_ID].can_ctrl); |