diff options
| author | Bhupesh Sharma <bhupesh.sharma@freescale.com> | 2014-10-21 11:59:35 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:38:33 (GMT) |
| commit | 8d59c1de84c39806c6998cd289cab7becc4e53b1 (patch) | |
| tree | 71af2be296694938acace54c94ed2633be0e286d /drivers/net/can | |
| parent | d0dd36b7e7600c352ccfcc8281104b9f8c175c31 (diff) | |
| download | linux-fsl-qoriq-8d59c1de84c39806c6998cd289cab7becc4e53b1.tar.xz | |
can: flexcan: correctly initialize mailboxes
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>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Cherry-picked from linux-next: fc05b884a31dbf259cc73cc856e634ec3acbebb6
Change-Id: I0757258cb27cb2dec26e8afa219b512bba80be4b
Reviewed-on: http://git.am.freescale.net:8181/21848
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.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 6f1bcce..0e75f8c 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -868,6 +868,7 @@ static int flexcan_chip_start(struct net_device *dev) struct flexcan_regs __iomem *regs = priv->base; int err; u32 reg_mcr, reg_ctrl, reg_crl2, reg_mecr; + int i; /* enable module */ err = flexcan_chip_enable(priv); @@ -934,6 +935,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); |