lkml.org 
[lkml]   [2022]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 080/229] can: rcar_can: do not report txerr and rxerr during bus-off
    Date
    From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>

    [ Upstream commit a37b7245e831a641df360ca41db6a71c023d3746 ]

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

    Fixes: fd1159318e55 ("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>
    ---
    drivers/net/can/rcar/rcar_can.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
    index 963da8eda168..0156c18d5a2d 100644
    --- a/drivers/net/can/rcar/rcar_can.c
    +++ b/drivers/net/can/rcar/rcar_can.c
    @@ -233,11 +233,8 @@ static void rcar_can_error(struct net_device *ndev)
    if (eifr & (RCAR_CAN_EIFR_EWIF | RCAR_CAN_EIFR_EPIF)) {
    txerr = readb(&priv->regs->tecr);
    rxerr = readb(&priv->regs->recr);
    - if (skb) {
    + if (skb)
    cf->can_id |= CAN_ERR_CRTL;
    - cf->data[6] = txerr;
    - cf->data[7] = rxerr;
    - }
    }
    if (eifr & RCAR_CAN_EIFR_BEIF) {
    int rx_errors = 0, tx_errors = 0;
    @@ -337,6 +334,9 @@ static void rcar_can_error(struct net_device *ndev)
    can_bus_off(ndev);
    if (skb)
    cf->can_id |= CAN_ERR_BUSOFF;
    + } else if (skb) {
    + cf->data[6] = txerr;
    + cf->data[7] = rxerr;
    }
    if (eifr & RCAR_CAN_EIFR_ORIF) {
    netdev_dbg(priv->ndev, "Receive overrun error interrupt\n");
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-23 11:47    [W:4.118 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site