Linux CAN drivers development
 help / color / mirror / Atom feed
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
	Dario Binacchi <dario.binacchi@amarulasolutions.com>,
	"Ji-Ze Hong (Peter Hong)" <peter_hong@fintek.com.tw>,
	Marc Kleine-Budde <mkl@pengutronix.de>,
	Vincent Mailhol <mailhol.vincent@wanadoo.fr>,
	linux-can@vger.kernel.org
Subject: [PATCH v2 12/12] can: f81604: fix {rx,tx}_errors statistics
Date: Fri, 22 Nov 2024 23:15:53 +0100	[thread overview]
Message-ID: <20241122221650.633981-13-dario.binacchi@amarulasolutions.com> (raw)
In-Reply-To: <20241122221650.633981-1-dario.binacchi@amarulasolutions.com>

The f81604_handle_can_bus_errors() function only incremented the receive
error counter and never the transmit error counter, even if the ECC_DIR
flag reported that an error had occurred during transmission. Increment
the receive/transmit error counter based on the value of the ECC_DIR
flag.

Fixes: 88da17436973 ("can: usb: f81604: add Fintek F81604 support")
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

Changes in v2:
- Fix patches 7 through 12 to ensure that statistics are updated even
  if the allocation of skb fails.
- Add five new patches (i. e. 1-5), created during the further analysis
  of the code while correcting patches from the v1 series (i. e. 7-12).
- Update statistics even if skb allocation fails

 drivers/net/can/usb/f81604.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/can/usb/f81604.c b/drivers/net/can/usb/f81604.c
index bc0c8903fe77..e0cfa1460b0b 100644
--- a/drivers/net/can/usb/f81604.c
+++ b/drivers/net/can/usb/f81604.c
@@ -526,7 +526,6 @@ static void f81604_handle_can_bus_errors(struct f81604_port_priv *priv,
 		netdev_dbg(netdev, "bus error interrupt\n");
 
 		priv->can.can_stats.bus_error++;
-		stats->rx_errors++;
 
 		if (skb) {
 			cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
@@ -548,10 +547,15 @@ static void f81604_handle_can_bus_errors(struct f81604_port_priv *priv,
 
 			/* set error location */
 			cf->data[3] = data->ecc & F81604_SJA1000_ECC_SEG;
+		}
 
-			/* Error occurred during transmission? */
-			if ((data->ecc & F81604_SJA1000_ECC_DIR) == 0)
+		/* Error occurred during transmission? */
+		if ((data->ecc & F81604_SJA1000_ECC_DIR) == 0) {
+			stats->tx_errors++;
+			if (skb)
 				cf->data[2] |= CAN_ERR_PROT_TX;
+		} else {
+			stats->rx_errors++;
 		}
 
 		set_bit(F81604_CLEAR_ECC, &priv->clear_flags);
-- 
2.43.0


  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 ` [PATCH v2 10/12] can: sun4i_can: " Dario Binacchi
2024-11-26  9:32   ` Marc Kleine-Budde
2024-11-22 22:15 ` [PATCH v2 11/12] can: ems_usb: " Dario Binacchi
2024-11-22 22:15 ` Dario Binacchi [this message]
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-13-dario.binacchi@amarulasolutions.com \
    --to=dario.binacchi@amarulasolutions.com \
    --cc=linux-amarula@amarulasolutions.com \
    --cc=linux-can@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mailhol.vincent@wanadoo.fr \
    --cc=mkl@pengutronix.de \
    --cc=peter_hong@fintek.com.tw \
    /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