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.19 096/287] can: sja1000: do not report txerr and rxerr during bus-off
    Date
    From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>

    [ Upstream commit 164d7cb2d5a30f1b3a5ab4fab1a27731fb1494a8 ]

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

    Fixes: 215db1856e83 ("can: sja1000: Consolidate and unify state change handling")
    Link: https://lore.kernel.org/all/20220719143550.3681-4-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/sja1000/sja1000.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
    index 9f107798f904..e7327ceabb76 100644
    --- a/drivers/net/can/sja1000/sja1000.c
    +++ b/drivers/net/can/sja1000/sja1000.c
    @@ -405,9 +405,6 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
    txerr = priv->read_reg(priv, SJA1000_TXERR);
    rxerr = priv->read_reg(priv, SJA1000_RXERR);

    - cf->data[6] = txerr;
    - cf->data[7] = rxerr;
    -
    if (isrc & IRQ_DOI) {
    /* data overrun interrupt */
    netdev_dbg(dev, "data overrun interrupt\n");
    @@ -429,6 +426,10 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
    else
    state = CAN_STATE_ERROR_ACTIVE;
    }
    + if (state != CAN_STATE_BUS_OFF) {
    + cf->data[6] = txerr;
    + cf->data[7] = rxerr;
    + }
    if (isrc & IRQ_BEI) {
    /* bus error interrupt */
    priv->can.can_stats.bus_error++;
    --
    2.35.1


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