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

Commit a9ca6e13 authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Marc Kleine-Budde
Browse files

can: kvaser_usb: Ignore spurious error events after a busoff 



Sending data in high speed then introducing a busoff results
in spurious BUS_ERROR events from the USBCan-II firmware directly
_after_ the triggered BUS_OFF event.

In the current CAN state handling code, this will lead to an
invalid can state of ACTIVE, ERROR, or PASSIVE even though the
CAN controller has been already shut down due to the busoff.

Guard the state handling code from such invalid events.

Signed-off-by: default avatarAhmed S. Darwish <ahmed.darwish@valeo.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 8a00785e

drivers/net/can/usb/kvaser_usb.c

+10 −9
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 * Copyright (C) 2002-2006 KVASER AB, Sweden. All rights reserved.

 * Copyright (C) 2010 Matthias Fuchs <matthias.fuchs@esd.eu>, esd gmbh

 * Copyright (C) 2012 Olivier Sobrie <olivier@sobrie.be>

 * Copyright (C) 2015 Valeo A.S.

 * Copyright (C) 2015 Valeo S.A.

 */



#include <linux/completion.h>
@@ -824,15 +824,16 @@ static void kvaser_usb_rx_error_update_can_state(struct kvaser_usb_net_priv *pri 
	else if (es->status & M16C_STATE_BUS_PASSIVE)

		new_state = CAN_STATE_ERROR_PASSIVE;

	else if (es->status & M16C_STATE_BUS_ERROR) {

		if ((es->txerr >= 256) || (es->rxerr >= 256))

			new_state = CAN_STATE_BUS_OFF;

		else if ((es->txerr >= 128) || (es->rxerr >= 128))

		/* Guard against spurious error events after a busoff */

		if (cur_state < CAN_STATE_BUS_OFF) {

			if ((es->txerr >= 128) || (es->rxerr >= 128))

				new_state = CAN_STATE_ERROR_PASSIVE;

			else if ((es->txerr >= 96) || (es->rxerr >= 96))

				new_state = CAN_STATE_ERROR_WARNING;

			else if (cur_state > CAN_STATE_ERROR_ACTIVE)

				new_state = CAN_STATE_ERROR_ACTIVE;

		}

	}



	if (!es->status)

		new_state = CAN_STATE_ERROR_ACTIVE;