diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2013-10-28 09:54:40 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-01-03 04:33:16 +0000 |
| commit | e8edf57cb72b8d90d495ad78306daf9c9763ea5c (patch) | |
| tree | 2da2ae50384d14c3bb68a72b7c5331f4ac5e481d /drivers/net/can | |
| parent | 224a07b498254bf980d8c797064e00ec950e56ef (diff) | |
| download | kernel_samsung_smdk4412-e8edf57cb72b8d90d495ad78306daf9c9763ea5c.zip kernel_samsung_smdk4412-e8edf57cb72b8d90d495ad78306daf9c9763ea5c.tar.gz kernel_samsung_smdk4412-e8edf57cb72b8d90d495ad78306daf9c9763ea5c.tar.bz2 | |
can: c_can: Fix RX message handling, handle lost message before EOB
commit 5d0f801a2ccec3b1fdabc3392c8d99ed0413d216 upstream.
If we handle end of block messages with higher priority than a lost message,
we can run into an endless interrupt loop.
This is reproducable with a am335x processor and "cansequence -r" at 1Mbit.
As soon as we loose a packet we can't escape from an interrupt loop.
This patch fixes the problem by handling lost packets before EOB packets.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/c_can/c_can.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index 64647d4..91d1b5a 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c @@ -764,9 +764,6 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota) msg_ctrl_save = priv->read_reg(priv, &priv->regs->ifregs[0].msg_cntrl); - if (msg_ctrl_save & IF_MCONT_EOB) - return num_rx_pkts; - if (msg_ctrl_save & IF_MCONT_MSGLST) { c_can_handle_lost_msg_obj(dev, 0, msg_obj); num_rx_pkts++; @@ -774,6 +771,9 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota) continue; } + if (msg_ctrl_save & IF_MCONT_EOB) + return num_rx_pkts; + if (!(msg_ctrl_save & IF_MCONT_NEWDAT)) continue; |