From: Michael Tretter <m.tretter@pengutronix.de>
To: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Vincent Mailhol <mailhol@kernel.org>,
Achim Baumgartner <abaumgartner@topcon.com>,
linux-can@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel@pengutronix.de
Subject: Re: [PATCH can-next v2 1/2] can: sja1000: sja1000_err(): make use of sja1000_get_berr_counter() to read error counters
Date: Fri, 23 Jan 2026 14:01:00 +0100 [thread overview]
Message-ID: <aXNxDA8C5KFLPWjW@pengutronix.de> (raw)
In-Reply-To: <20260123-sja1000-state-handling-v2-1-687498087dad@pengutronix.de>
On Fri, 23 Jan 2026 11:16:26 +0100, Marc Kleine-Budde wrote:
> This is a preparation patch to make use of can_state_get_by_berr_counter()
> which works on a struct can_berr_counter.
>
> Reuse the existing function sja1000_get_berr_counter() to read the error
> counters into a struct can_berr_counter.
>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Reviewed-by: Michael Tretter <m.tretter@pengutronix.de>
> ---
> drivers/net/can/sja1000/sja1000.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
> index a8fa0d6516b9..ae3244b63b65 100644
> --- a/drivers/net/can/sja1000/sja1000.c
> +++ b/drivers/net/can/sja1000/sja1000.c
> @@ -411,14 +411,13 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
> struct sk_buff *skb;
> enum can_state state = priv->can.state;
> enum can_state rx_state, tx_state;
> - unsigned int rxerr, txerr;
> + struct can_berr_counter bec;
> uint8_t ecc, alc;
> int ret = 0;
>
> skb = alloc_can_err_skb(dev, &cf);
>
> - txerr = priv->read_reg(priv, SJA1000_TXERR);
> - rxerr = priv->read_reg(priv, SJA1000_RXERR);
> + sja1000_get_berr_counter(dev, &bec);
>
> if (isrc & IRQ_DOI) {
> /* data overrun interrupt */
> @@ -455,8 +454,8 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
> }
> if (state != CAN_STATE_BUS_OFF && skb) {
> cf->can_id |= CAN_ERR_CNT;
> - cf->data[6] = txerr;
> - cf->data[7] = rxerr;
> + cf->data[6] = bec.txerr;
> + cf->data[7] = bec.rxerr;
> }
> if (isrc & IRQ_BEI) {
> /* bus error interrupt */
> @@ -515,8 +514,8 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
> }
>
> if (state != priv->can.state) {
> - tx_state = txerr >= rxerr ? state : 0;
> - rx_state = txerr <= rxerr ? state : 0;
> + tx_state = bec.txerr >= bec.rxerr ? state : 0;
> + rx_state = bec.txerr <= bec.rxerr ? state : 0;
>
> can_change_state(dev, cf, tx_state, rx_state);
>
>
> --
> 2.51.0
>
>
next prev parent reply other threads:[~2026-01-23 13:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-23 10:16 [PATCH can-next v2 0/2] can: sja1000: clean up CAN state handling Marc Kleine-Budde
2026-01-23 10:16 ` [PATCH can-next v2 1/2] can: sja1000: sja1000_err(): make use of sja1000_get_berr_counter() to read error counters Marc Kleine-Budde
2026-01-23 13:01 ` Michael Tretter [this message]
2026-01-23 10:16 ` [PATCH can-next v2 2/2] can: sja1000: sja1000_err(): use error counter for error state Marc Kleine-Budde
2026-01-23 13:05 ` Michael Tretter
2026-01-23 13:40 ` [PATCH can-next v2 0/2] can: sja1000: clean up CAN state handling 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=aXNxDA8C5KFLPWjW@pengutronix.de \
--to=m.tretter@pengutronix.de \
--cc=abaumgartner@topcon.com \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mailhol@kernel.org \
--cc=mkl@pengutronix.de \
/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