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

Commit a90f13b2 authored by Jonas Peterson's avatar Jonas Peterson Committed by Marc Kleine-Budde
Browse files

net: can: kvaser_usb: fix reception on "USBcan Pro" and "USBcan R" type hardware. 



Unlike Kvaser Leaf light devices, some other Kvaser devices (like USBcan
Pro, USBcan R) receive CAN messages in CMD_LOG_MESSAGE frames. This
patch adds support for it.

Cc: linux-stable <stable@vger.kernel.org> # >= v3.8
Signed-off-by: default avatarJonas Peterson <jonas.peterson@gmail.com>
Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 01cb71d2

drivers/net/can/usb/kvaser_usb.c

+43 −21
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ 
#define KVASER_CTRL_MODE_SELFRECEPTION	3

#define KVASER_CTRL_MODE_OFF		4



/* log message */

#define KVASER_EXTENDED_FRAME		BIT(31)



struct kvaser_msg_simple {

	u8 tid;

	u8 channel;
@@ -817,7 +820,12 @@ static void kvaser_usb_rx_can_msg(const struct kvaser_usb *dev, 
	priv = dev->nets[channel];

	stats = &priv->netdev->stats;



	if (msg->u.rx_can.flag & (MSG_FLAG_ERROR_FRAME | MSG_FLAG_NERR |

	if ((msg->u.rx_can.flag & MSG_FLAG_ERROR_FRAME) &&

	    (msg->id == CMD_LOG_MESSAGE)) {

		kvaser_usb_rx_error(dev, msg);

		return;

	} else if (msg->u.rx_can.flag & (MSG_FLAG_ERROR_FRAME |

					 MSG_FLAG_NERR |

					 MSG_FLAG_OVERRUN)) {

		kvaser_usb_rx_can_err(priv, msg);

		return;
@@ -834,9 +842,23 @@ static void kvaser_usb_rx_can_msg(const struct kvaser_usb *dev, 
		return;

	}



	if (msg->id == CMD_LOG_MESSAGE) {

		cf->can_id = le32_to_cpu(msg->u.log_message.id);

		if (cf->can_id & KVASER_EXTENDED_FRAME)

			cf->can_id &= CAN_EFF_MASK | CAN_EFF_FLAG;

		else

			cf->can_id &= CAN_SFF_MASK;



		cf->can_dlc = get_can_dlc(msg->u.log_message.dlc);



		if (msg->u.log_message.flags & MSG_FLAG_REMOTE_FRAME)

			cf->can_id |= CAN_RTR_FLAG;

		else

			memcpy(cf->data, &msg->u.log_message.data,

			       cf->can_dlc);

	} else {

		cf->can_id = ((msg->u.rx_can.msg[0] & 0x1f) << 6) |

			     (msg->u.rx_can.msg[1] & 0x3f);

	cf->can_dlc = get_can_dlc(msg->u.rx_can.msg[5]);



		if (msg->id == CMD_RX_EXT_MESSAGE) {

			cf->can_id <<= 18;
@@ -846,10 +868,14 @@ static void kvaser_usb_rx_can_msg(const struct kvaser_usb *dev, 
			cf->can_id |= CAN_EFF_FLAG;

		}



		cf->can_dlc = get_can_dlc(msg->u.rx_can.msg[5]);



		if (msg->u.rx_can.flag & MSG_FLAG_REMOTE_FRAME)

			cf->can_id |= CAN_RTR_FLAG;

		else

		memcpy(cf->data, &msg->u.rx_can.msg[6], cf->can_dlc);

			memcpy(cf->data, &msg->u.rx_can.msg[6],

			       cf->can_dlc);

	}



	netif_rx(skb);
@@ -911,6 +937,7 @@ static void kvaser_usb_handle_message(const struct kvaser_usb *dev, 


	case CMD_RX_STD_MESSAGE:

	case CMD_RX_EXT_MESSAGE:

	case CMD_LOG_MESSAGE:

		kvaser_usb_rx_can_msg(dev, msg);

		break;
@@ -919,11 +946,6 @@ static void kvaser_usb_handle_message(const struct kvaser_usb *dev, 
		kvaser_usb_rx_error(dev, msg);

		break;



	case CMD_LOG_MESSAGE:

		if (msg->u.log_message.flags & MSG_FLAG_ERROR_FRAME)

			kvaser_usb_rx_error(dev, msg);

		break;



	case CMD_TX_ACKNOWLEDGE:

		kvaser_usb_tx_acknowledge(dev, msg);

		break;