TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit a37b7245e8 ]

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

Fixes: fd1159318e ("can: add Renesas R-Car CAN driver")
Link: https://lore.kernel.org/all/20220719143550.3681-3-mailhol.vincent@wanadoo.fr
Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Vincent Mailhol
2022-07-19 23:35:40 +09:00
committed by Greg Kroah-Hartman
parent 5d85a89875
commit 6ec509679b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/can/rcar/rcar_can.c
+4 -4
View File
@@ -235,11 +235,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;
@@ -339,6 +336,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");