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 5.4 131/389] can: pch_can: do not report txerr and rxerr during bus-off
    Date
    From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>

    [ 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 | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
    index e90651f7b2ea..b148572e4a74 100644
    --- a/drivers/net/can/pch_can.c
    +++ b/drivers/net/can/pch_can.c
    @@ -496,6 +496,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);
    @@ -556,9 +559,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);

    --
    2.35.1


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