Commit b74c3abf authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

Merge patch series "can: esd_usb: More preparation before supporting esd CAN-USB/3" 

Frank Jungclaus <frank.jungclaus@esd.eu> says:

Apply another small batch of patches as preparation for adding support
of the newly available esd CAN-USB/3 to esd_usb.c.

v1 -> v2:
* Make use of GENMASK() macro for ESD_USB_NO_BAUDRATE and
  ESD_USB_IDMASK
* Also use the BIT() macro for ESD_USB2_3_SAMPLES
* Removed comments with redundant hexadecimal values from
  BIT()-constants
* Reworded (shortened) the commit messages
* Changed the macro ESD_USB_3_SAMPLES to ESD_USB_TRIPLE_SAMPLES

v1:
* Link: https://lore.kernel.org/all/20230517192251.2405290-1-frank.jungclaus@esd.eu

Link: https://lore.kernel.org/r/20230519195600.420644-1-frank.jungclaus@esd.eu


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parents d7588f02 1336ca2d

drivers/net/can/usb/esd_usb.c

+168 −171
Original line number Diff line number Diff line
@@ -3,18 +3,19 @@ 
 * CAN driver for esd electronics gmbh CAN-USB/2 and CAN-USB/Micro

 *

 * Copyright (C) 2010-2012 esd electronic system design gmbh, Matthias Fuchs <socketcan@esd.eu>

 * Copyright (C) 2022 esd electronics gmbh, Frank Jungclaus <frank.jungclaus@esd.eu>

 * Copyright (C) 2022-2023 esd electronics gmbh, Frank Jungclaus <frank.jungclaus@esd.eu>

 */

#include <linux/ethtool.h>

#include <linux/signal.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/netdevice.h>

#include <linux/usb.h>



#include <linux/can.h>

#include <linux/can/dev.h>

#include <linux/can/error.h>

#include <linux/ethtool.h>

#include <linux/module.h>

#include <linux/netdevice.h>

#include <linux/signal.h>

#include <linux/slab.h>

#include <linux/units.h>

#include <linux/usb.h>



MODULE_AUTHOR("Matthias Fuchs <socketcan@esd.eu>");

