Commit a37b7245 authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Marc Kleine-Budde

can: rcar_can: do not report txerr and rxerr during bus-off

During bus off, the error count is greater than 255 and can not fit in
a u8.

Fixes: fd115931 ("can: add Renesas R-Car CAN driver")
Link: https://lore.kernel.org/all/20220719143550.3681-3-mailhol.vincent@wanadoo.frSigned-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 3a5c7e46
...@@ -232,11 +232,8 @@ static void rcar_can_error(struct net_device *ndev) ...@@ -232,11 +232,8 @@ static void rcar_can_error(struct net_device *ndev)
if (eifr & (RCAR_CAN_EIFR_EWIF | RCAR_CAN_EIFR_EPIF)) { if (eifr & (RCAR_CAN_EIFR_EWIF | RCAR_CAN_EIFR_EPIF)) {
txerr = readb(&priv->regs->tecr); txerr = readb(&priv->regs->tecr);
rxerr = readb(&priv->regs->recr); rxerr = readb(&priv->regs->recr);
if (skb) { if (skb)
cf->can_id |= CAN_ERR_CRTL; cf->can_id |= CAN_ERR_CRTL;
cf->data[6] = txerr;
cf->data[7] = rxerr;
}
} }
if (eifr & RCAR_CAN_EIFR_BEIF) { if (eifr & RCAR_CAN_EIFR_BEIF) {
int rx_errors = 0, tx_errors = 0; int rx_errors = 0, tx_errors = 0;
...@@ -336,6 +333,9 @@ static void rcar_can_error(struct net_device *ndev) ...@@ -336,6 +333,9 @@ static void rcar_can_error(struct net_device *ndev)
can_bus_off(ndev); can_bus_off(ndev);
if (skb) if (skb)
cf->can_id |= CAN_ERR_BUSOFF; cf->can_id |= CAN_ERR_BUSOFF;
} else if (skb) {
cf->data[6] = txerr;
cf->data[7] = rxerr;
} }
if (eifr & RCAR_CAN_EIFR_ORIF) { if (eifr & RCAR_CAN_EIFR_ORIF) {
netdev_dbg(priv->ndev, "Receive overrun error interrupt\n"); netdev_dbg(priv->ndev, "Receive overrun error interrupt\n");
......
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