From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
Dario Binacchi <dario.binacchi@amarulasolutions.com>,
Chen-Yu Tsai <wens@csie.org>,
Gerhard Bertelsmann <info@gerhard-bertelsmann.de>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
Maxime Ripard <mripard@kernel.org>,
Samuel Holland <samuel@sholland.org>,
Vincent Mailhol <mailhol.vincent@wanadoo.fr>,
linux-arm-kernel@lists.infradead.org, linux-can@vger.kernel.org,
linux-sunxi@lists.linux.dev
Subject: [PATCH v2 10/12] can: sun4i_can: fix {rx,tx}_errors statistics
Date: Fri, 22 Nov 2024 23:15:51 +0100 [thread overview]
Message-ID: <20241122221650.633981-11-dario.binacchi@amarulasolutions.com> (raw)
In-Reply-To: <20241122221650.633981-1-dario.binacchi@amarulasolutions.com>
The sun4i_can_err() function only incremented the receive error counter
and never the transmit error counter, even if the STA_ERR_DIR flag
reported that an error had occurred during transmission. Increment the
receive/transmit error counter based on the value of the STA_ERR_DIR
flag.
Fixes: 0738eff14d81 ("can: Allwinner A10/A20 CAN Controller support - Kernel module")
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
Changes in v2:
- Update statistics even if skb allocation fails
drivers/net/can/sun4i_can.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c
index 840b972498c1..5285bb0b7c69 100644
--- a/drivers/net/can/sun4i_can.c
+++ b/drivers/net/can/sun4i_can.c
@@ -579,7 +579,6 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)
/* bus error interrupt */
netdev_dbg(dev, "bus error interrupt\n");
priv->can.can_stats.bus_error++;
- stats->rx_errors++;
if (likely(skb)) {
ecc = readl(priv->base + SUN4I_REG_STA_ADDR);
@@ -601,9 +600,15 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)
>> 16;
break;
}
- /* error occurred during transmission? */
- if ((ecc & SUN4I_STA_ERR_DIR) == 0)
+ }
+
+ /* error occurred during transmission? */
+ if ((ecc & SUN4I_STA_ERR_DIR) == 0) {
+ if (likely(skb))
cf->data[2] |= CAN_ERR_PROT_TX;
+ stats->tx_errors++;
+ } else {
+ stats->rx_errors++;
}
}
if (isrc & SUN4I_INT_ERR_PASSIVE) {
--
2.43.0
next prev parent reply other threads:[~2024-11-22 22:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-22 22:15 [PATCH v2 00/12] Fix {rx,tx}_errors CAN statistics Dario Binacchi
2024-11-22 22:15 ` [PATCH v2 01/12] can: c_can: update statistics if skb allocation fails Dario Binacchi
2024-11-22 22:15 ` [PATCH v2 02/12] can: sun4i_can: call can_change_state() even if cf is NULL Dario Binacchi
2024-11-22 22:15 ` [PATCH v2 03/12] can: sun4i_can: continue to use likely() to check skb Dario Binacchi
2024-11-26 9:18 ` Marc Kleine-Budde
2024-11-22 22:15 ` [PATCH v2 04/12] can: hi311x: fix txerr and rxerr reporting Dario Binacchi
2024-11-26 9:48 ` Marc Kleine-Budde
2024-11-22 22:15 ` [PATCH v2 05/12] can: hi311x: update state error statistics if skb allocation fails Dario Binacchi
2024-11-22 22:15 ` [PATCH v2 06/12] can: m_can: fix {rx,tx}_errors statistics Dario Binacchi
2024-11-22 22:15 ` [PATCH v2 07/12] can: ifi_canfd: " Dario Binacchi
2024-11-23 20:14 ` Marek Vasut
2024-11-22 22:15 ` [PATCH v2 08/12] can: hi311x: " Dario Binacchi
2024-11-22 22:15 ` [PATCH v2 09/12] can: sja1000: " Dario Binacchi
2024-11-22 22:15 ` Dario Binacchi [this message]
2024-11-26 9:32 ` [PATCH v2 10/12] can: sun4i_can: " Marc Kleine-Budde
2024-11-22 22:15 ` [PATCH v2 11/12] can: ems_usb: " Dario Binacchi
2024-11-22 22:15 ` [PATCH v2 12/12] can: f81604: " Dario Binacchi
2024-11-26 9:42 ` [PATCH v2 00/12] Fix {rx,tx}_errors CAN statistics Marc Kleine-Budde
2024-11-26 10:14 ` 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=20241122221650.633981-11-dario.binacchi@amarulasolutions.com \
--to=dario.binacchi@amarulasolutions.com \
--cc=info@gerhard-bertelsmann.de \
--cc=jernej.skrabec@gmail.com \
--cc=linux-amarula@amarulasolutions.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=mailhol.vincent@wanadoo.fr \
--cc=mkl@pengutronix.de \
--cc=mripard@kernel.org \
--cc=samuel@sholland.org \
--cc=wens@csie.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox