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

Commit aec5fb22 authored by Jimmy Assarsson's avatar Jimmy Assarsson Committed by Marc Kleine-Budde
Browse files

can: kvaser_usb: Add support for Kvaser USB hydra family 



This patch adds support for a new Kvaser USB family, denoted hydra.
The hydra family currently contains USB devices with one CAN channel
up to five. There are devices with and without CAN FD support.

Signed-off-by: default avatarJimmy Assarsson <extja@kvaser.com>
Signed-off-by: default avatarChrister Beskow <chbe@kvaser.com>
Signed-off-by: default avatarNicklas Johansson <extnj@kvaser.com>
Signed-off-by: default avatarMartin Henriksson <mh@kvaser.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 7259124e

drivers/net/can/usb/Kconfig

+13 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ config CAN_KVASER_USB 
	tristate "Kvaser CAN/USB interface"

	---help---

	  This driver adds support for Kvaser CAN/USB devices like Kvaser

	  Leaf Light and Kvaser USBcan II.

	  Leaf Light, Kvaser USBcan II and Kvaser Memorator Pro 5xHS.



	  The driver provides support for the following devices:

	    - Kvaser Leaf Light
@@ -61,6 +61,18 @@ config CAN_KVASER_USB 
	    - Kvaser Memorator HS/HS

	    - Kvaser Memorator HS/LS

	    - Scania VCI2 (if you have the Kvaser logo on top)

	    - Kvaser BlackBird v2

	    - Kvaser Leaf Pro HS v2

	    - Kvaser Hybrid 2xCAN/LIN

	    - Kvaser Hybrid Pro 2xCAN/LIN

	    - Kvaser Memorator 2xHS v2

	    - Kvaser Memorator Pro 2xHS v2

	    - Kvaser Memorator Pro 5xHS

	    - Kvaser USBcan Light 4xHS

	    - Kvaser USBcan Pro 2xHS v2

	    - Kvaser USBcan Pro 5xHS

	    - ATI Memorator Pro 2xHS v2

	    - ATI USBcan Pro 2xHS v2



	  If unsure, say N.

drivers/net/can/usb/kvaser_usb/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_CAN_KVASER_USB) += kvaser_usb.o

kvaser_usb-y = kvaser_usb_core.o kvaser_usb_leaf.o
 
kvaser_usb-y = kvaser_usb_core.o kvaser_usb_leaf.o kvaser_usb_hydra.o

drivers/net/can/usb/kvaser_usb/kvaser_usb.h

+37 −7
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *  - Kvaser linux leaf driver (version 4.78)

 *  - CAN driver for esd CAN-USB/2

 *  - Kvaser linux usbcanII driver (version 5.3)

 *  - Kvaser linux mhydra driver (version 5.24)

 *

 * Copyright (C) 2002-2018 KVASER AB, Sweden. All rights reserved.

 * Copyright (C) 2010 Matthias Fuchs <matthias.fuchs@esd.eu>, esd gmbh
@@ -13,8 +14,10 @@ 
#ifndef KVASER_USB_H

#define KVASER_USB_H



/* Kvaser USB CAN dongles are divided into two major families:

 * - Leaf: Based on Renesas M32C, running firmware labeled as 'filo'

/* Kvaser USB CAN dongles are divided into three major platforms:

 * - Hydra: Running firmware labeled as 'mhydra'

 * - Leaf: Based on Renesas M32C or Freescale i.MX28, running firmware labeled

 *         as 'filo'

 * - UsbcanII: Based on Renesas M16C, running firmware labeled as 'helios'

 */
@@ -30,12 +33,17 @@ 
#define KVASER_USB_MAX_TX_URBS			128

#define KVASER_USB_TIMEOUT			1000 /* msecs */

#define KVASER_USB_RX_BUFFER_SIZE		3072

#define KVASER_USB_MAX_NET_DEVICES		3

#define KVASER_USB_MAX_NET_DEVICES		5



/* USB devices features */

#define KVASER_USB_HAS_SILENT_MODE		BIT(0)

#define KVASER_USB_HAS_TXRX_ERRORS		BIT(1)



/* Device capabilities */

#define KVASER_USB_CAP_BERR_CAP			0x01

#define KVASER_USB_CAP_EXT_CAP			0x02

#define KVASER_USB_HYDRA_CAP_EXT_CMD		0x04



struct kvaser_usb_dev_cfg;



enum kvaser_usb_leaf_family {
@@ -43,11 +51,26 @@ enum kvaser_usb_leaf_family { 
	KVASER_USBCAN,

};



#define KVASER_USB_HYDRA_MAX_CMD_LEN		128

struct kvaser_usb_dev_card_data_hydra {

	u8 channel_to_he[KVASER_USB_MAX_NET_DEVICES];

	u8 sysdbg_he;

	spinlock_t transid_lock; /* lock for transid */

	u16 transid;

	/* lock for usb_rx_leftover and usb_rx_leftover_len */

