Linux CAN drivers development
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
	kernel@pengutronix.de,
	Dario Binacchi <dario.binacchi@amarulasolutions.com>,
	Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH net 11/15] can: sun4i_can: sun4i_can_err(): fix {rx,tx}_errors statistics
Date: Mon,  2 Dec 2024 09:55:45 +0100	[thread overview]
Message-ID: <20241202090040.1110280-12-mkl@pengutronix.de> (raw)
In-Reply-To: <20241202090040.1110280-1-mkl@pengutronix.de>

From: Dario Binacchi <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>
Link: https://patch.msgid.link/20241122221650.633981-11-dario.binacchi@amarulasolutions.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/sun4i_can.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c
index 17f94cca93fb..4311c1f0eafd 100644
--- a/drivers/net/can/sun4i_can.c
+++ b/drivers/net/can/sun4i_can.c
@@ -579,11 +579,9 @@ 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++;
+		ecc = readl(priv->base + SUN4I_REG_STA_ADDR);
 
 		if (likely(skb)) {
-			ecc = readl(priv->base + SUN4I_REG_STA_ADDR);
-
 			cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
 
 			switch (ecc & SUN4I_STA_MASK_ERR) {
@@ -601,9 +599,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.45.2



  parent reply	other threads:[~2024-12-02  9:00 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-02  8:55 [PATCH net 0/15] pull-request: can 2024-12-02 Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 01/15] can: dev: can_set_termination(): allow sleeping GPIOs Marc Kleine-Budde
2024-12-03  2:10   ` patchwork-bot+netdevbpf
2024-12-02  8:55 ` [PATCH net 02/15] can: gs_usb: add usb endpoint address detection at driver probe step Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 03/15] can: c_can: c_can_handle_bus_err(): update statistics if skb allocation fails Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 04/15] can: sun4i_can: sun4i_can_err(): call can_change_state() even if cf is NULL Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 05/15] can: hi311x: hi3110_can_ist(): fix potential use-after-free Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 06/15] can: hi311x: hi3110_can_ist(): update state error statistics if skb allocation fails Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 07/15] can: m_can: m_can_handle_lec_err(): fix {rx,tx}_errors statistics Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 08/15] can: ifi_canfd: ifi_canfd_handle_lec_err(): " Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 09/15] can: hi311x: hi3110_can_ist(): " Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 10/15] can: sja1000: sja1000_err(): " Marc Kleine-Budde
2024-12-02  8:55 ` Marc Kleine-Budde [this message]
2024-12-02  8:55 ` [PATCH net 12/15] can: ems_usb: ems_usb_rx_err(): " Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 13/15] can: f81604: f81604_handle_can_bus_errors(): " Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 14/15] can: mcp251xfd: mcp251xfd_get_tef_len(): work around erratum DS80000789E 6 Marc Kleine-Budde
2024-12-02  8:55 ` [PATCH net 15/15] can: j1939: j1939_session_new(): fix skb reference counting 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=20241202090040.1110280-12-mkl@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=dario.binacchi@amarulasolutions.com \
    --cc=davem@davemloft.net \
    --cc=kernel@pengutronix.de \
    --cc=kuba@kernel.org \
    --cc=linux-can@vger.kernel.org \
    --cc=netdev@vger.kernel.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