Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3d20de7 authored by Anssi Hannula's avatar Anssi Hannula Committed by Greg Kroah-Hartman
Browse files

can: kvaser_usb_leaf: Fix bogus restart events 



[ Upstream commit 90904d326269a38fe5dd895fb2db7c03199654c4 ]

When auto-restart is enabled, the kvaser_usb_leaf driver considers
transition from any state >= CAN_STATE_BUS_OFF as a bus-off recovery
event (restart).

However, these events may occur at interface startup time before
kvaser_usb_open() has set the state to CAN_STATE_ERROR_ACTIVE, causing
restarts counter to increase and CAN_ERR_RESTARTED to be sent despite no
actual restart having occurred.

Fix that by making the auto-restart condition checks more strict so that
they only trigger when the interface was actually in the BUS_OFF state.

Fixes: 080f40a6 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices")
Tested-by: default avatarJimmy Assarsson <extja@kvaser.com>
Signed-off-by: default avatarAnssi Hannula <anssi.hannula@bitwise.fi>
Signed-off-by: default avatarJimmy Assarsson <extja@kvaser.com>
Link: https://lore.kernel.org/all/20221010185237.319219-10-extja@kvaser.com


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ad63992b

drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c

+3 −3
Original line number Diff line number Diff line
@@ -899,7 +899,7 @@ static void kvaser_usb_leaf_tx_acknowledge(const struct kvaser_usb *dev, 
	context = &priv->tx_contexts[tid % dev->max_tx_urbs];



	/* Sometimes the state change doesn't come after a bus-off event */

	if (priv->can.restart_ms && priv->can.state >= CAN_STATE_BUS_OFF) {

	if (priv->can.restart_ms && priv->can.state == CAN_STATE_BUS_OFF) {

		struct sk_buff *skb;

		struct can_frame *cf;
@@ -1002,7 +1002,7 @@ kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv, 
	}



	if (priv->can.restart_ms &&

	    cur_state >= CAN_STATE_BUS_OFF &&

	    cur_state == CAN_STATE_BUS_OFF &&

	    new_state < CAN_STATE_BUS_OFF)

		priv->can.can_stats.restarts++;
@@ -1092,7 +1092,7 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev, 
		}



		if (priv->can.restart_ms &&

		    old_state >= CAN_STATE_BUS_OFF &&

		    old_state == CAN_STATE_BUS_OFF &&

		    new_state < CAN_STATE_BUS_OFF) {

			cf->can_id |= CAN_ERR_RESTARTED;

			netif_carrier_on(priv->netdev);