	spinlock_t usb_rx_leftover_lock;

	u8 usb_rx_leftover[KVASER_USB_HYDRA_MAX_CMD_LEN];

	u8 usb_rx_leftover_len;

};

struct kvaser_usb_dev_card_data {

	u32 ctrlmode_supported;

	u32 capabilities;

	union {

		struct {

			enum kvaser_usb_leaf_family family;

		} leaf;

		struct kvaser_usb_dev_card_data_hydra hydra;

	};

};



/* Context for an outstanding, not yet ACKed, transmission */
@@ -89,7 +112,7 @@ struct kvaser_usb_net_priv { 
	struct net_device *netdev;

	int channel;



	struct completion start_comp, stop_comp;

	struct completion start_comp, stop_comp, flush_comp;

	struct usb_anchor tx_submitted;



	spinlock_t tx_contexts_lock; /* lock for active_tx_contexts */
@@ -101,12 +124,15 @@ struct kvaser_usb_net_priv { 
 * struct kvaser_usb_dev_ops - Device specific functions

 * @dev_set_mode:		used for can.do_set_mode

 * @dev_set_bittiming:		used for can.do_set_bittiming

 * @dev_set_data_bittiming:	used for can.do_set_data_bittiming

 * @dev_get_berr_counter:	used for can.do_get_berr_counter

 *

 * @dev_setup_endpoints:	setup USB in and out endpoints

 * @dev_init_card:		initialize card

 * @dev_get_software_info:	get software info

 * @dev_get_software_details:	get software details

 * @dev_get_card_info:		get card info

 * @dev_get_capabilities:	discover device capabilities

 *

 * @dev_set_opt_mode:		set ctrlmod

 * @dev_start_chip:		start the CAN controller
@@ -119,12 +145,15 @@ struct kvaser_usb_net_priv { 
struct kvaser_usb_dev_ops {

	int (*dev_set_mode)(struct net_device *netdev, enum can_mode mode);

	int (*dev_set_bittiming)(struct net_device *netdev);

	int (*dev_set_data_bittiming)(struct net_device *netdev);

	int (*dev_get_berr_counter)(const struct net_device *netdev,

				    struct can_berr_counter *bec);

	int (*dev_setup_endpoints)(struct kvaser_usb *dev);

	int (*dev_init_card)(struct kvaser_usb *dev);

	int (*dev_get_software_info)(struct kvaser_usb *dev);

	int (*dev_get_software_details)(struct kvaser_usb *dev);

	int (*dev_get_card_info)(struct kvaser_usb *dev);

	int (*dev_get_capabilities)(struct kvaser_usb *dev);

	int (*dev_set_opt_mode)(const struct kvaser_usb_net_priv *priv);

	int (*dev_start_chip)(struct kvaser_usb_net_priv *priv);

	int (*dev_stop_chip)(struct kvaser_usb_net_priv *priv);
@@ -144,6 +173,7 @@ struct kvaser_usb_dev_cfg { 
	const struct can_bittiming_const * const data_bittiming_const;

};



extern const struct kvaser_usb_dev_ops kvaser_usb_hydra_dev_ops;

extern const struct kvaser_usb_dev_ops kvaser_usb_leaf_dev_ops;



int kvaser_usb_recv_cmd(const struct kvaser_usb *dev, void *cmd, int len,

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

+69 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *  - Kvaser linux leaf driver (version 4.78)

 *  - CAN driver for esd CAN-USB/2

 *  - Kvaser linux usbcanII driver (version 5.3)

 *  - Kvaser linux mhydra driver (version 5.24)

 *

 * Copyright (C) 2002-2018 KVASER AB, Sweden. All rights reserved.

 * Copyright (C) 2010 Matthias Fuchs <matthias.fuchs@esd.eu>, esd gmbh
@@ -64,10 +65,26 @@ 
#define USB_USBCAN2_PRODUCT_ID			4

#define USB_MEMORATOR_PRODUCT_ID		5



/* Kvaser Minihydra USB devices product ids */

#define USB_BLACKBIRD_V2_PRODUCT_ID		258

#define USB_MEMO_PRO_5HS_PRODUCT_ID		260

#define USB_USBCAN_PRO_5HS_PRODUCT_ID		261

#define USB_USBCAN_LIGHT_4HS_PRODUCT_ID		262

#define USB_LEAF_PRO_HS_V2_PRODUCT_ID		263

#define USB_USBCAN_PRO_2HS_V2_PRODUCT_ID	264

#define USB_MEMO_2HS_PRODUCT_ID			265

#define USB_MEMO_PRO_2HS_V2_PRODUCT_ID		266

#define USB_HYBRID_CANLIN_PRODUCT_ID		267

#define USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID	268

#define USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID	269

#define USB_HYBRID_PRO_CANLIN_PRODUCT_ID	270



static inline bool kvaser_is_leaf(const struct usb_device_id *id)

{

	return id->idProduct >= USB_LEAF_DEVEL_PRODUCT_ID &&

	       id->idProduct <= USB_MINI_PCIE_2HS_PRODUCT_ID;

	return (id->idProduct >= USB_LEAF_DEVEL_PRODUCT_ID &&

		id->idProduct <= USB_CAN_R_PRODUCT_ID) ||

		(id->idProduct >= USB_LEAF_LITE_V2_PRODUCT_ID &&

		 id->idProduct <= USB_MINI_PCIE_2HS_PRODUCT_ID);

}



static inline bool kvaser_is_usbcan(const struct usb_device_id *id)
@@ -76,6 +93,12 @@ static inline bool kvaser_is_usbcan(const struct usb_device_id *id) 
	       id->idProduct <= USB_MEMORATOR_PRODUCT_ID;

}



static inline bool kvaser_is_hydra(const struct usb_device_id *id)

{

	return id->idProduct >= USB_BLACKBIRD_V2_PRODUCT_ID &&

	       id->idProduct <= USB_HYBRID_PRO_CANLIN_PRODUCT_ID;

}



static const struct usb_device_id kvaser_usb_table[] = {

	/* Leaf USB product IDs */

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_DEVEL_PRODUCT_ID) },
@@ -140,6 +163,20 @@ static const struct usb_device_id kvaser_usb_table[] = { 
		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_VCI2_PRODUCT_ID),

		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },



	/* Minihydra USB product IDs */

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_V2_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_5HS_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_5HS_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_4HS_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_HS_V2_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_2HS_V2_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_2HS_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_2HS_V2_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_CANLIN_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID) },

	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_CANLIN_PRODUCT_ID) },

	{ }

};

