From: Jeroen Hofstee <jhofstee@victronenergy.com> To: linux-can@vger.kernel.org Cc: Jeroen Hofstee <jhofstee@victronenergy.com>, Wolfgang Grandegger <wg@grandegger.com>, Marc Kleine-Budde <mkl@pengutronix.de>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@siol.net>, netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Allwinner sunXi SoC support) Subject: [PATCH] can: don't count arbitration lose as an error Date: Fri, 27 Nov 2020 10:59:38 +0100 [thread overview] Message-ID: <20201127095941.21609-1-jhofstee@victronenergy.com> (raw) Losing arbitration is normal in a CAN-bus network, it means that a higher priority frame is being send and the pending message will be retried later. Hence most driver only increment arbitration_lost, but the sja1000 and sun4i driver also incremeant tx_error, causing errors to be reported on a normal functioning CAN-bus. So stop counting them as errors. For completeness, the Kvaser USB hybra also increments the tx_error on arbitration lose, but it does so in single shot. Since in that case the message is not retried, that behaviour is kept. Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com> --- drivers/net/can/sja1000/sja1000.c | 1 - drivers/net/can/sun4i_can.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index 9f107798f904..25a4d7d0b349 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c @@ -474,7 +474,6 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) netdev_dbg(dev, "arbitration lost interrupt\n"); alc = priv->read_reg(priv, SJA1000_ALC); priv->can.can_stats.arbitration_lost++; - stats->tx_errors++; cf->can_id |= CAN_ERR_LOSTARB; cf->data[0] = alc & 0x1f; } diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c index e2c6cf4b2228..b3f2f4fe5ee0 100644 --- a/drivers/net/can/sun4i_can.c +++ b/drivers/net/can/sun4i_can.c @@ -604,7 +604,6 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) netdev_dbg(dev, "arbitration lost interrupt\n"); alc = readl(priv->base + SUN4I_REG_STA_ADDR); priv->can.can_stats.arbitration_lost++; - stats->tx_errors++; if (likely(skb)) { cf->can_id |= CAN_ERR_LOSTARB; cf->data[0] = (alc >> 8) & 0x1f; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Jeroen Hofstee <jhofstee@victronenergy.com> To: linux-can@vger.kernel.org Cc: Jernej Skrabec <jernej.skrabec@siol.net>, "open list:NETWORKING DRIVERS" <netdev@vger.kernel.org>, Jeroen Hofstee <jhofstee@victronenergy.com>, open list <linux-kernel@vger.kernel.org>, Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Marc Kleine-Budde <mkl@pengutronix.de>, "moderated list:ARM/Allwinner sunXi SoC support" <linux-arm-kernel@lists.infradead.org>, Jakub Kicinski <kuba@kernel.org>, "David S. Miller" <davem@davemloft.net>, Wolfgang Grandegger <wg@grandegger.com> Subject: [PATCH] can: don't count arbitration lose as an error Date: Fri, 27 Nov 2020 10:59:38 +0100 [thread overview] Message-ID: <20201127095941.21609-1-jhofstee@victronenergy.com> (raw) Losing arbitration is normal in a CAN-bus network, it means that a higher priority frame is being send and the pending message will be retried later. Hence most driver only increment arbitration_lost, but the sja1000 and sun4i driver also incremeant tx_error, causing errors to be reported on a normal functioning CAN-bus. So stop counting them as errors. For completeness, the Kvaser USB hybra also increments the tx_error on arbitration lose, but it does so in single shot. Since in that case the message is not retried, that behaviour is kept. Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com> --- drivers/net/can/sja1000/sja1000.c | 1 - drivers/net/can/sun4i_can.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index 9f107798f904..25a4d7d0b349 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c @@ -474,7 +474,6 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) netdev_dbg(dev, "arbitration lost interrupt\n"); alc = priv->read_reg(priv, SJA1000_ALC); priv->can.can_stats.arbitration_lost++; - stats->tx_errors++; cf->can_id |= CAN_ERR_LOSTARB; cf->data[0] = alc & 0x1f; } diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c index e2c6cf4b2228..b3f2f4fe5ee0 100644 --- a/drivers/net/can/sun4i_can.c +++ b/drivers/net/can/sun4i_can.c @@ -604,7 +604,6 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) netdev_dbg(dev, "arbitration lost interrupt\n"); alc = readl(priv->base + SUN4I_REG_STA_ADDR); priv->can.can_stats.arbitration_lost++; - stats->tx_errors++; if (likely(skb)) { cf->can_id |= CAN_ERR_LOSTARB; cf->data[0] = (alc >> 8) & 0x1f; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2020-11-27 10:00 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-27 9:59 Jeroen Hofstee [this message] 2020-11-27 9:59 ` [PATCH] can: don't count arbitration lose as an error Jeroen Hofstee 2020-11-27 10:30 ` Marc Kleine-Budde 2020-11-27 10:30 ` Marc Kleine-Budde 2020-11-27 11:09 ` Jeroen Hofstee 2020-11-27 11:09 ` Jeroen Hofstee 2020-11-27 16:02 ` Jeroen Hofstee 2020-11-28 17:23 ` Oliver Hartkopp 2020-11-28 17:23 ` Oliver Hartkopp 2020-11-29 15:52 ` Jeroen Hofstee 2020-11-29 15:52 ` Jeroen Hofstee 2020-12-02 14:35 ` Oliver Hartkopp 2020-12-02 14:35 ` Oliver Hartkopp 2020-12-02 15:37 ` Jeroen Hofstee 2020-12-02 15:37 ` Jeroen Hofstee 2020-12-02 16:22 ` Oliver Hartkopp 2020-12-02 16:22 ` Oliver Hartkopp 2020-12-02 16:31 ` Jeroen Hofstee 2020-12-02 16:31 ` Jeroen Hofstee 2020-11-30 11:50 ` Marc Kleine-Budde 2020-11-30 11:50 ` Marc Kleine-Budde
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201127095941.21609-1-jhofstee@victronenergy.com \ --to=jhofstee@victronenergy.com \ --cc=davem@davemloft.net \ --cc=jernej.skrabec@siol.net \ --cc=kuba@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-can@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mkl@pengutronix.de \ --cc=mripard@kernel.org \ --cc=netdev@vger.kernel.org \ --cc=wens@csie.org \ --cc=wg@grandegger.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.