Commit 0550c65c authored by Gerhard Bertelsmann's avatar Gerhard Bertelsmann Committed by Thadeu Lima de Souza Cascardo

can: sun4i: handle overrun in RX FIFO

BugLink: http://bugs.launchpad.net/bugs/1732698

commit 4dcf924c upstream.

SUN4Is CAN IP has a 64 byte deep FIFO buffer. If the buffer is not
drained fast enough (overrun) it's getting mangled. Already received
frames are dropped - the data can't be restored.
Signed-off-by: default avatarGerhard Bertelsmann <info@gerhard-bertelsmann.de>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@canonical.com>
parent 24c08da1
...@@ -539,6 +539,13 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) ...@@ -539,6 +539,13 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)
} }
stats->rx_over_errors++; stats->rx_over_errors++;
stats->rx_errors++; stats->rx_errors++;
/* reset the CAN IP by entering reset mode
* ignoring timeout error
*/
set_reset_mode(dev);
set_normal_mode(dev);
/* clear bit */ /* clear bit */
sun4i_can_write_cmdreg(priv, SUN4I_CMD_CLEAR_OR_FLAG); sun4i_can_write_cmdreg(priv, SUN4I_CMD_CLEAR_OR_FLAG);
} }
...@@ -653,8 +660,9 @@ static irqreturn_t sun4i_can_interrupt(int irq, void *dev_id) ...@@ -653,8 +660,9 @@ static irqreturn_t sun4i_can_interrupt(int irq, void *dev_id)
netif_wake_queue(dev); netif_wake_queue(dev);
can_led_event(dev, CAN_LED_EVENT_TX); can_led_event(dev, CAN_LED_EVENT_TX);
} }
if (isrc & SUN4I_INT_RBUF_VLD) { if ((isrc & SUN4I_INT_RBUF_VLD) &&
/* receive interrupt */ !(isrc & SUN4I_INT_DATA_OR)) {
/* receive interrupt - don't read if overrun occurred */
while (status & SUN4I_STA_RBUF_RDY) { while (status & SUN4I_STA_RBUF_RDY) {
/* RX buffer is not empty */ /* RX buffer is not empty */
sun4i_can_rx(dev); sun4i_can_rx(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment