diff mbox series

[RESEND,1/1] can: esd_usb: Allow REC and TEC to return to zero

Message ID 20221124203806.3034897-2-frank.jungclaus@esd.eu
State New
Headers
Series can: esd_usb: Some preparation for supporting esd CAN-USB/3 |

Commit Message

Frank Jungclaus Nov. 24, 2022, 8:38 p.m. UTC 
  We don't get any further EVENT from an esd CAN USB device for changes
on REC or TEC while those counters converge to 0 (with ecc == 0).
So when handling the "Back to Error Active"-event force
txerr = rxerr = 0, otherwise the berr-counters might stay on
values like 95 forever ...

Also, to make life easier during the ongoing development a
netdev_dbg() has been introduced to allow dumping error events send by
an esd CAN USB device.

Signed-off-by: Frank Jungclaus <frank.jungclaus@esd.eu>
---
 drivers/net/can/usb/esd_usb.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Marc Kleine-Budde Nov. 25, 2022, 3:56 p.m. UTC | #1 
On 24.11.2022 21:38:06, Frank Jungclaus wrote:
> We don't get any further EVENT from an esd CAN USB device for changes
> on REC or TEC while those counters converge to 0 (with ecc == 0).
> So when handling the "Back to Error Active"-event force
> txerr = rxerr = 0, otherwise the berr-counters might stay on
> values like 95 forever ...
> 
> Also, to make life easier during the ongoing development a
> netdev_dbg() has been introduced to allow dumping error events send by
> an esd CAN USB device.
> 
> Signed-off-by: Frank Jungclaus <frank.jungclaus@esd.eu>

Please add a Fixes tag.

https://elixir.bootlin.com/linux/v6.0/source/Documentation/process/handling-regressions.rst#L107

> ---
>  drivers/net/can/usb/esd_usb.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/can/usb/esd_usb.c b/drivers/net/can/usb/esd_usb.c
> index 1bcfad11b1e4..da24c649aadd 100644
> --- a/drivers/net/can/usb/esd_usb.c
> +++ b/drivers/net/can/usb/esd_usb.c
> @@ -230,10 +230,14 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv,
>  
>  	if (id == ESD_EV_CAN_ERROR_EXT) {
>  		u8 state = msg->msg.rx.data[0];
> -		u8 ecc = msg->msg.rx.data[1];
> +		u8 ecc   = msg->msg.rx.data[1];

unrelated, please remove.

>  		u8 rxerr = msg->msg.rx.data[2];
>  		u8 txerr = msg->msg.rx.data[3];
>  
> +		netdev_dbg(priv->netdev,
> +			   "CAN_ERR_EV_EXT: dlc=%#02x state=%02x ecc=%02x rec=%02x tec=%02x\n",
> +			   msg->msg.rx.dlc, state, ecc, rxerr, txerr);
> +
>  		skb = alloc_can_err_skb(priv->netdev, &cf);
>  		if (skb == NULL) {
>  			stats->rx_dropped++;
> @@ -260,6 +264,8 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv,
>  				break;
>  			default:
>  				priv->can.state = CAN_STATE_ERROR_ACTIVE;
> +				txerr = 0;
> +				rxerr = 0;
>  				break;
>  			}
>  		} else {

regards,
Marc
Frank Jungclaus Nov. 29, 2022, 5:15 p.m. UTC | #2 
Hello Marc,
thanks for commenting.

On Fri, 2022-11-25 at 16:56 +0100, Marc Kleine-Budde wrote:
> On 24.11.2022 21:38:06, Frank Jungclaus wrote:
> > We don't get any further EVENT from an esd CAN USB device for changes
> > on REC or TEC while those counters converge to 0 (with ecc == 0).
> > So when handling the "Back to Error Active"-event force
> > txerr = rxerr = 0, otherwise the berr-counters might stay on
> > values like 95 forever ...
> > 
> > Also, to make life easier during the ongoing development a
> > netdev_dbg() has been introduced to allow dumping error events send by
> > an esd CAN USB device.
> > 
> > Signed-off-by: Frank Jungclaus <frank.jungclaus@esd.eu>
> 
> Please add a Fixes tag.
> 
> https://elixir.bootlin.com/linux/v6.0/source/Documentation/process/handling-regressions.rst#L107
> 
From my point of view this is not a regression, it's a sort of
imperfection existing since the initial add of esd_usb(2).c to the
kernel. So should I add a "Fixes:" referring to the initial commit?
(Currently) I'm slow on the uptake ;)

> > ---
> >  drivers/net/can/usb/esd_usb.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/net/can/usb/esd_usb.c b/drivers/net/can/usb/esd_usb.c
> > index 1bcfad11b1e4..da24c649aadd 100644
> > --- a/drivers/net/can/usb/esd_usb.c
> > +++ b/drivers/net/can/usb/esd_usb.c
> > @@ -230,10 +230,14 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv,
> >  
> >  	if (id == ESD_EV_CAN_ERROR_EXT) {
> >  		u8 state = msg->msg.rx.data[0];
> > -		u8 ecc = msg->msg.rx.data[1];
> > +		u8 ecc   = msg->msg.rx.data[1];
> 
> unrelated, please remove.
> 
You're right, sorry, will be removed in v2 ...

> >  		u8 rxerr = msg->msg.rx.data[2];
> >  		u8 txerr = msg->msg.rx.data[3];
> >  
> > +		netdev_dbg(priv->netdev,
> > +			   "CAN_ERR_EV_EXT: dlc=%#02x state=%02x ecc=%02x rec=%02x tec=%02x\n",
> > +			   msg->msg.rx.dlc, state, ecc, rxerr, txerr);
> > +
> >  		skb = alloc_can_err_skb(priv->netdev, &cf);
> >  		if (skb == NULL) {
> >  			stats->rx_dropped++;
> > @@ -260,6 +264,8 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv,
> >  				break;
> >  			default:
> >  				priv->can.state = CAN_STATE_ERROR_ACTIVE;
> > +				txerr = 0;
> > +				rxerr = 0;
> >  				break;
> >  			}
> >  		} else {
> 
> regards,
> Marc
> 
Regards, Frank
Marc Kleine-Budde Nov. 30, 2022, 10:21 a.m. UTC | #3 
On 29.11.2022 17:15:56, Frank Jungclaus wrote:
> Hello Marc,
> thanks for commenting.
> 
> On Fri, 2022-11-25 at 16:56 +0100, Marc Kleine-Budde wrote:
> > On 24.11.2022 21:38:06, Frank Jungclaus wrote:
> > > We don't get any further EVENT from an esd CAN USB device for changes
> > > on REC or TEC while those counters converge to 0 (with ecc == 0).
> > > So when handling the "Back to Error Active"-event force
> > > txerr = rxerr = 0, otherwise the berr-counters might stay on
> > > values like 95 forever ...
> > > 
> > > Also, to make life easier during the ongoing development a
> > > netdev_dbg() has been introduced to allow dumping error events send by
> > > an esd CAN USB device.
> > > 
> > > Signed-off-by: Frank Jungclaus <frank.jungclaus@esd.eu>
> > 
> > Please add a Fixes tag.
> > 
> > https://elixir.bootlin.com/linux/v6.0/source/Documentation/process/handling-regressions.rst#L107
> > 
> From my point of view this is not a regression, it's a sort of
> imperfection existing since the initial add of esd_usb(2).c to the
> kernel. So should I add a "Fixes:" referring to the initial commit?
> (Currently) I'm slow on the uptake ;)

Please add a fixes tag that refers to the code that this patch fixes.

Marc
diff mbox series

Patch

diff --git a/drivers/net/can/usb/esd_usb.c b/drivers/net/can/usb/esd_usb.c
index 1bcfad11b1e4..da24c649aadd 100644
--- a/drivers/net/can/usb/esd_usb.c
+++ b/drivers/net/can/usb/esd_usb.c
@@ -230,10 +230,14 @@  static void esd_usb_rx_event(struct esd_usb_net_priv *priv,
 
 	if (id == ESD_EV_CAN_ERROR_EXT) {
 		u8 state = msg->msg.rx.data[0];
-		u8 ecc = msg->msg.rx.data[1];
+		u8 ecc   = msg->msg.rx.data[1];
 		u8 rxerr = msg->msg.rx.data[2];
 		u8 txerr = msg->msg.rx.data[3];
 
+		netdev_dbg(priv->netdev,
+			   "CAN_ERR_EV_EXT: dlc=%#02x state=%02x ecc=%02x rec=%02x tec=%02x\n",
+			   msg->msg.rx.dlc, state, ecc, rxerr, txerr);
+
 		skb = alloc_can_err_skb(priv->netdev, &cf);
 		if (skb == NULL) {
 			stats->rx_dropped++;
@@ -260,6 +264,8 @@  static void esd_usb_rx_event(struct esd_usb_net_priv *priv,
 				break;
 			default:
 				priv->can.state = CAN_STATE_ERROR_ACTIVE;
+				txerr = 0;
+				rxerr = 0;
 				break;
 			}
 		} else {