can: pch_can: do not report txerr and rxerr during bus-off
authorVincent Mailhol <mailhol.vincent@wanadoo.fr>
Tue, 19 Jul 2022 14:35:39 +0000 (23:35 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Aug 2022 09:11:18 +0000 (11:11 +0200)
[ Upstream commit 3a5c7e4611ddcf0ef37a3a17296b964d986161a6 ]

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

Fixes: 0c78ab76a05c ("pch_can: Add setting TEC/REC statistics processing")
Link: https://lore.kernel.org/all/20220719143550.3681-2-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>
drivers/net/can/pch_can.c

index ced11ea8926984a312d876a99dab13a4ea3d328d..3e1d71c70b0d66488fceeb12c71302d73367d5e8 100644 (file)
@@ -507,6 +507,9 @@ static void pch_can_error(struct net_device *ndev, u32 status)
                cf->can_id |= CAN_ERR_BUSOFF;
                priv->can.can_stats.bus_off++;
                can_bus_off(ndev);
+       } else {
+               cf->data[6] = errc & PCH_TEC;
+               cf->data[7] = (errc & PCH_REC) >> 8;
        }
 
        errc = ioread32(&priv->regs->errc);
@@ -567,9 +570,6 @@ static void pch_can_error(struct net_device *ndev, u32 status)
                break;
        }
 
-       cf->data[6] = errc & PCH_TEC;
-       cf->data[7] = (errc & PCH_REC) >> 8;
-
        priv->can.state = state;
        netif_receive_skb(skb);