MODULE_AUTHOR("Frank Jungclaus <frank.jungclaus@esd.eu>");
@@ -22,95 +23,88 @@ MODULE_DESCRIPTION("CAN driver for esd electronics gmbh CAN-USB/2 and CAN-USB/Mi 
MODULE_LICENSE("GPL v2");



/* USB vendor and product ID */

#define USB_ESDGMBH_VENDOR_ID	0x0ab4

#define USB_CANUSB2_PRODUCT_ID	0x0010

#define USB_CANUSBM_PRODUCT_ID	0x0011

#define ESD_USB_ESDGMBH_VENDOR_ID	0x0ab4

#define ESD_USB_CANUSB2_PRODUCT_ID	0x0010

#define ESD_USB_CANUSBM_PRODUCT_ID	0x0011



/* CAN controller clock frequencies */

#define ESD_USB2_CAN_CLOCK	60000000

#define ESD_USBM_CAN_CLOCK	36000000

#define ESD_USB_2_CAN_CLOCK	(60 * MEGA) /* Hz */

#define ESD_USB_M_CAN_CLOCK	(36 * MEGA) /* Hz */



/* Maximum number of CAN nets */

#define ESD_USB_MAX_NETS	2



/* USB commands */

#define CMD_VERSION		1 /* also used for VERSION_REPLY */

#define CMD_CAN_RX		2 /* device to host only */

#define CMD_CAN_TX		3 /* also used for TX_DONE */

#define CMD_SETBAUD		4 /* also used for SETBAUD_REPLY */

#define CMD_TS			5 /* also used for TS_REPLY */

#define CMD_IDADD		6 /* also used for IDADD_REPLY */

#define ESD_USB_CMD_VERSION		1 /* also used for VERSION_REPLY */

#define ESD_USB_CMD_CAN_RX		2 /* device to host only */

#define ESD_USB_CMD_CAN_TX		3 /* also used for TX_DONE */

#define ESD_USB_CMD_SETBAUD		4 /* also used for SETBAUD_REPLY */

#define ESD_USB_CMD_TS			5 /* also used for TS_REPLY */

#define ESD_USB_CMD_IDADD		6 /* also used for IDADD_REPLY */



/* esd CAN message flags - dlc field */

#define ESD_RTR			0x10

#define ESD_RTR	BIT(4)





/* esd CAN message flags - id field */

#define ESD_EXTID		0x20000000

#define ESD_EVENT		0x40000000

#define ESD_IDMASK		0x1fffffff

#define ESD_USB_EXTID	BIT(29)

#define ESD_USB_EVENT	BIT(30)

#define ESD_USB_IDMASK	GENMASK(28, 0)



/* esd CAN event ids */

#define ESD_EV_CAN_ERROR_EXT	2 /* CAN controller specific diagnostic data */



/* baudrate message flags */

#define ESD_USB_UBR		0x80000000

#define ESD_USB_LOM		0x40000000

#define ESD_USB_NO_BAUDRATE	0x7fffffff



/* bit timing CAN-USB/2 */

#define ESD_USB2_TSEG1_MIN	1

#define ESD_USB2_TSEG1_MAX	16

#define ESD_USB2_TSEG1_SHIFT	16

#define ESD_USB2_TSEG2_MIN	1

#define ESD_USB2_TSEG2_MAX	8

#define ESD_USB2_TSEG2_SHIFT	20

#define ESD_USB2_SJW_MAX	4

#define ESD_USB2_SJW_SHIFT	14

#define ESD_USBM_SJW_SHIFT	24

#define ESD_USB2_BRP_MIN	1

#define ESD_USB2_BRP_MAX	1024

#define ESD_USB2_BRP_INC	1

#define ESD_USB2_3_SAMPLES	0x00800000

#define ESD_USB_LOM	BIT(30) /* Listen Only Mode */

#define ESD_USB_UBR	BIT(31) /* User Bit Rate (controller BTR) in bits 0..27 */

#define ESD_USB_NO_BAUDRATE	GENMASK(30, 0) /* bit rate unconfigured */



/* bit timing esd CAN-USB */

#define ESD_USB_2_TSEG1_SHIFT	16

#define ESD_USB_2_TSEG2_SHIFT	20

#define ESD_USB_2_SJW_SHIFT	14

#define ESD_USB_M_SJW_SHIFT	24

#define ESD_USB_TRIPLE_SAMPLES	BIT(23)



/* esd IDADD message */

#define ESD_ID_ENABLE		0x80

#define ESD_MAX_ID_SEGMENT	64

#define ESD_USB_ID_ENABLE	0x80

#define ESD_USB_MAX_ID_SEGMENT	64



/* SJA1000 ECC register (emulated by usb firmware) */

#define SJA1000_ECC_SEG		0x1F

#define SJA1000_ECC_DIR		0x20

#define SJA1000_ECC_ERR		0x06

#define SJA1000_ECC_BIT		0x00

#define SJA1000_ECC_FORM	0x40

#define SJA1000_ECC_STUFF	0x80

#define SJA1000_ECC_MASK	0xc0

#define ESD_USB_SJA1000_ECC_SEG		0x1F

#define ESD_USB_SJA1000_ECC_DIR		0x20

#define ESD_USB_SJA1000_ECC_ERR		0x06

#define ESD_USB_SJA1000_ECC_BIT		0x00

#define ESD_USB_SJA1000_ECC_FORM	0x40

#define ESD_USB_SJA1000_ECC_STUFF	0x80

#define ESD_USB_SJA1000_ECC_MASK	0xc0



/* esd bus state event codes */

#define ESD_BUSSTATE_MASK	0xc0

#define ESD_BUSSTATE_WARN	0x40

#define ESD_BUSSTATE_ERRPASSIVE	0x80

#define ESD_BUSSTATE_BUSOFF	0xc0

#define ESD_USB_BUSSTATE_MASK	0xc0

#define ESD_USB_BUSSTATE_WARN	0x40

#define ESD_USB_BUSSTATE_ERRPASSIVE	0x80

#define ESD_USB_BUSSTATE_BUSOFF	0xc0



#define RX_BUFFER_SIZE		1024

#define MAX_RX_URBS		4

#define MAX_TX_URBS		16 /* must be power of 2 */

#define ESD_USB_RX_BUFFER_SIZE		1024

#define ESD_USB_MAX_RX_URBS		4

#define ESD_USB_MAX_TX_URBS		16 /* must be power of 2 */



struct header_msg {

	u8 len; /* len is always the total message length in 32bit words */

struct esd_usb_header_msg {

	u8 len; /* total message length in 32bit words */

	u8 cmd;

	u8 rsvd[2];

};



struct version_msg {

	u8 len;

struct esd_usb_version_msg {

	u8 len; /* total message length in 32bit words */

	u8 cmd;

	u8 rsvd;

	u8 flags;

	__le32 drv_version;

};



struct version_reply_msg {

	u8 len;

struct esd_usb_version_reply_msg {

	u8 len; /* total message length in 32bit words */

	u8 cmd;

	u8 nets;

	u8 features;
@@ -120,15 +114,15 @@ struct version_reply_msg { 
	__le32 ts;

};



struct rx_msg {

	u8 len;

struct esd_usb_rx_msg {

	u8 len; /* total message length in 32bit words */

	u8 cmd;

	u8 net;

	u8 dlc;

	__le32 ts;

	__le32 id; /* upper 3 bits contain flags */

	union {

		u8 data[8];

		u8 data[CAN_MAX_DLEN];

		struct {

			u8 status; /* CAN Controller Status */

			u8 ecc;    /* Error Capture Register */
@@ -138,18 +132,18 @@ struct rx_msg { 
	};

};



struct tx_msg {

	u8 len;

struct esd_usb_tx_msg {

	u8 len; /* total message length in 32bit words */

	u8 cmd;

	u8 net;

	u8 dlc;

	u32 hnd;	/* opaque handle, not used by device */

	__le32 id; /* upper 3 bits contain flags */

	u8 data[8];

	u8 data[CAN_MAX_DLEN];

};



struct tx_done_msg {

	u8 len;

struct esd_usb_tx_done_msg {

	u8 len; /* total message length in 32bit words */

	u8 cmd;

	u8 net;

	u8 status;
@@ -157,16 +151,16 @@ struct tx_done_msg { 
	__le32 ts;

};



struct id_filter_msg {

	u8 len;

struct esd_usb_id_filter_msg {

	u8 len; /* total message length in 32bit words */

	u8 cmd;

	u8 net;

	u8 option;

	__le32 mask[ESD_MAX_ID_SEGMENT + 1];

	__le32 mask[ESD_USB_MAX_ID_SEGMENT + 1]; /* +1 for 29bit extended IDs */

};



struct set_baudrate_msg {

	u8 len;

struct esd_usb_set_baudrate_msg {

	u8 len; /* total message length in 32bit words */

	u8 cmd;

	u8 net;

	u8 rsvd;
@@ -175,19 +169,19 @@ struct set_baudrate_msg { 


/* Main message type used between library and application */

union __packed esd_usb_msg {

	struct header_msg hdr;

	struct version_msg version;

	struct version_reply_msg version_reply;

	struct rx_msg rx;

	struct tx_msg tx;

	struct tx_done_msg txdone;

	struct set_baudrate_msg setbaud;

	struct id_filter_msg filter;

	struct esd_usb_header_msg hdr;

	struct esd_usb_version_msg version;

	struct esd_usb_version_reply_msg version_reply;

	struct esd_usb_rx_msg rx;

	struct esd_usb_tx_msg tx;

	struct esd_usb_tx_done_msg txdone;

	struct esd_usb_set_baudrate_msg setbaud;

	struct esd_usb_id_filter_msg filter;

};



static struct usb_device_id esd_usb_table[] = {

	{USB_DEVICE(USB_ESDGMBH_VENDOR_ID, USB_CANUSB2_PRODUCT_ID)},

	{USB_DEVICE(USB_ESDGMBH_VENDOR_ID, USB_CANUSBM_PRODUCT_ID)},

	{USB_DEVICE(ESD_USB_ESDGMBH_VENDOR_ID, ESD_USB_CANUSB2_PRODUCT_ID)},

	{USB_DEVICE(ESD_USB_ESDGMBH_VENDOR_ID, ESD_USB_CANUSBM_PRODUCT_ID)},

	{}

};

MODULE_DEVICE_TABLE(usb, esd_usb_table);
@@ -208,8 +202,8 @@ struct esd_usb { 
	int net_count;

	u32 version;

	int rxinitdone;

	void *rxbuf[MAX_RX_URBS];

	dma_addr_t rxbuf_dma[MAX_RX_URBS];

	void *rxbuf[ESD_USB_MAX_RX_URBS];

	dma_addr_t rxbuf_dma[ESD_USB_MAX_RX_URBS];

};



struct esd_usb_net_priv {
@@ -217,7 +211,7 @@ struct esd_usb_net_priv { 


	atomic_t active_tx_jobs;

	struct usb_anchor tx_submitted;

	struct esd_tx_urb_context tx_contexts[MAX_TX_URBS];

	struct esd_tx_urb_context tx_contexts[ESD_USB_MAX_TX_URBS];



	struct esd_usb *usb;

	struct net_device *netdev;
@@ -232,7 +226,7 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv, 
	struct net_device_stats *stats = &priv->netdev->stats;

	struct can_frame *cf;

	struct sk_buff *skb;

	u32 id = le32_to_cpu(msg->rx.id) & ESD_IDMASK;

	u32 id = le32_to_cpu(msg->rx.id) & ESD_USB_IDMASK;



	if (id == ESD_EV_CAN_ERROR_EXT) {

		u8 state = msg->rx.ev_can_err_ext.status;
@@ -261,15 +255,15 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv, 


			priv->old_state = state;



			switch (state & ESD_BUSSTATE_MASK) {

			case ESD_BUSSTATE_BUSOFF:

			switch (state & ESD_USB_BUSSTATE_MASK) {

			case ESD_USB_BUSSTATE_BUSOFF:

				new_state = CAN_STATE_BUS_OFF;

				can_bus_off(priv->netdev);

				break;

			case ESD_BUSSTATE_WARN:

			case ESD_USB_BUSSTATE_WARN:

				new_state = CAN_STATE_ERROR_WARNING;

				break;

			case ESD_BUSSTATE_ERRPASSIVE:

			case ESD_USB_BUSSTATE_ERRPASSIVE:

				new_state = CAN_STATE_ERROR_PASSIVE;

				break;

			default:
@@ -291,14 +285,14 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv, 


			cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;



			switch (ecc & SJA1000_ECC_MASK) {

			case SJA1000_ECC_BIT:

			switch (ecc & ESD_USB_SJA1000_ECC_MASK) {

			case ESD_USB_SJA1000_ECC_BIT:

				cf->data[2] |= CAN_ERR_PROT_BIT;

				break;

			case SJA1000_ECC_FORM:

			case ESD_USB_SJA1000_ECC_FORM:

				cf->data[2] |= CAN_ERR_PROT_FORM;

				break;

			case SJA1000_ECC_STUFF:

			case ESD_USB_SJA1000_ECC_STUFF:

				cf->data[2] |= CAN_ERR_PROT_STUFF;

				break;

			default:
@@ -306,11 +300,11 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv, 
			}



			/* Error occurred during transmission? */

			if (!(ecc & SJA1000_ECC_DIR))

			if (!(ecc & ESD_USB_SJA1000_ECC_DIR))

				cf->data[2] |= CAN_ERR_PROT_TX;



			/* Bit stream position in CAN frame as the error was detected */

			cf->data[3] = ecc & SJA1000_ECC_SEG;

			cf->data[3] = ecc & ESD_USB_SJA1000_ECC_SEG;

		}



		if (skb) {
@@ -337,7 +331,7 @@ static void esd_usb_rx_can_msg(struct esd_usb_net_priv *priv, 


	id = le32_to_cpu(msg->rx.id);



	if (id & ESD_EVENT) {

	if (id & ESD_USB_EVENT) {

		esd_usb_rx_event(priv, msg);

	} else {

		skb = alloc_can_skb(priv->netdev, &cf);
@@ -346,11 +340,11 @@ static void esd_usb_rx_can_msg(struct esd_usb_net_priv *priv, 
			return;

		}



		cf->can_id = id & ESD_IDMASK;

		cf->can_id = id & ESD_USB_IDMASK;

		can_frame_set_cc_len(cf, msg->rx.dlc & ~ESD_RTR,

				     priv->can.ctrlmode);



		if (id & ESD_EXTID)

		if (id & ESD_USB_EXTID)

			cf->can_id |= CAN_EFF_FLAG;



		if (msg->rx.dlc & ESD_RTR) {
@@ -377,7 +371,7 @@ static void esd_usb_tx_done_msg(struct esd_usb_net_priv *priv, 
	if (!netif_device_present(netdev))

		return;



	context = &priv->tx_contexts[msg->txdone.hnd & (MAX_TX_URBS - 1)];

	context = &priv->tx_contexts[msg->txdone.hnd & (ESD_USB_MAX_TX_URBS - 1)];



	if (!msg->txdone.status) {

		stats->tx_packets++;
@@ -389,7 +383,7 @@ static void esd_usb_tx_done_msg(struct esd_usb_net_priv *priv, 
	}



	/* Release context */

	context->echo_index = MAX_TX_URBS;

	context->echo_index = ESD_USB_MAX_TX_URBS;

	atomic_dec(&priv->active_tx_jobs);



	netif_wake_queue(netdev);
@@ -424,7 +418,7 @@ static void esd_usb_read_bulk_callback(struct urb *urb) 
		msg = (union esd_usb_msg *)(urb->transfer_buffer + pos);



		switch (msg->hdr.cmd) {

		case CMD_CAN_RX:

		case ESD_USB_CMD_CAN_RX:

			if (msg->rx.net >= dev->net_count) {

				dev_err(dev->udev->dev.parent, "format error\n");

				break;
@@ -433,7 +427,7 @@ static void esd_usb_read_bulk_callback(struct urb *urb) 
			esd_usb_rx_can_msg(dev->nets[msg->rx.net], msg);

			break;



		case CMD_CAN_TX:

		case ESD_USB_CMD_CAN_TX:

			if (msg->txdone.net >= dev->net_count) {

				dev_err(dev->udev->dev.parent, "format error\n");

				break;
@@ -444,7 +438,7 @@ static void esd_usb_read_bulk_callback(struct urb *urb) 
			break;

		}



		pos += msg->hdr.len << 2;

		pos += msg->hdr.len * sizeof(u32); /* convert to # of bytes */



		if (pos > urb->actual_length) {

			dev_err(dev->udev->dev.parent, "format error\n");
@@ -454,7 +448,7 @@ static void esd_usb_read_bulk_callback(struct urb *urb) 


resubmit_urb:

	usb_fill_bulk_urb(urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),

			  urb->transfer_buffer, RX_BUFFER_SIZE,

			  urb->transfer_buffer, ESD_USB_RX_BUFFER_SIZE,

			  esd_usb_read_bulk_callback, dev);



	retval = usb_submit_urb(urb, GFP_ATOMIC);
@@ -538,7 +532,7 @@ static int esd_usb_send_msg(struct esd_usb *dev, union esd_usb_msg *msg) 
	return usb_bulk_msg(dev->udev,

			    usb_sndbulkpipe(dev->udev, 2),

			    msg,

			    msg->hdr.len << 2,

			    msg->hdr.len * sizeof(u32), /* convert to # of bytes */

			    &actual_length,

			    1000);

}
@@ -563,7 +557,7 @@ static int esd_usb_setup_rx_urbs(struct esd_usb *dev) 
	if (dev->rxinitdone)

		return 0;



	for (i = 0; i < MAX_RX_URBS; i++) {

	for (i = 0; i < ESD_USB_MAX_RX_URBS; i++) {

		struct urb *urb = NULL;

		u8 *buf = NULL;

		dma_addr_t buf_dma;
@@ -575,7 +569,7 @@ static int esd_usb_setup_rx_urbs(struct esd_usb *dev) 
			break;

		}



		buf = usb_alloc_coherent(dev->udev, RX_BUFFER_SIZE, GFP_KERNEL,

		buf = usb_alloc_coherent(dev->udev, ESD_USB_RX_BUFFER_SIZE, GFP_KERNEL,

					 &buf_dma);

		if (!buf) {

			dev_warn(dev->udev->dev.parent,
@@ -588,7 +582,7 @@ static int esd_usb_setup_rx_urbs(struct esd_usb *dev) 


		usb_fill_bulk_urb(urb, dev->udev,

				  usb_rcvbulkpipe(dev->udev, 1),

				  buf, RX_BUFFER_SIZE,

				  buf, ESD_USB_RX_BUFFER_SIZE,

				  esd_usb_read_bulk_callback, dev);

		urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;

		usb_anchor_urb(urb, &dev->rx_submitted);
@@ -596,7 +590,7 @@ static int esd_usb_setup_rx_urbs(struct esd_usb *dev) 
		err = usb_submit_urb(urb, GFP_KERNEL);

		if (err) {

			usb_unanchor_urb(urb);

			usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf,

			usb_free_coherent(dev->udev, ESD_USB_RX_BUFFER_SIZE, buf,

					  urb->transfer_dma);

			goto freeurb;

		}
@@ -618,7 +612,7 @@ static int esd_usb_setup_rx_urbs(struct esd_usb *dev) 
	}



	/* Warn if we've couldn't transmit all the URBs */

	if (i < MAX_RX_URBS) {

	if (i < ESD_USB_MAX_RX_URBS) {

		dev_warn(dev->udev->dev.parent,

			 "rx performance may be slow\n");

	}
@@ -653,14 +647,14 @@ static int esd_usb_start(struct esd_usb_net_priv *priv) 
	 * the number of the starting bitmask (0..64) to the filter.option

	 * field followed by only some bitmasks.

	 */

	msg->hdr.cmd = CMD_IDADD;

	msg->hdr.len = 2 + ESD_MAX_ID_SEGMENT;

	msg->hdr.cmd = ESD_USB_CMD_IDADD;

	msg->hdr.len = sizeof(struct esd_usb_id_filter_msg) / sizeof(u32); /* # of 32bit words */

	msg->filter.net = priv->index;

	msg->filter.option = ESD_ID_ENABLE; /* start with segment 0 */

	for (i = 0; i < ESD_MAX_ID_SEGMENT; i++)

	msg->filter.option = ESD_USB_ID_ENABLE; /* start with segment 0 */

	for (i = 0; i < ESD_USB_MAX_ID_SEGMENT; i++)

		msg->filter.mask[i] = cpu_to_le32(0xffffffff);

	/* enable 29bit extended IDs */

	msg->filter.mask[ESD_MAX_ID_SEGMENT] = cpu_to_le32(0x00000001);

	msg->filter.mask[ESD_USB_MAX_ID_SEGMENT] = cpu_to_le32(0x00000001);



	err = esd_usb_send_msg(dev, msg);

	if (err)
@@ -689,8 +683,8 @@ static void unlink_all_urbs(struct esd_usb *dev) 


	usb_kill_anchored_urbs(&dev->rx_submitted);



	for (i = 0; i < MAX_RX_URBS; ++i)

		usb_free_coherent(dev->udev, RX_BUFFER_SIZE,

	for (i = 0; i < ESD_USB_MAX_RX_URBS; ++i)

		usb_free_coherent(dev->udev, ESD_USB_RX_BUFFER_SIZE,

				  dev->rxbuf[i], dev->rxbuf_dma[i]);



	for (i = 0; i < dev->net_count; i++) {
@@ -699,8 +693,8 @@ static void unlink_all_urbs(struct esd_usb *dev) 
			usb_kill_anchored_urbs(&priv->tx_submitted);

			atomic_set(&priv->active_tx_jobs, 0);



			for (j = 0; j < MAX_TX_URBS; j++)

				priv->tx_contexts[j].echo_index = MAX_TX_URBS;

			for (j = 0; j < ESD_USB_MAX_TX_URBS; j++)

				priv->tx_contexts[j].echo_index = ESD_USB_MAX_TX_URBS;

		}

	}

}
@@ -765,8 +759,9 @@ static netdev_tx_t esd_usb_start_xmit(struct sk_buff *skb, 


	msg = (union esd_usb_msg *)buf;



	msg->hdr.len = 3; /* minimal length */

	msg->hdr.cmd = CMD_CAN_TX;

	/* minimal length as # of 32bit words */

	msg->hdr.len = offsetof(struct esd_usb_tx_msg, data) / sizeof(u32);

	msg->hdr.cmd = ESD_USB_CMD_CAN_TX;

	msg->tx.net = priv->index;

	msg->tx.dlc = can_get_cc_dlc(cf, priv->can.ctrlmode);

	msg->tx.id = cpu_to_le32(cf->can_id & CAN_ERR_MASK);
@@ -775,15 +770,16 @@ static netdev_tx_t esd_usb_start_xmit(struct sk_buff *skb, 
		msg->tx.dlc |= ESD_RTR;



	if (cf->can_id & CAN_EFF_FLAG)

		msg->tx.id |= cpu_to_le32(ESD_EXTID);

		msg->tx.id |= cpu_to_le32(ESD_USB_EXTID);



	for (i = 0; i < cf->len; i++)

		msg->tx.data[i] = cf->data[i];



	msg->hdr.len += (cf->len + 3) >> 2;

	/* round up, then divide by 4 to add the payload length as # of 32bit words */

	msg->hdr.len += DIV_ROUND_UP(cf->len, sizeof(u32));



	for (i = 0; i < MAX_TX_URBS; i++) {

		if (priv->tx_contexts[i].echo_index == MAX_TX_URBS) {

	for (i = 0; i < ESD_USB_MAX_TX_URBS; i++) {

		if (priv->tx_contexts[i].echo_index == ESD_USB_MAX_TX_URBS) {

			context = &priv->tx_contexts[i];

			break;

		}
@@ -803,7 +799,7 @@ static netdev_tx_t esd_usb_start_xmit(struct sk_buff *skb, 
	msg->tx.hnd = 0x80000000 | i; /* returned in TX done message */



	usb_fill_bulk_urb(urb, dev->udev, usb_sndbulkpipe(dev->udev, 2), buf,

			  msg->hdr.len << 2,

			  msg->hdr.len * sizeof(u32), /* convert to # of bytes */

			  esd_usb_write_bulk_callback, context);



	urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
@@ -815,7 +811,7 @@ static netdev_tx_t esd_usb_start_xmit(struct sk_buff *skb, 
	atomic_inc(&priv->active_tx_jobs);



	/* Slow down tx path */

	if (atomic_read(&priv->active_tx_jobs) >= MAX_TX_URBS)

	if (atomic_read(&priv->active_tx_jobs) >= ESD_USB_MAX_TX_URBS)

		netif_stop_queue(netdev);



	err = usb_submit_urb(urb, GFP_ATOMIC);
@@ -865,18 +861,18 @@ static int esd_usb_close(struct net_device *netdev) 
		return -ENOMEM;



	/* Disable all IDs (see esd_usb_start()) */

	msg->hdr.cmd = CMD_IDADD;

	msg->hdr.len = 2 + ESD_MAX_ID_SEGMENT;

	msg->hdr.cmd = ESD_USB_CMD_IDADD;

	msg->hdr.len = sizeof(struct esd_usb_id_filter_msg) / sizeof(u32);/* # of 32bit words */

	msg->filter.net = priv->index;

	msg->filter.option = ESD_ID_ENABLE; /* start with segment 0 */

	for (i = 0; i <= ESD_MAX_ID_SEGMENT; i++)

	msg->filter.option = ESD_USB_ID_ENABLE; /* start with segment 0 */

	for (i = 0; i <= ESD_USB_MAX_ID_SEGMENT; i++)

		msg->filter.mask[i] = 0;

	if (esd_usb_send_msg(priv->usb, msg) < 0)

		netdev_err(netdev, "sending idadd message failed\n");



	/* set CAN controller to reset mode */

	msg->hdr.len = 2;

	msg->hdr.cmd = CMD_SETBAUD;

	msg->hdr.len = sizeof(struct esd_usb_set_baudrate_msg) / sizeof(u32); /* # of 32bit words */

	msg->hdr.cmd = ESD_USB_CMD_SETBAUD;

	msg->setbaud.net = priv->index;

	msg->setbaud.rsvd = 0;

	msg->setbaud.baud = cpu_to_le32(ESD_USB_NO_BAUDRATE);
@@ -905,20 +901,21 @@ static const struct ethtool_ops esd_usb_ethtool_ops = { 
	.get_ts_info = ethtool_op_get_ts_info,

};



static const struct can_bittiming_const esd_usb2_bittiming_const = {

	.name = "esd_usb2",

	.tseg1_min = ESD_USB2_TSEG1_MIN,

	.tseg1_max = ESD_USB2_TSEG1_MAX,

	.tseg2_min = ESD_USB2_TSEG2_MIN,

	.tseg2_max = ESD_USB2_TSEG2_MAX,

	.sjw_max = ESD_USB2_SJW_MAX,

	.brp_min = ESD_USB2_BRP_MIN,

	.brp_max = ESD_USB2_BRP_MAX,

	.brp_inc = ESD_USB2_BRP_INC,

static const struct can_bittiming_const esd_usb_2_bittiming_const = {

	.name = "esd_usb_2",

	.tseg1_min = 1,

	.tseg1_max = 16,

	.tseg2_min = 1,

	.tseg2_max = 8,

	.sjw_max = 4,

	.brp_min = 1,

	.brp_max = 1024,

	.brp_inc = 1,

};



static int esd_usb2_set_bittiming(struct net_device *netdev)

static int esd_usb_2_set_bittiming(struct net_device *netdev)

{

	const struct can_bittiming_const *btc = &esd_usb_2_bittiming_const;

	struct esd_usb_net_priv *priv = netdev_priv(netdev);

	struct can_bittiming *bt = &priv->can.bittiming;

	union esd_usb_msg *msg;
@@ -930,35 +927,35 @@ static int esd_usb2_set_bittiming(struct net_device *netdev) 
	if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)

		canbtr |= ESD_USB_LOM;



	canbtr |= (bt->brp - 1) & (ESD_USB2_BRP_MAX - 1);

	canbtr |= (bt->brp - 1) & (btc->brp_max - 1);



	if (le16_to_cpu(priv->usb->udev->descriptor.idProduct) ==

	    USB_CANUSBM_PRODUCT_ID)

		sjw_shift = ESD_USBM_SJW_SHIFT;

	    ESD_USB_CANUSBM_PRODUCT_ID)

		sjw_shift = ESD_USB_M_SJW_SHIFT;

	else

		sjw_shift = ESD_USB2_SJW_SHIFT;

		sjw_shift = ESD_USB_2_SJW_SHIFT;



	canbtr |= ((bt->sjw - 1) & (ESD_USB2_SJW_MAX - 1))

	canbtr |= ((bt->sjw - 1) & (btc->sjw_max - 1))

		<< sjw_shift;

	canbtr |= ((bt->prop_seg + bt->phase_seg1 - 1)

		   & (ESD_USB2_TSEG1_MAX - 1))

		<< ESD_USB2_TSEG1_SHIFT;

	canbtr |= ((bt->phase_seg2 - 1) & (ESD_USB2_TSEG2_MAX - 1))

		<< ESD_USB2_TSEG2_SHIFT;

		   & (btc->tseg1_max - 1))

		<< ESD_USB_2_TSEG1_SHIFT;

	canbtr |= ((bt->phase_seg2 - 1) & (btc->tseg2_max - 1))

		<< ESD_USB_2_TSEG2_SHIFT;

	if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)

		canbtr |= ESD_USB2_3_SAMPLES;

		canbtr |= ESD_USB_TRIPLE_SAMPLES;



	msg = kmalloc(sizeof(*msg), GFP_KERNEL);

	if (!msg)

		return -ENOMEM;



	msg->hdr.len = 2;

	msg->hdr.cmd = CMD_SETBAUD;

	msg->hdr.len = sizeof(struct esd_usb_set_baudrate_msg) / sizeof(u32); /* # of 32bit words */

	msg->hdr.cmd = ESD_USB_CMD_SETBAUD;

	msg->setbaud.net = priv->index;

	msg->setbaud.rsvd = 0;

	msg->setbaud.baud = cpu_to_le32(canbtr);



	netdev_info(netdev, "setting BTR=%#x\n", canbtr);

	netdev_dbg(netdev, "setting BTR=%#x\n", canbtr);



	err = esd_usb_send_msg(priv->usb, msg);
@@ -999,7 +996,7 @@ static int esd_usb_probe_one_net(struct usb_interface *intf, int index) 
	int err = 0;

	int i;



	netdev = alloc_candev(sizeof(*priv), MAX_TX_URBS);

	netdev = alloc_candev(sizeof(*priv), ESD_USB_MAX_TX_URBS);

	if (!netdev) {

		dev_err(&intf->dev, "couldn't alloc candev\n");

		err = -ENOMEM;
@@ -1011,8 +1008,8 @@ static int esd_usb_probe_one_net(struct usb_interface *intf, int index) 
	init_usb_anchor(&priv->tx_submitted);

	atomic_set(&priv->active_tx_jobs, 0);



	for (i = 0; i < MAX_TX_URBS; i++)

		priv->tx_contexts[i].echo_index = MAX_TX_URBS;

	for (i = 0; i < ESD_USB_MAX_TX_URBS; i++)

		priv->tx_contexts[i].echo_index = ESD_USB_MAX_TX_URBS;



	priv->usb = dev;

	priv->netdev = netdev;
@@ -1024,15 +1021,15 @@ static int esd_usb_probe_one_net(struct usb_interface *intf, int index) 
		CAN_CTRLMODE_BERR_REPORTING;



	if (le16_to_cpu(dev->udev->descriptor.idProduct) ==

	    USB_CANUSBM_PRODUCT_ID)

		priv->can.clock.freq = ESD_USBM_CAN_CLOCK;

	    ESD_USB_CANUSBM_PRODUCT_ID)

		priv->can.clock.freq = ESD_USB_M_CAN_CLOCK;

	else {

		priv->can.clock.freq = ESD_USB2_CAN_CLOCK;

		priv->can.clock.freq = ESD_USB_2_CAN_CLOCK;

		priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;

	}



	priv->can.bittiming_const = &esd_usb2_bittiming_const;

	priv->can.do_set_bittiming = esd_usb2_set_bittiming;

	priv->can.bittiming_const = &esd_usb_2_bittiming_const;

	priv->can.do_set_bittiming = esd_usb_2_set_bittiming;

	priv->can.do_set_mode = esd_usb_set_mode;

	priv->can.do_get_berr_counter = esd_usb_get_berr_counter;
@@ -1090,8 +1087,8 @@ static int esd_usb_probe(struct usb_interface *intf, 
	}



	/* query number of CAN interfaces (nets) */

	msg->hdr.cmd = CMD_VERSION;

	msg->hdr.len = 2;

	msg->hdr.cmd = ESD_USB_CMD_VERSION;

	msg->hdr.len = sizeof(struct esd_usb_version_msg) / sizeof(u32); /* # of 32bit words */

	msg->version.rsvd = 0;

	msg->version.flags = 0;

	msg->version.drv_version = 0;