MODULE_DEVICE_TABLE(usb, kvaser_usb_table);
@@ -633,13 +670,20 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, 
	priv->can.bittiming_const = dev->cfg->bittiming_const;

	priv->can.do_set_bittiming = dev->ops->dev_set_bittiming;

	priv->can.do_set_mode = dev->ops->dev_set_mode;

	if (id->driver_info & KVASER_USB_HAS_TXRX_ERRORS)

	if ((id->driver_info & KVASER_USB_HAS_TXRX_ERRORS) ||

	    (priv->dev->card_data.capabilities & KVASER_USB_CAP_BERR_CAP))

		priv->can.do_get_berr_counter = dev->ops->dev_get_berr_counter;

	if (id->driver_info & KVASER_USB_HAS_SILENT_MODE)

		priv->can.ctrlmode_supported |= CAN_CTRLMODE_LISTENONLY;



	priv->can.ctrlmode_supported |= dev->card_data.ctrlmode_supported;



	if (priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) {

		priv->can.data_bittiming_const = dev->cfg->data_bittiming_const;

		priv->can.do_set_data_bittiming =

					dev->ops->dev_set_data_bittiming;

	}



	netdev->flags |= IFF_ECHO;



	netdev->netdev_ops = &kvaser_usb_netdev_ops;
@@ -679,6 +723,8 @@ static int kvaser_usb_probe(struct usb_interface *intf, 
	} else if (kvaser_is_usbcan(id)) {

		dev->card_data.leaf.family = KVASER_USBCAN;

		dev->ops = &kvaser_usb_leaf_dev_ops;

	} else if (kvaser_is_hydra(id)) {

		dev->ops = &kvaser_usb_hydra_dev_ops;

	} else {

		dev_err(&intf->dev,

			"Product ID (%d) is not a supported Kvaser USB device\n",
@@ -701,6 +747,7 @@ static int kvaser_usb_probe(struct usb_interface *intf, 
	usb_set_intfdata(intf, dev);



	dev->card_data.ctrlmode_supported = 0;

	dev->card_data.capabilities = 0;

	err = dev->ops->dev_init_card(dev);

	if (err) {

		dev_err(&intf->dev,
@@ -715,6 +762,15 @@ static int kvaser_usb_probe(struct usb_interface *intf, 
		return err;

	}



	if (dev->ops->dev_get_software_details) {

		err = dev->ops->dev_get_software_details(dev);

		if (err) {

			dev_err(&intf->dev,

				"Cannot get software details, error %d\n", err);

			return err;

		}

	}



	if (WARN_ON(!dev->cfg))

		return -ENODEV;
@@ -731,6 +787,16 @@ static int kvaser_usb_probe(struct usb_interface *intf, 
		return err;

	}



	if (dev->ops->dev_get_capabilities) {

		err = dev->ops->dev_get_capabilities(dev);

		if (err) {

			dev_err(&intf->dev,

				"Cannot get capabilities, error %d\n", err);

			kvaser_usb_remove_interfaces(dev);

			return err;

		}

	}



	for (i = 0; i < dev->nchannels; i++) {

		err = kvaser_usb_init_one(dev, id, i);

		if (err) {

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

0 → 100644
+2028 −0

File added.

Preview size limit exceeded, changes collapsed.