Eric Lee / smarc-ti-linux-kernel

3
Download as
Browse Code ยป

Commit b442723fcec445fb0ae1104888dd22cd285e0a91

Authored by Ahmed S. Darwish
Committed by Marc Kleine-Budde
1 parent 47e3485af0
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

can: kvaser_usb: Don't free packets when tight on URBs 

Flooding the Kvaser CAN to USB dongle with multiple reads and
writes in high frequency caused seemingly-random panics in the
kernel.

On further inspection, it seems the driver erroneously freed the
to-be-transmitted packet upon getting tight on URBs and returning
NETDEV_TX_BUSY, leading to invalid memory writes and double frees
at a later point in time.

Note:

Finding no more URBs/transmit-contexts and returning NETDEV_TX_BUSY
is a driver bug in and out of itself: it means that our start/stop
queue flow control is broken.

This patch only fixes the (buggy) error handling code; the root
cause shall be fixed in a later commit.

Acked-by: Olivier Sobrie <olivier@sobrie.be>
Signed-off-by: Ahmed S. Darwish <ahmed.darwish@valeo.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Showing 1 changed file with 4 additions and 6 deletions Inline Diff

drivers/net/can/usb/kvaser_usb.c
Diff comments   View file @ b442723
1 /* 1 /*
2 * This program is free software; you can redistribute it and/or 2 * This program is free software; you can redistribute it and/or
3 * modify it under the terms of the GNU General Public License as 3 * modify it under the terms of the GNU General Public License as
4 * published by the Free Software Foundation version 2. 4 * published by the Free Software Foundation version 2.
5 * 5 *
6 * Parts of this driver are based on the following: 6 * Parts of this driver are based on the following:
7 * - Kvaser linux leaf driver (version 4.78) 7 * - Kvaser linux leaf driver (version 4.78)
8 * - CAN driver for esd CAN-USB/2 8 * - CAN driver for esd CAN-USB/2
9 * 9 *
10 * Copyright (C) 2002-2006 KVASER AB, Sweden. All rights reserved. 10 * Copyright (C) 2002-2006 KVASER AB, Sweden. All rights reserved.
11 * Copyright (C) 2010 Matthias Fuchs <matthias.fuchs@esd.eu>, esd gmbh 11 * Copyright (C) 2010 Matthias Fuchs <matthias.fuchs@esd.eu>, esd gmbh
12 * Copyright (C) 2012 Olivier Sobrie <olivier@sobrie.be> 12 * Copyright (C) 2012 Olivier Sobrie <olivier@sobrie.be>
13 */ 13 */
14 14
15 #include <linux/completion.h> 15 #include <linux/completion.h>
16 #include <linux/module.h> 16 #include <linux/module.h>
17 #include <linux/netdevice.h> 17 #include <linux/netdevice.h>
18 #include <linux/usb.h> 18 #include <linux/usb.h>
19 19
20 #include <linux/can.h> 20 #include <linux/can.h>
21 #include <linux/can/dev.h> 21 #include <linux/can/dev.h>
22 #include <linux/can/error.h> 22 #include <linux/can/error.h>
23 23
24 #define MAX_TX_URBS 16 24 #define MAX_TX_URBS 16
25 #define MAX_RX_URBS 4 25 #define MAX_RX_URBS 4
26 #define START_TIMEOUT 1000 /* msecs */ 26 #define START_TIMEOUT 1000 /* msecs */
27 #define STOP_TIMEOUT 1000 /* msecs */ 27 #define STOP_TIMEOUT 1000 /* msecs */
28 #define USB_SEND_TIMEOUT 1000 /* msecs */ 28 #define USB_SEND_TIMEOUT 1000 /* msecs */
29 #define USB_RECV_TIMEOUT 1000 /* msecs */ 29 #define USB_RECV_TIMEOUT 1000 /* msecs */
30 #define RX_BUFFER_SIZE 3072 30 #define RX_BUFFER_SIZE 3072
31 #define CAN_USB_CLOCK 8000000 31 #define CAN_USB_CLOCK 8000000
32 #define MAX_NET_DEVICES 3 32 #define MAX_NET_DEVICES 3
33 33
34 /* Kvaser USB devices */ 34 /* Kvaser USB devices */
35 #define KVASER_VENDOR_ID 0x0bfd 35 #define KVASER_VENDOR_ID 0x0bfd
36 #define USB_LEAF_DEVEL_PRODUCT_ID 10 36 #define USB_LEAF_DEVEL_PRODUCT_ID 10
37 #define USB_LEAF_LITE_PRODUCT_ID 11 37 #define USB_LEAF_LITE_PRODUCT_ID 11
38 #define USB_LEAF_PRO_PRODUCT_ID 12 38 #define USB_LEAF_PRO_PRODUCT_ID 12
39 #define USB_LEAF_SPRO_PRODUCT_ID 14 39 #define USB_LEAF_SPRO_PRODUCT_ID 14
40 #define USB_LEAF_PRO_LS_PRODUCT_ID 15 40 #define USB_LEAF_PRO_LS_PRODUCT_ID 15
41 #define USB_LEAF_PRO_SWC_PRODUCT_ID 16 41 #define USB_LEAF_PRO_SWC_PRODUCT_ID 16
42 #define USB_LEAF_PRO_LIN_PRODUCT_ID 17 42 #define USB_LEAF_PRO_LIN_PRODUCT_ID 17
43 #define USB_LEAF_SPRO_LS_PRODUCT_ID 18 43 #define USB_LEAF_SPRO_LS_PRODUCT_ID 18
44 #define USB_LEAF_SPRO_SWC_PRODUCT_ID 19 44 #define USB_LEAF_SPRO_SWC_PRODUCT_ID 19
45 #define USB_MEMO2_DEVEL_PRODUCT_ID 22 45 #define USB_MEMO2_DEVEL_PRODUCT_ID 22
46 #define USB_MEMO2_HSHS_PRODUCT_ID 23 46 #define USB_MEMO2_HSHS_PRODUCT_ID 23
47 #define USB_UPRO_HSHS_PRODUCT_ID 24 47 #define USB_UPRO_HSHS_PRODUCT_ID 24
48 #define USB_LEAF_LITE_GI_PRODUCT_ID 25 48 #define USB_LEAF_LITE_GI_PRODUCT_ID 25
49 #define USB_LEAF_PRO_OBDII_PRODUCT_ID 26 49 #define USB_LEAF_PRO_OBDII_PRODUCT_ID 26
50 #define USB_MEMO2_HSLS_PRODUCT_ID 27 50 #define USB_MEMO2_HSLS_PRODUCT_ID 27
51 #define USB_LEAF_LITE_CH_PRODUCT_ID 28 51 #define USB_LEAF_LITE_CH_PRODUCT_ID 28
52 #define USB_BLACKBIRD_SPRO_PRODUCT_ID 29 52 #define USB_BLACKBIRD_SPRO_PRODUCT_ID 29
53 #define USB_OEM_MERCURY_PRODUCT_ID 34 53 #define USB_OEM_MERCURY_PRODUCT_ID 34
54 #define USB_OEM_LEAF_PRODUCT_ID 35 54 #define USB_OEM_LEAF_PRODUCT_ID 35
55 #define USB_CAN_R_PRODUCT_ID 39 55 #define USB_CAN_R_PRODUCT_ID 39
56 #define USB_LEAF_LITE_V2_PRODUCT_ID 288 56 #define USB_LEAF_LITE_V2_PRODUCT_ID 288
57 #define USB_MINI_PCIE_HS_PRODUCT_ID 289 57 #define USB_MINI_PCIE_HS_PRODUCT_ID 289
58 58
59 /* USB devices features */ 59 /* USB devices features */
60 #define KVASER_HAS_SILENT_MODE BIT(0) 60 #define KVASER_HAS_SILENT_MODE BIT(0)
61 #define KVASER_HAS_TXRX_ERRORS BIT(1) 61 #define KVASER_HAS_TXRX_ERRORS BIT(1)
62 62
63 /* Message header size */ 63 /* Message header size */
64 #define MSG_HEADER_LEN 2 64 #define MSG_HEADER_LEN 2
65 65
66 /* Can message flags */ 66 /* Can message flags */
67 #define MSG_FLAG_ERROR_FRAME BIT(0) 67 #define MSG_FLAG_ERROR_FRAME BIT(0)
68 #define MSG_FLAG_OVERRUN BIT(1) 68 #define MSG_FLAG_OVERRUN BIT(1)
69 #define MSG_FLAG_NERR BIT(2) 69 #define MSG_FLAG_NERR BIT(2)
70 #define MSG_FLAG_WAKEUP BIT(3) 70 #define MSG_FLAG_WAKEUP BIT(3)
71 #define MSG_FLAG_REMOTE_FRAME BIT(4) 71 #define MSG_FLAG_REMOTE_FRAME BIT(4)
72 #define MSG_FLAG_RESERVED BIT(5) 72 #define MSG_FLAG_RESERVED BIT(5)
73 #define MSG_FLAG_TX_ACK BIT(6) 73 #define MSG_FLAG_TX_ACK BIT(6)
74 #define MSG_FLAG_TX_REQUEST BIT(7) 74 #define MSG_FLAG_TX_REQUEST BIT(7)
75 75
76 /* Can states */ 76 /* Can states */
77 #define M16C_STATE_BUS_RESET BIT(0) 77 #define M16C_STATE_BUS_RESET BIT(0)
78 #define M16C_STATE_BUS_ERROR BIT(4) 78 #define M16C_STATE_BUS_ERROR BIT(4)
79 #define M16C_STATE_BUS_PASSIVE BIT(5) 79 #define M16C_STATE_BUS_PASSIVE BIT(5)
80 #define M16C_STATE_BUS_OFF BIT(6) 80 #define M16C_STATE_BUS_OFF BIT(6)
81 81
82 /* Can msg ids */ 82 /* Can msg ids */
83 #define CMD_RX_STD_MESSAGE 12 83 #define CMD_RX_STD_MESSAGE 12
84 #define CMD_TX_STD_MESSAGE 13 84 #define CMD_TX_STD_MESSAGE 13
85 #define CMD_RX_EXT_MESSAGE 14 85 #define CMD_RX_EXT_MESSAGE 14
86 #define CMD_TX_EXT_MESSAGE 15 86 #define CMD_TX_EXT_MESSAGE 15
87 #define CMD_SET_BUS_PARAMS 16 87 #define CMD_SET_BUS_PARAMS 16
88 #define CMD_GET_BUS_PARAMS 17 88 #define CMD_GET_BUS_PARAMS 17
89 #define CMD_GET_BUS_PARAMS_REPLY 18 89 #define CMD_GET_BUS_PARAMS_REPLY 18
90 #define CMD_GET_CHIP_STATE 19 90 #define CMD_GET_CHIP_STATE 19
91 #define CMD_CHIP_STATE_EVENT 20 91 #define CMD_CHIP_STATE_EVENT 20
92 #define CMD_SET_CTRL_MODE 21 92 #define CMD_SET_CTRL_MODE 21
93 #define CMD_GET_CTRL_MODE 22 93 #define CMD_GET_CTRL_MODE 22
94 #define CMD_GET_CTRL_MODE_REPLY 23 94 #define CMD_GET_CTRL_MODE_REPLY 23
95 #define CMD_RESET_CHIP 24 95 #define CMD_RESET_CHIP 24
96 #define CMD_RESET_CARD 25 96 #define CMD_RESET_CARD 25
97 #define CMD_START_CHIP 26 97 #define CMD_START_CHIP 26
98 #define CMD_START_CHIP_REPLY 27 98 #define CMD_START_CHIP_REPLY 27
99 #define CMD_STOP_CHIP 28 99 #define CMD_STOP_CHIP 28
100 #define CMD_STOP_CHIP_REPLY 29 100 #define CMD_STOP_CHIP_REPLY 29
101 #define CMD_GET_CARD_INFO2 32 101 #define CMD_GET_CARD_INFO2 32
102 #define CMD_GET_CARD_INFO 34 102 #define CMD_GET_CARD_INFO 34
103 #define CMD_GET_CARD_INFO_REPLY 35 103 #define CMD_GET_CARD_INFO_REPLY 35
104 #define CMD_GET_SOFTWARE_INFO 38 104 #define CMD_GET_SOFTWARE_INFO 38
105 #define CMD_GET_SOFTWARE_INFO_REPLY 39 105 #define CMD_GET_SOFTWARE_INFO_REPLY 39
106 #define CMD_ERROR_EVENT 45 106 #define CMD_ERROR_EVENT 45
107 #define CMD_FLUSH_QUEUE 48 107 #define CMD_FLUSH_QUEUE 48
108 #define CMD_RESET_ERROR_COUNTER 49 108 #define CMD_RESET_ERROR_COUNTER 49
109 #define CMD_TX_ACKNOWLEDGE 50 109 #define CMD_TX_ACKNOWLEDGE 50
110 #define CMD_CAN_ERROR_EVENT 51 110 #define CMD_CAN_ERROR_EVENT 51
111 #define CMD_USB_THROTTLE 77 111 #define CMD_USB_THROTTLE 77
112 #define CMD_LOG_MESSAGE 106 112 #define CMD_LOG_MESSAGE 106
113 113
114 /* error factors */ 114 /* error factors */
115 #define M16C_EF_ACKE BIT(0) 115 #define M16C_EF_ACKE BIT(0)
116 #define M16C_EF_CRCE BIT(1) 116 #define M16C_EF_CRCE BIT(1)
117 #define M16C_EF_FORME BIT(2) 117 #define M16C_EF_FORME BIT(2)
118 #define M16C_EF_STFE BIT(3) 118 #define M16C_EF_STFE BIT(3)
119 #define M16C_EF_BITE0 BIT(4) 119 #define M16C_EF_BITE0 BIT(4)
120 #define M16C_EF_BITE1 BIT(5) 120 #define M16C_EF_BITE1 BIT(5)
121 #define M16C_EF_RCVE BIT(6) 121 #define M16C_EF_RCVE BIT(6)
122 #define M16C_EF_TRE BIT(7) 122 #define M16C_EF_TRE BIT(7)
123 123
124 /* bittiming parameters */ 124 /* bittiming parameters */
125 #define KVASER_USB_TSEG1_MIN 1 125 #define KVASER_USB_TSEG1_MIN 1
126 #define KVASER_USB_TSEG1_MAX 16 126 #define KVASER_USB_TSEG1_MAX 16
127 #define KVASER_USB_TSEG2_MIN 1 127 #define KVASER_USB_TSEG2_MIN 1
128 #define KVASER_USB_TSEG2_MAX 8 128 #define KVASER_USB_TSEG2_MAX 8
129 #define KVASER_USB_SJW_MAX 4 129 #define KVASER_USB_SJW_MAX 4
130 #define KVASER_USB_BRP_MIN 1 130 #define KVASER_USB_BRP_MIN 1
131 #define KVASER_USB_BRP_MAX 64 131 #define KVASER_USB_BRP_MAX 64
132 #define KVASER_USB_BRP_INC 1 132 #define KVASER_USB_BRP_INC 1
133 133
134 /* ctrl modes */ 134 /* ctrl modes */
135 #define KVASER_CTRL_MODE_NORMAL 1 135 #define KVASER_CTRL_MODE_NORMAL 1
136 #define KVASER_CTRL_MODE_SILENT 2 136 #define KVASER_CTRL_MODE_SILENT 2
137 #define KVASER_CTRL_MODE_SELFRECEPTION 3 137 #define KVASER_CTRL_MODE_SELFRECEPTION 3
138 #define KVASER_CTRL_MODE_OFF 4 138 #define KVASER_CTRL_MODE_OFF 4
139 139
140 /* log message */ 140 /* log message */
141 #define KVASER_EXTENDED_FRAME BIT(31) 141 #define KVASER_EXTENDED_FRAME BIT(31)
142 142
143 struct kvaser_msg_simple { 143 struct kvaser_msg_simple {
144 u8 tid; 144 u8 tid;
145 u8 channel; 145 u8 channel;
146 } __packed; 146 } __packed;
147 147
148 struct kvaser_msg_cardinfo { 148 struct kvaser_msg_cardinfo {
149 u8 tid; 149 u8 tid;
150 u8 nchannels; 150 u8 nchannels;
151 __le32 serial_number; 151 __le32 serial_number;
152 __le32 padding; 152 __le32 padding;
153 __le32 clock_resolution; 153 __le32 clock_resolution;
154 __le32 mfgdate; 154 __le32 mfgdate;
155 u8 ean[8]; 155 u8 ean[8];
156 u8 hw_revision; 156 u8 hw_revision;
157 u8 usb_hs_mode; 157 u8 usb_hs_mode;
158 __le16 padding2; 158 __le16 padding2;
159 } __packed; 159 } __packed;
160 160
161 struct kvaser_msg_cardinfo2 { 161 struct kvaser_msg_cardinfo2 {
162 u8 tid; 162 u8 tid;
163 u8 channel; 163 u8 channel;
164 u8 pcb_id[24]; 164 u8 pcb_id[24];
165 __le32 oem_unlock_code; 165 __le32 oem_unlock_code;
166 } __packed; 166 } __packed;
167 167
168 struct kvaser_msg_softinfo { 168 struct kvaser_msg_softinfo {
169 u8 tid; 169 u8 tid;
170 u8 channel; 170 u8 channel;
171 __le32 sw_options; 171 __le32 sw_options;
172 __le32 fw_version; 172 __le32 fw_version;
173 __le16 max_outstanding_tx; 173 __le16 max_outstanding_tx;
174 __le16 padding[9]; 174 __le16 padding[9];
175 } __packed; 175 } __packed;
176 176
177 struct kvaser_msg_busparams { 177 struct kvaser_msg_busparams {
178 u8 tid; 178 u8 tid;
179 u8 channel; 179 u8 channel;
180 __le32 bitrate; 180 __le32 bitrate;
181 u8 tseg1; 181 u8 tseg1;
182 u8 tseg2; 182 u8 tseg2;
183 u8 sjw; 183 u8 sjw;
184 u8 no_samp; 184 u8 no_samp;
185 } __packed; 185 } __packed;
186 186
187 struct kvaser_msg_tx_can { 187 struct kvaser_msg_tx_can {
188 u8 channel; 188 u8 channel;
189 u8 tid; 189 u8 tid;
190 u8 msg[14]; 190 u8 msg[14];
191 u8 padding; 191 u8 padding;
192 u8 flags; 192 u8 flags;
193 } __packed; 193 } __packed;
194 194
195 struct kvaser_msg_rx_can { 195 struct kvaser_msg_rx_can {
196 u8 channel; 196 u8 channel;
197 u8 flag; 197 u8 flag;
198 __le16 time[3]; 198 __le16 time[3];
199 u8 msg[14]; 199 u8 msg[14];
200 } __packed; 200 } __packed;
201 201
202 struct kvaser_msg_chip_state_event { 202 struct kvaser_msg_chip_state_event {
203 u8 tid; 203 u8 tid;
204 u8 channel; 204 u8 channel;
205 __le16 time[3]; 205 __le16 time[3];
206 u8 tx_errors_count; 206 u8 tx_errors_count;
207 u8 rx_errors_count; 207 u8 rx_errors_count;
208 u8 status; 208 u8 status;
209 u8 padding[3]; 209 u8 padding[3];
210 } __packed; 210 } __packed;
211 211
212 struct kvaser_msg_tx_acknowledge { 212 struct kvaser_msg_tx_acknowledge {
213 u8 channel; 213 u8 channel;
214 u8 tid; 214 u8 tid;
215 __le16 time[3]; 215 __le16 time[3];
216 u8 flags; 216 u8 flags;
217 u8 time_offset; 217 u8 time_offset;
218 } __packed; 218 } __packed;
219 219
220 struct kvaser_msg_error_event { 220 struct kvaser_msg_error_event {
221 u8 tid; 221 u8 tid;
222 u8 flags; 222 u8 flags;
223 __le16 time[3]; 223 __le16 time[3];
224 u8 channel; 224 u8 channel;
225 u8 padding; 225 u8 padding;
226 u8 tx_errors_count; 226 u8 tx_errors_count;
227 u8 rx_errors_count; 227 u8 rx_errors_count;
228 u8 status; 228 u8 status;
229 u8 error_factor; 229 u8 error_factor;
230 } __packed; 230 } __packed;
231 231
232 struct kvaser_msg_ctrl_mode { 232 struct kvaser_msg_ctrl_mode {
233 u8 tid; 233 u8 tid;
234 u8 channel; 234 u8 channel;
235 u8 ctrl_mode; 235 u8 ctrl_mode;
236 u8 padding[3]; 236 u8 padding[3];
237 } __packed; 237 } __packed;
238 238
239 struct kvaser_msg_flush_queue { 239 struct kvaser_msg_flush_queue {
240 u8 tid; 240 u8 tid;
241 u8 channel; 241 u8 channel;
242 u8 flags; 242 u8 flags;
243 u8 padding[3]; 243 u8 padding[3];
244 } __packed; 244 } __packed;
245 245
246 struct kvaser_msg_log_message { 246 struct kvaser_msg_log_message {
247 u8 channel; 247 u8 channel;
248 u8 flags; 248 u8 flags;
249 __le16 time[3]; 249 __le16 time[3];
250 u8 dlc; 250 u8 dlc;
251 u8 time_offset; 251 u8 time_offset;
252 __le32 id; 252 __le32 id;
253 u8 data[8]; 253 u8 data[8];
254 } __packed; 254 } __packed;
255 255
256 struct kvaser_msg { 256 struct kvaser_msg {
257 u8 len; 257 u8 len;
258 u8 id; 258 u8 id;
259 union { 259 union {
260 struct kvaser_msg_simple simple; 260 struct kvaser_msg_simple simple;
261 struct kvaser_msg_cardinfo cardinfo; 261 struct kvaser_msg_cardinfo cardinfo;
262 struct kvaser_msg_cardinfo2 cardinfo2; 262 struct kvaser_msg_cardinfo2 cardinfo2;
263 struct kvaser_msg_softinfo softinfo; 263 struct kvaser_msg_softinfo softinfo;
264 struct kvaser_msg_busparams busparams; 264 struct kvaser_msg_busparams busparams;
265 struct kvaser_msg_tx_can tx_can; 265 struct kvaser_msg_tx_can tx_can;
266 struct kvaser_msg_rx_can rx_can; 266 struct kvaser_msg_rx_can rx_can;
267 struct kvaser_msg_chip_state_event chip_state_event; 267 struct kvaser_msg_chip_state_event chip_state_event;
268 struct kvaser_msg_tx_acknowledge tx_acknowledge; 268 struct kvaser_msg_tx_acknowledge tx_acknowledge;
269 struct kvaser_msg_error_event error_event; 269 struct kvaser_msg_error_event error_event;
270 struct kvaser_msg_ctrl_mode ctrl_mode; 270 struct kvaser_msg_ctrl_mode ctrl_mode;
271 struct kvaser_msg_flush_queue flush_queue; 271 struct kvaser_msg_flush_queue flush_queue;
272 struct kvaser_msg_log_message log_message; 272 struct kvaser_msg_log_message log_message;
273 } u; 273 } u;
274 } __packed; 274 } __packed;
275 275
276 struct kvaser_usb_tx_urb_context { 276 struct kvaser_usb_tx_urb_context {
277 struct kvaser_usb_net_priv *priv; 277 struct kvaser_usb_net_priv *priv;
278 u32 echo_index; 278 u32 echo_index;
279 int dlc; 279 int dlc;
280 }; 280 };
281 281
282 struct kvaser_usb { 282 struct kvaser_usb {
283 struct usb_device *udev; 283 struct usb_device *udev;
284 struct kvaser_usb_net_priv *nets[MAX_NET_DEVICES]; 284 struct kvaser_usb_net_priv *nets[MAX_NET_DEVICES];
285 285
286 struct usb_endpoint_descriptor *bulk_in, *bulk_out; 286 struct usb_endpoint_descriptor *bulk_in, *bulk_out;
287 struct usb_anchor rx_submitted; 287 struct usb_anchor rx_submitted;
288 288
289 u32 fw_version; 289 u32 fw_version;
290 unsigned int nchannels; 290 unsigned int nchannels;
291 291
292 bool rxinitdone; 292 bool rxinitdone;
293 void *rxbuf[MAX_RX_URBS]; 293 void *rxbuf[MAX_RX_URBS];
294 dma_addr_t rxbuf_dma[MAX_RX_URBS]; 294 dma_addr_t rxbuf_dma[MAX_RX_URBS];
295 }; 295 };
296 296
297 struct kvaser_usb_net_priv { 297 struct kvaser_usb_net_priv {
298 struct can_priv can; 298 struct can_priv can;
299 299
300 atomic_t active_tx_urbs; 300 atomic_t active_tx_urbs;
301 struct usb_anchor tx_submitted; 301 struct usb_anchor tx_submitted;
302 struct kvaser_usb_tx_urb_context tx_contexts[MAX_TX_URBS]; 302 struct kvaser_usb_tx_urb_context tx_contexts[MAX_TX_URBS];
303 303
304 struct completion start_comp, stop_comp; 304 struct completion start_comp, stop_comp;
305 305
306 struct kvaser_usb *dev; 306 struct kvaser_usb *dev;
307 struct net_device *netdev; 307 struct net_device *netdev;
308 int channel; 308 int channel;
309 309
310 struct can_berr_counter bec; 310 struct can_berr_counter bec;
311 }; 311 };
312 312
313 static const struct usb_device_id kvaser_usb_table[] = { 313 static const struct usb_device_id kvaser_usb_table[] = {
314 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_DEVEL_PRODUCT_ID) }, 314 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_DEVEL_PRODUCT_ID) },
315 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_PRODUCT_ID) }, 315 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_PRODUCT_ID) },
316 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_PRODUCT_ID), 316 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_PRODUCT_ID),
317 .driver_info = KVASER_HAS_TXRX_ERRORS | 317 .driver_info = KVASER_HAS_TXRX_ERRORS |
318 KVASER_HAS_SILENT_MODE }, 318 KVASER_HAS_SILENT_MODE },
319 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_PRODUCT_ID), 319 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_PRODUCT_ID),
320 .driver_info = KVASER_HAS_TXRX_ERRORS | 320 .driver_info = KVASER_HAS_TXRX_ERRORS |
321 KVASER_HAS_SILENT_MODE }, 321 KVASER_HAS_SILENT_MODE },
322 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_LS_PRODUCT_ID), 322 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_LS_PRODUCT_ID),
323 .driver_info = KVASER_HAS_TXRX_ERRORS | 323 .driver_info = KVASER_HAS_TXRX_ERRORS |
324 KVASER_HAS_SILENT_MODE }, 324 KVASER_HAS_SILENT_MODE },
325 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_SWC_PRODUCT_ID), 325 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_SWC_PRODUCT_ID),
326 .driver_info = KVASER_HAS_TXRX_ERRORS | 326 .driver_info = KVASER_HAS_TXRX_ERRORS |
327 KVASER_HAS_SILENT_MODE }, 327 KVASER_HAS_SILENT_MODE },
328 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_LIN_PRODUCT_ID), 328 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_LIN_PRODUCT_ID),
329 .driver_info = KVASER_HAS_TXRX_ERRORS | 329 .driver_info = KVASER_HAS_TXRX_ERRORS |
330 KVASER_HAS_SILENT_MODE }, 330 KVASER_HAS_SILENT_MODE },
331 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_LS_PRODUCT_ID), 331 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_LS_PRODUCT_ID),
332 .driver_info = KVASER_HAS_TXRX_ERRORS | 332 .driver_info = KVASER_HAS_TXRX_ERRORS |
333 KVASER_HAS_SILENT_MODE }, 333 KVASER_HAS_SILENT_MODE },
334 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_SWC_PRODUCT_ID), 334 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_SWC_PRODUCT_ID),
335 .driver_info = KVASER_HAS_TXRX_ERRORS | 335 .driver_info = KVASER_HAS_TXRX_ERRORS |
336 KVASER_HAS_SILENT_MODE }, 336 KVASER_HAS_SILENT_MODE },
337 { USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_DEVEL_PRODUCT_ID), 337 { USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_DEVEL_PRODUCT_ID),
338 .driver_info = KVASER_HAS_TXRX_ERRORS | 338 .driver_info = KVASER_HAS_TXRX_ERRORS |
339 KVASER_HAS_SILENT_MODE }, 339 KVASER_HAS_SILENT_MODE },
340 { USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_HSHS_PRODUCT_ID), 340 { USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_HSHS_PRODUCT_ID),
341 .driver_info = KVASER_HAS_TXRX_ERRORS | 341 .driver_info = KVASER_HAS_TXRX_ERRORS |
342 KVASER_HAS_SILENT_MODE }, 342 KVASER_HAS_SILENT_MODE },
343 { USB_DEVICE(KVASER_VENDOR_ID, USB_UPRO_HSHS_PRODUCT_ID), 343 { USB_DEVICE(KVASER_VENDOR_ID, USB_UPRO_HSHS_PRODUCT_ID),
344 .driver_info = KVASER_HAS_TXRX_ERRORS }, 344 .driver_info = KVASER_HAS_TXRX_ERRORS },
345 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_GI_PRODUCT_ID) }, 345 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_GI_PRODUCT_ID) },
346 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_OBDII_PRODUCT_ID), 346 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_OBDII_PRODUCT_ID),
347 .driver_info = KVASER_HAS_TXRX_ERRORS | 347 .driver_info = KVASER_HAS_TXRX_ERRORS |
348 KVASER_HAS_SILENT_MODE }, 348 KVASER_HAS_SILENT_MODE },
349 { USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_HSLS_PRODUCT_ID), 349 { USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_HSLS_PRODUCT_ID),
350 .driver_info = KVASER_HAS_TXRX_ERRORS }, 350 .driver_info = KVASER_HAS_TXRX_ERRORS },
351 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_CH_PRODUCT_ID), 351 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_CH_PRODUCT_ID),
352 .driver_info = KVASER_HAS_TXRX_ERRORS }, 352 .driver_info = KVASER_HAS_TXRX_ERRORS },
353 { USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_SPRO_PRODUCT_ID), 353 { USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_SPRO_PRODUCT_ID),
354 .driver_info = KVASER_HAS_TXRX_ERRORS }, 354 .driver_info = KVASER_HAS_TXRX_ERRORS },
355 { USB_DEVICE(KVASER_VENDOR_ID, USB_OEM_MERCURY_PRODUCT_ID), 355 { USB_DEVICE(KVASER_VENDOR_ID, USB_OEM_MERCURY_PRODUCT_ID),
356 .driver_info = KVASER_HAS_TXRX_ERRORS }, 356 .driver_info = KVASER_HAS_TXRX_ERRORS },
357 { USB_DEVICE(KVASER_VENDOR_ID, USB_OEM_LEAF_PRODUCT_ID), 357 { USB_DEVICE(KVASER_VENDOR_ID, USB_OEM_LEAF_PRODUCT_ID),
358 .driver_info = KVASER_HAS_TXRX_ERRORS }, 358 .driver_info = KVASER_HAS_TXRX_ERRORS },
359 { USB_DEVICE(KVASER_VENDOR_ID, USB_CAN_R_PRODUCT_ID), 359 { USB_DEVICE(KVASER_VENDOR_ID, USB_CAN_R_PRODUCT_ID),
360 .driver_info = KVASER_HAS_TXRX_ERRORS }, 360 .driver_info = KVASER_HAS_TXRX_ERRORS },
361 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID) }, 361 { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID) },
362 { USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID) }, 362 { USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID) },
363 { } 363 { }
364 }; 364 };
365 MODULE_DEVICE_TABLE(usb, kvaser_usb_table); 365 MODULE_DEVICE_TABLE(usb, kvaser_usb_table);
366 366
367 static inline int kvaser_usb_send_msg(const struct kvaser_usb *dev, 367 static inline int kvaser_usb_send_msg(const struct kvaser_usb *dev,
368 struct kvaser_msg *msg) 368 struct kvaser_msg *msg)
369 { 369 {
370 int actual_len; 370 int actual_len;
371 371
372 return usb_bulk_msg(dev->udev, 372 return usb_bulk_msg(dev->udev,
373 usb_sndbulkpipe(dev->udev, 373 usb_sndbulkpipe(dev->udev,
374 dev->bulk_out->bEndpointAddress), 374 dev->bulk_out->bEndpointAddress),
375 msg, msg->len, &actual_len, 375 msg, msg->len, &actual_len,
376 USB_SEND_TIMEOUT); 376 USB_SEND_TIMEOUT);
377 } 377 }
378 378
379 static int kvaser_usb_wait_msg(const struct kvaser_usb *dev, u8 id, 379 static int kvaser_usb_wait_msg(const struct kvaser_usb *dev, u8 id,
380 struct kvaser_msg *msg) 380 struct kvaser_msg *msg)
381 { 381 {
382 struct kvaser_msg *tmp; 382 struct kvaser_msg *tmp;
383 void *buf; 383 void *buf;
384 int actual_len; 384 int actual_len;
385 int err; 385 int err;
386 int pos; 386 int pos;
387 unsigned long to = jiffies + msecs_to_jiffies(USB_RECV_TIMEOUT); 387 unsigned long to = jiffies + msecs_to_jiffies(USB_RECV_TIMEOUT);
388 388
389 buf = kzalloc(RX_BUFFER_SIZE, GFP_KERNEL); 389 buf = kzalloc(RX_BUFFER_SIZE, GFP_KERNEL);
390 if (!buf) 390 if (!buf)
391 return -ENOMEM; 391 return -ENOMEM;
392 392
393 do { 393 do {
394 err = usb_bulk_msg(dev->udev, 394 err = usb_bulk_msg(dev->udev,
395 usb_rcvbulkpipe(dev->udev, 395 usb_rcvbulkpipe(dev->udev,
396 dev->bulk_in->bEndpointAddress), 396 dev->bulk_in->bEndpointAddress),
397 buf, RX_BUFFER_SIZE, &actual_len, 397 buf, RX_BUFFER_SIZE, &actual_len,
398 USB_RECV_TIMEOUT); 398 USB_RECV_TIMEOUT);
399 if (err < 0) 399 if (err < 0)
400 goto end; 400 goto end;
401 401
402 pos = 0; 402 pos = 0;
403 while (pos <= actual_len - MSG_HEADER_LEN) { 403 while (pos <= actual_len - MSG_HEADER_LEN) {
404 tmp = buf + pos; 404 tmp = buf + pos;
405 405
406 if (!tmp->len) 406 if (!tmp->len)
407 break; 407 break;
408 408
409 if (pos + tmp->len > actual_len) { 409 if (pos + tmp->len > actual_len) {
410 dev_err(dev->udev->dev.parent, 410 dev_err(dev->udev->dev.parent,
411 "Format error\n"); 411 "Format error\n");
412 break; 412 break;
413 } 413 }
414 414
415 if (tmp->id == id) { 415 if (tmp->id == id) {
416 memcpy(msg, tmp, tmp->len); 416 memcpy(msg, tmp, tmp->len);
417 goto end; 417 goto end;
418 } 418 }
419 419
420 pos += tmp->len; 420 pos += tmp->len;
421 } 421 }
422 } while (time_before(jiffies, to)); 422 } while (time_before(jiffies, to));
423 423
424 err = -EINVAL; 424 err = -EINVAL;
425 425
426 end: 426 end:
427 kfree(buf); 427 kfree(buf);
428 428
429 return err; 429 return err;
430 } 430 }
431 431
432 static int kvaser_usb_send_simple_msg(const struct kvaser_usb *dev, 432 static int kvaser_usb_send_simple_msg(const struct kvaser_usb *dev,
433 u8 msg_id, int channel) 433 u8 msg_id, int channel)
434 { 434 {
435 struct kvaser_msg *msg; 435 struct kvaser_msg *msg;
436 int rc; 436 int rc;
437 437
438 msg = kmalloc(sizeof(*msg), GFP_KERNEL); 438 msg = kmalloc(sizeof(*msg), GFP_KERNEL);
439 if (!msg) 439 if (!msg)
440 return -ENOMEM; 440 return -ENOMEM;
441 441
442 msg->id = msg_id; 442 msg->id = msg_id;
443 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_simple); 443 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_simple);
444 msg->u.simple.channel = channel; 444 msg->u.simple.channel = channel;
445 msg->u.simple.tid = 0xff; 445 msg->u.simple.tid = 0xff;
446 446
447 rc = kvaser_usb_send_msg(dev, msg); 447 rc = kvaser_usb_send_msg(dev, msg);
448 448
449 kfree(msg); 449 kfree(msg);
450 return rc; 450 return rc;
451 } 451 }
452 452
453 static int kvaser_usb_get_software_info(struct kvaser_usb *dev) 453 static int kvaser_usb_get_software_info(struct kvaser_usb *dev)
454 { 454 {
455 struct kvaser_msg msg; 455 struct kvaser_msg msg;
456 int err; 456 int err;
457 457
458 err = kvaser_usb_send_simple_msg(dev, CMD_GET_SOFTWARE_INFO, 0); 458 err = kvaser_usb_send_simple_msg(dev, CMD_GET_SOFTWARE_INFO, 0);
459 if (err) 459 if (err)
460 return err; 460 return err;
461 461
462 err = kvaser_usb_wait_msg(dev, CMD_GET_SOFTWARE_INFO_REPLY, &msg); 462 err = kvaser_usb_wait_msg(dev, CMD_GET_SOFTWARE_INFO_REPLY, &msg);
463 if (err) 463 if (err)
464 return err; 464 return err;
465 465
466 dev->fw_version = le32_to_cpu(msg.u.softinfo.fw_version); 466 dev->fw_version = le32_to_cpu(msg.u.softinfo.fw_version);
467 467
468 return 0; 468 return 0;
469 } 469 }
470 470
471 static int kvaser_usb_get_card_info(struct kvaser_usb *dev) 471 static int kvaser_usb_get_card_info(struct kvaser_usb *dev)
472 { 472 {
473 struct kvaser_msg msg; 473 struct kvaser_msg msg;
474 int err; 474 int err;
475 475
476 err = kvaser_usb_send_simple_msg(dev, CMD_GET_CARD_INFO, 0); 476 err = kvaser_usb_send_simple_msg(dev, CMD_GET_CARD_INFO, 0);
477 if (err) 477 if (err)
478 return err; 478 return err;
479 479
480 err = kvaser_usb_wait_msg(dev, CMD_GET_CARD_INFO_REPLY, &msg); 480 err = kvaser_usb_wait_msg(dev, CMD_GET_CARD_INFO_REPLY, &msg);
481 if (err) 481 if (err)
482 return err; 482 return err;
483 483
484 dev->nchannels = msg.u.cardinfo.nchannels; 484 dev->nchannels = msg.u.cardinfo.nchannels;
485 if (dev->nchannels > MAX_NET_DEVICES) 485 if (dev->nchannels > MAX_NET_DEVICES)
486 return -EINVAL; 486 return -EINVAL;
487 487
488 return 0; 488 return 0;
489 } 489 }
490 490
491 static void kvaser_usb_tx_acknowledge(const struct kvaser_usb *dev, 491 static void kvaser_usb_tx_acknowledge(const struct kvaser_usb *dev,
492 const struct kvaser_msg *msg) 492 const struct kvaser_msg *msg)
493 { 493 {
494 struct net_device_stats *stats; 494 struct net_device_stats *stats;
495 struct kvaser_usb_tx_urb_context *context; 495 struct kvaser_usb_tx_urb_context *context;
496 struct kvaser_usb_net_priv *priv; 496 struct kvaser_usb_net_priv *priv;
497 struct sk_buff *skb; 497 struct sk_buff *skb;
498 struct can_frame *cf; 498 struct can_frame *cf;
499 u8 channel = msg->u.tx_acknowledge.channel; 499 u8 channel = msg->u.tx_acknowledge.channel;
500 u8 tid = msg->u.tx_acknowledge.tid; 500 u8 tid = msg->u.tx_acknowledge.tid;
501 501
502 if (channel >= dev->nchannels) { 502 if (channel >= dev->nchannels) {
503 dev_err(dev->udev->dev.parent, 503 dev_err(dev->udev->dev.parent,
504 "Invalid channel number (%d)\n", channel); 504 "Invalid channel number (%d)\n", channel);
505 return; 505 return;
506 } 506 }
507 507
508 priv = dev->nets[channel]; 508 priv = dev->nets[channel];
509 509
510 if (!netif_device_present(priv->netdev)) 510 if (!netif_device_present(priv->netdev))
511 return; 511 return;
512 512
513 stats = &priv->netdev->stats; 513 stats = &priv->netdev->stats;
514 514
515 context = &priv->tx_contexts[tid % MAX_TX_URBS]; 515 context = &priv->tx_contexts[tid % MAX_TX_URBS];
516 516
517 /* Sometimes the state change doesn't come after a bus-off event */ 517 /* Sometimes the state change doesn't come after a bus-off event */
518 if (priv->can.restart_ms && 518 if (priv->can.restart_ms &&
519 (priv->can.state >= CAN_STATE_BUS_OFF)) { 519 (priv->can.state >= CAN_STATE_BUS_OFF)) {
520 skb = alloc_can_err_skb(priv->netdev, &cf); 520 skb = alloc_can_err_skb(priv->netdev, &cf);
521 if (skb) { 521 if (skb) {
522 cf->can_id |= CAN_ERR_RESTARTED; 522 cf->can_id |= CAN_ERR_RESTARTED;
523 netif_rx(skb); 523 netif_rx(skb);
524 524
525 stats->rx_packets++; 525 stats->rx_packets++;
526 stats->rx_bytes += cf->can_dlc; 526 stats->rx_bytes += cf->can_dlc;
527 } else { 527 } else {
528 netdev_err(priv->netdev, 528 netdev_err(priv->netdev,
529 "No memory left for err_skb\n"); 529 "No memory left for err_skb\n");
530 } 530 }
531 531
532 priv->can.can_stats.restarts++; 532 priv->can.can_stats.restarts++;
533 netif_carrier_on(priv->netdev); 533 netif_carrier_on(priv->netdev);
534 534
535 priv->can.state = CAN_STATE_ERROR_ACTIVE; 535 priv->can.state = CAN_STATE_ERROR_ACTIVE;
536 } 536 }
537 537
538 stats->tx_packets++; 538 stats->tx_packets++;
539 stats->tx_bytes += context->dlc; 539 stats->tx_bytes += context->dlc;
540 can_get_echo_skb(priv->netdev, context->echo_index); 540 can_get_echo_skb(priv->netdev, context->echo_index);
541 541
542 context->echo_index = MAX_TX_URBS; 542 context->echo_index = MAX_TX_URBS;
543 atomic_dec(&priv->active_tx_urbs); 543 atomic_dec(&priv->active_tx_urbs);
544 544
545 netif_wake_queue(priv->netdev); 545 netif_wake_queue(priv->netdev);
546 } 546 }
547 547
548 static void kvaser_usb_simple_msg_callback(struct urb *urb) 548 static void kvaser_usb_simple_msg_callback(struct urb *urb)
549 { 549 {
550 struct net_device *netdev = urb->context; 550 struct net_device *netdev = urb->context;
551 551
552 kfree(urb->transfer_buffer); 552 kfree(urb->transfer_buffer);
553 553
554 if (urb->status) 554 if (urb->status)
555 netdev_warn(netdev, "urb status received: %d\n", 555 netdev_warn(netdev, "urb status received: %d\n",
556 urb->status); 556 urb->status);
557 } 557 }
558 558
559 static int kvaser_usb_simple_msg_async(struct kvaser_usb_net_priv *priv, 559 static int kvaser_usb_simple_msg_async(struct kvaser_usb_net_priv *priv,
560 u8 msg_id) 560 u8 msg_id)
561 { 561 {
562 struct kvaser_usb *dev = priv->dev; 562 struct kvaser_usb *dev = priv->dev;
563 struct net_device *netdev = priv->netdev; 563 struct net_device *netdev = priv->netdev;
564 struct kvaser_msg *msg; 564 struct kvaser_msg *msg;
565 struct urb *urb; 565 struct urb *urb;
566 void *buf; 566 void *buf;
567 int err; 567 int err;
568 568
569 urb = usb_alloc_urb(0, GFP_ATOMIC); 569 urb = usb_alloc_urb(0, GFP_ATOMIC);
570 if (!urb) { 570 if (!urb) {
571 netdev_err(netdev, "No memory left for URBs\n"); 571 netdev_err(netdev, "No memory left for URBs\n");
572 return -ENOMEM; 572 return -ENOMEM;
573 } 573 }
574 574
575 buf = kmalloc(sizeof(struct kvaser_msg), GFP_ATOMIC); 575 buf = kmalloc(sizeof(struct kvaser_msg), GFP_ATOMIC);
576 if (!buf) { 576 if (!buf) {
577 usb_free_urb(urb); 577 usb_free_urb(urb);
578 return -ENOMEM; 578 return -ENOMEM;
579 } 579 }
580 580
581 msg = (struct kvaser_msg *)buf; 581 msg = (struct kvaser_msg *)buf;
582 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_simple); 582 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_simple);
583 msg->id = msg_id; 583 msg->id = msg_id;
584 msg->u.simple.channel = priv->channel; 584 msg->u.simple.channel = priv->channel;
585 585
586 usb_fill_bulk_urb(urb, dev->udev, 586 usb_fill_bulk_urb(urb, dev->udev,
587 usb_sndbulkpipe(dev->udev, 587 usb_sndbulkpipe(dev->udev,
588 dev->bulk_out->bEndpointAddress), 588 dev->bulk_out->bEndpointAddress),
589 buf, msg->len, 589 buf, msg->len,
590 kvaser_usb_simple_msg_callback, priv); 590 kvaser_usb_simple_msg_callback, priv);
591 usb_anchor_urb(urb, &priv->tx_submitted); 591 usb_anchor_urb(urb, &priv->tx_submitted);
592 592
593 err = usb_submit_urb(urb, GFP_ATOMIC); 593 err = usb_submit_urb(urb, GFP_ATOMIC);
594 if (err) { 594 if (err) {
595 netdev_err(netdev, "Error transmitting URB\n"); 595 netdev_err(netdev, "Error transmitting URB\n");
596 usb_unanchor_urb(urb); 596 usb_unanchor_urb(urb);
597 usb_free_urb(urb); 597 usb_free_urb(urb);
598 kfree(buf); 598 kfree(buf);
599 return err; 599 return err;
600 } 600 }
601 601
602 usb_free_urb(urb); 602 usb_free_urb(urb);
603 603
604 return 0; 604 return 0;
605 } 605 }
606 606
607 static void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv) 607 static void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv)
608 { 608 {
609 int i; 609 int i;
610 610
611 usb_kill_anchored_urbs(&priv->tx_submitted); 611 usb_kill_anchored_urbs(&priv->tx_submitted);
612 atomic_set(&priv->active_tx_urbs, 0); 612 atomic_set(&priv->active_tx_urbs, 0);
613 613
614 for (i = 0; i < MAX_TX_URBS; i++) 614 for (i = 0; i < MAX_TX_URBS; i++)
615 priv->tx_contexts[i].echo_index = MAX_TX_URBS; 615 priv->tx_contexts[i].echo_index = MAX_TX_URBS;
616 } 616 }
617 617
618 static void kvaser_usb_rx_error(const struct kvaser_usb *dev, 618 static void kvaser_usb_rx_error(const struct kvaser_usb *dev,
619 const struct kvaser_msg *msg) 619 const struct kvaser_msg *msg)
620 { 620 {
621 struct can_frame *cf; 621 struct can_frame *cf;
622 struct sk_buff *skb; 622 struct sk_buff *skb;
623 struct net_device_stats *stats; 623 struct net_device_stats *stats;
624 struct kvaser_usb_net_priv *priv; 624 struct kvaser_usb_net_priv *priv;
625 unsigned int new_state; 625 unsigned int new_state;
626 u8 channel, status, txerr, rxerr, error_factor; 626 u8 channel, status, txerr, rxerr, error_factor;
627 627
628 switch (msg->id) { 628 switch (msg->id) {
629 case CMD_CAN_ERROR_EVENT: 629 case CMD_CAN_ERROR_EVENT:
630 channel = msg->u.error_event.channel; 630 channel = msg->u.error_event.channel;
631 status = msg->u.error_event.status; 631 status = msg->u.error_event.status;
632 txerr = msg->u.error_event.tx_errors_count; 632 txerr = msg->u.error_event.tx_errors_count;
633 rxerr = msg->u.error_event.rx_errors_count; 633 rxerr = msg->u.error_event.rx_errors_count;
634 error_factor = msg->u.error_event.error_factor; 634 error_factor = msg->u.error_event.error_factor;
635 break; 635 break;
636 case CMD_LOG_MESSAGE: 636 case CMD_LOG_MESSAGE:
637 channel = msg->u.log_message.channel; 637 channel = msg->u.log_message.channel;
638 status = msg->u.log_message.data[0]; 638 status = msg->u.log_message.data[0];
639 txerr = msg->u.log_message.data[2]; 639 txerr = msg->u.log_message.data[2];
640 rxerr = msg->u.log_message.data[3]; 640 rxerr = msg->u.log_message.data[3];
641 error_factor = msg->u.log_message.data[1]; 641 error_factor = msg->u.log_message.data[1];
642 break; 642 break;
643 case CMD_CHIP_STATE_EVENT: 643 case CMD_CHIP_STATE_EVENT:
644 channel = msg->u.chip_state_event.channel; 644 channel = msg->u.chip_state_event.channel;
645 status = msg->u.chip_state_event.status; 645 status = msg->u.chip_state_event.status;
646 txerr = msg->u.chip_state_event.tx_errors_count; 646 txerr = msg->u.chip_state_event.tx_errors_count;
647 rxerr = msg->u.chip_state_event.rx_errors_count; 647 rxerr = msg->u.chip_state_event.rx_errors_count;
648 error_factor = 0; 648 error_factor = 0;
649 break; 649 break;
650 default: 650 default:
651 dev_err(dev->udev->dev.parent, "Invalid msg id (%d)\n", 651 dev_err(dev->udev->dev.parent, "Invalid msg id (%d)\n",
652 msg->id); 652 msg->id);
653 return; 653 return;
654 } 654 }
655 655
656 if (channel >= dev->nchannels) { 656 if (channel >= dev->nchannels) {
657 dev_err(dev->udev->dev.parent, 657 dev_err(dev->udev->dev.parent,
658 "Invalid channel number (%d)\n", channel); 658 "Invalid channel number (%d)\n", channel);
659 return; 659 return;
660 } 660 }
661 661
662 priv = dev->nets[channel]; 662 priv = dev->nets[channel];
663 stats = &priv->netdev->stats; 663 stats = &priv->netdev->stats;
664 664
665 if (status & M16C_STATE_BUS_RESET) { 665 if (status & M16C_STATE_BUS_RESET) {
666 kvaser_usb_unlink_tx_urbs(priv); 666 kvaser_usb_unlink_tx_urbs(priv);
667 return; 667 return;
668 } 668 }
669 669
670 skb = alloc_can_err_skb(priv->netdev, &cf); 670 skb = alloc_can_err_skb(priv->netdev, &cf);
671 if (!skb) { 671 if (!skb) {
672 stats->rx_dropped++; 672 stats->rx_dropped++;
673 return; 673 return;
674 } 674 }
675 675
676 new_state = priv->can.state; 676 new_state = priv->can.state;
677 677
678 netdev_dbg(priv->netdev, "Error status: 0x%02x\n", status); 678 netdev_dbg(priv->netdev, "Error status: 0x%02x\n", status);
679 679
680 if (status & M16C_STATE_BUS_OFF) { 680 if (status & M16C_STATE_BUS_OFF) {
681 cf->can_id |= CAN_ERR_BUSOFF; 681 cf->can_id |= CAN_ERR_BUSOFF;
682 682
683 priv->can.can_stats.bus_off++; 683 priv->can.can_stats.bus_off++;
684 if (!priv->can.restart_ms) 684 if (!priv->can.restart_ms)
685 kvaser_usb_simple_msg_async(priv, CMD_STOP_CHIP); 685 kvaser_usb_simple_msg_async(priv, CMD_STOP_CHIP);
686 686
687 netif_carrier_off(priv->netdev); 687 netif_carrier_off(priv->netdev);
688 688
689 new_state = CAN_STATE_BUS_OFF; 689 new_state = CAN_STATE_BUS_OFF;
690 } else if (status & M16C_STATE_BUS_PASSIVE) { 690 } else if (status & M16C_STATE_BUS_PASSIVE) {
691 if (priv->can.state != CAN_STATE_ERROR_PASSIVE) { 691 if (priv->can.state != CAN_STATE_ERROR_PASSIVE) {
692 cf->can_id |= CAN_ERR_CRTL; 692 cf->can_id |= CAN_ERR_CRTL;
693 693
694 if (txerr || rxerr) 694 if (txerr || rxerr)
695 cf->data[1] = (txerr > rxerr) 695 cf->data[1] = (txerr > rxerr)
696 ? CAN_ERR_CRTL_TX_PASSIVE 696 ? CAN_ERR_CRTL_TX_PASSIVE
697 : CAN_ERR_CRTL_RX_PASSIVE; 697 : CAN_ERR_CRTL_RX_PASSIVE;
698 else 698 else
699 cf->data[1] = CAN_ERR_CRTL_TX_PASSIVE | 699 cf->data[1] = CAN_ERR_CRTL_TX_PASSIVE |
700 CAN_ERR_CRTL_RX_PASSIVE; 700 CAN_ERR_CRTL_RX_PASSIVE;
701 701
702 priv->can.can_stats.error_passive++; 702 priv->can.can_stats.error_passive++;
703 } 703 }
704 704
705 new_state = CAN_STATE_ERROR_PASSIVE; 705 new_state = CAN_STATE_ERROR_PASSIVE;
706 } 706 }
707 707
708 if (status == M16C_STATE_BUS_ERROR) { 708 if (status == M16C_STATE_BUS_ERROR) {
709 if ((priv->can.state < CAN_STATE_ERROR_WARNING) && 709 if ((priv->can.state < CAN_STATE_ERROR_WARNING) &&
710 ((txerr >= 96) || (rxerr >= 96))) { 710 ((txerr >= 96) || (rxerr >= 96))) {
711 cf->can_id |= CAN_ERR_CRTL; 711 cf->can_id |= CAN_ERR_CRTL;
712 cf->data[1] = (txerr > rxerr) 712 cf->data[1] = (txerr > rxerr)
713 ? CAN_ERR_CRTL_TX_WARNING 713 ? CAN_ERR_CRTL_TX_WARNING
714 : CAN_ERR_CRTL_RX_WARNING; 714 : CAN_ERR_CRTL_RX_WARNING;
715 715
716 priv->can.can_stats.error_warning++; 716 priv->can.can_stats.error_warning++;
717 new_state = CAN_STATE_ERROR_WARNING; 717 new_state = CAN_STATE_ERROR_WARNING;
718 } else if (priv->can.state > CAN_STATE_ERROR_ACTIVE) { 718 } else if (priv->can.state > CAN_STATE_ERROR_ACTIVE) {
719 cf->can_id |= CAN_ERR_PROT; 719 cf->can_id |= CAN_ERR_PROT;
720 cf->data[2] = CAN_ERR_PROT_ACTIVE; 720 cf->data[2] = CAN_ERR_PROT_ACTIVE;
721 721
722 new_state = CAN_STATE_ERROR_ACTIVE; 722 new_state = CAN_STATE_ERROR_ACTIVE;
723 } 723 }
724 } 724 }
725 725
726 if (!status) { 726 if (!status) {
727 cf->can_id |= CAN_ERR_PROT; 727 cf->can_id |= CAN_ERR_PROT;
728 cf->data[2] = CAN_ERR_PROT_ACTIVE; 728 cf->data[2] = CAN_ERR_PROT_ACTIVE;
729 729
730 new_state = CAN_STATE_ERROR_ACTIVE; 730 new_state = CAN_STATE_ERROR_ACTIVE;
731 } 731 }
732 732
733 if (priv->can.restart_ms && 733 if (priv->can.restart_ms &&
734 (priv->can.state >= CAN_STATE_BUS_OFF) && 734 (priv->can.state >= CAN_STATE_BUS_OFF) &&
735 (new_state < CAN_STATE_BUS_OFF)) { 735 (new_state < CAN_STATE_BUS_OFF)) {
736 cf->can_id |= CAN_ERR_RESTARTED; 736 cf->can_id |= CAN_ERR_RESTARTED;
737 netif_carrier_on(priv->netdev); 737 netif_carrier_on(priv->netdev);
738 738
739 priv->can.can_stats.restarts++; 739 priv->can.can_stats.restarts++;
740 } 740 }
741 741
742 if (error_factor) { 742 if (error_factor) {
743 priv->can.can_stats.bus_error++; 743 priv->can.can_stats.bus_error++;
744 stats->rx_errors++; 744 stats->rx_errors++;
745 745
746 cf->can_id |= CAN_ERR_BUSERROR | CAN_ERR_PROT; 746 cf->can_id |= CAN_ERR_BUSERROR | CAN_ERR_PROT;
747 747
748 if (error_factor & M16C_EF_ACKE) 748 if (error_factor & M16C_EF_ACKE)
749 cf->data[3] |= (CAN_ERR_PROT_LOC_ACK); 749 cf->data[3] |= (CAN_ERR_PROT_LOC_ACK);
750 if (error_factor & M16C_EF_CRCE) 750 if (error_factor & M16C_EF_CRCE)
751 cf->data[3] |= (CAN_ERR_PROT_LOC_CRC_SEQ | 751 cf->data[3] |= (CAN_ERR_PROT_LOC_CRC_SEQ |
752 CAN_ERR_PROT_LOC_CRC_DEL); 752 CAN_ERR_PROT_LOC_CRC_DEL);
753 if (error_factor & M16C_EF_FORME) 753 if (error_factor & M16C_EF_FORME)
754 cf->data[2] |= CAN_ERR_PROT_FORM; 754 cf->data[2] |= CAN_ERR_PROT_FORM;
755 if (error_factor & M16C_EF_STFE) 755 if (error_factor & M16C_EF_STFE)
756 cf->data[2] |= CAN_ERR_PROT_STUFF; 756 cf->data[2] |= CAN_ERR_PROT_STUFF;
757 if (error_factor & M16C_EF_BITE0) 757 if (error_factor & M16C_EF_BITE0)
758 cf->data[2] |= CAN_ERR_PROT_BIT0; 758 cf->data[2] |= CAN_ERR_PROT_BIT0;
759 if (error_factor & M16C_EF_BITE1) 759 if (error_factor & M16C_EF_BITE1)
760 cf->data[2] |= CAN_ERR_PROT_BIT1; 760 cf->data[2] |= CAN_ERR_PROT_BIT1;
761 if (error_factor & M16C_EF_TRE) 761 if (error_factor & M16C_EF_TRE)
762 cf->data[2] |= CAN_ERR_PROT_TX; 762 cf->data[2] |= CAN_ERR_PROT_TX;
763 } 763 }
764 764
765 cf->data[6] = txerr; 765 cf->data[6] = txerr;
766 cf->data[7] = rxerr; 766 cf->data[7] = rxerr;
767 767
768 priv->bec.txerr = txerr; 768 priv->bec.txerr = txerr;
769 priv->bec.rxerr = rxerr; 769 priv->bec.rxerr = rxerr;
770 770
771 priv->can.state = new_state; 771 priv->can.state = new_state;
772 772
773 netif_rx(skb); 773 netif_rx(skb);
774 774
775 stats->rx_packets++; 775 stats->rx_packets++;
776 stats->rx_bytes += cf->can_dlc; 776 stats->rx_bytes += cf->can_dlc;
777 } 777 }
778 778
779 static void kvaser_usb_rx_can_err(const struct kvaser_usb_net_priv *priv, 779 static void kvaser_usb_rx_can_err(const struct kvaser_usb_net_priv *priv,
780 const struct kvaser_msg *msg) 780 const struct kvaser_msg *msg)
781 { 781 {
782 struct can_frame *cf; 782 struct can_frame *cf;
783 struct sk_buff *skb; 783 struct sk_buff *skb;
784 struct net_device_stats *stats = &priv->netdev->stats; 784 struct net_device_stats *stats = &priv->netdev->stats;
785 785
786 if (msg->u.rx_can.flag & (MSG_FLAG_ERROR_FRAME | 786 if (msg->u.rx_can.flag & (MSG_FLAG_ERROR_FRAME |
787 MSG_FLAG_NERR)) { 787 MSG_FLAG_NERR)) {
788 netdev_err(priv->netdev, "Unknow error (flags: 0x%02x)\n", 788 netdev_err(priv->netdev, "Unknow error (flags: 0x%02x)\n",
789 msg->u.rx_can.flag); 789 msg->u.rx_can.flag);
790 790
791 stats->rx_errors++; 791 stats->rx_errors++;
792 return; 792 return;
793 } 793 }
794 794
795 if (msg->u.rx_can.flag & MSG_FLAG_OVERRUN) { 795 if (msg->u.rx_can.flag & MSG_FLAG_OVERRUN) {
796 skb = alloc_can_err_skb(priv->netdev, &cf); 796 skb = alloc_can_err_skb(priv->netdev, &cf);
797 if (!skb) { 797 if (!skb) {
798 stats->rx_dropped++; 798 stats->rx_dropped++;
799 return; 799 return;
800 } 800 }
801 801
802 cf->can_id |= CAN_ERR_CRTL; 802 cf->can_id |= CAN_ERR_CRTL;
803 cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW; 803 cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
804 804
805 stats->rx_over_errors++; 805 stats->rx_over_errors++;
806 stats->rx_errors++; 806 stats->rx_errors++;
807 807
808 netif_rx(skb); 808 netif_rx(skb);
809 809
810 stats->rx_packets++; 810 stats->rx_packets++;
811 stats->rx_bytes += cf->can_dlc; 811 stats->rx_bytes += cf->can_dlc;
812 } 812 }
813 } 813 }
814 814
815 static void kvaser_usb_rx_can_msg(const struct kvaser_usb *dev, 815 static void kvaser_usb_rx_can_msg(const struct kvaser_usb *dev,
816 const struct kvaser_msg *msg) 816 const struct kvaser_msg *msg)
817 { 817 {
818 struct kvaser_usb_net_priv *priv; 818 struct kvaser_usb_net_priv *priv;
819 struct can_frame *cf; 819 struct can_frame *cf;
820 struct sk_buff *skb; 820 struct sk_buff *skb;
821 struct net_device_stats *stats; 821 struct net_device_stats *stats;
822 u8 channel = msg->u.rx_can.channel; 822 u8 channel = msg->u.rx_can.channel;
823 823
824 if (channel >= dev->nchannels) { 824 if (channel >= dev->nchannels) {
825 dev_err(dev->udev->dev.parent, 825 dev_err(dev->udev->dev.parent,
826 "Invalid channel number (%d)\n", channel); 826 "Invalid channel number (%d)\n", channel);
827 return; 827 return;
828 } 828 }
829 829
830 priv = dev->nets[channel]; 830 priv = dev->nets[channel];
831 stats = &priv->netdev->stats; 831 stats = &priv->netdev->stats;
832 832
833 if ((msg->u.rx_can.flag & MSG_FLAG_ERROR_FRAME) && 833 if ((msg->u.rx_can.flag & MSG_FLAG_ERROR_FRAME) &&
834 (msg->id == CMD_LOG_MESSAGE)) { 834 (msg->id == CMD_LOG_MESSAGE)) {
835 kvaser_usb_rx_error(dev, msg); 835 kvaser_usb_rx_error(dev, msg);
836 return; 836 return;
837 } else if (msg->u.rx_can.flag & (MSG_FLAG_ERROR_FRAME | 837 } else if (msg->u.rx_can.flag & (MSG_FLAG_ERROR_FRAME |
838 MSG_FLAG_NERR | 838 MSG_FLAG_NERR |
839 MSG_FLAG_OVERRUN)) { 839 MSG_FLAG_OVERRUN)) {
840 kvaser_usb_rx_can_err(priv, msg); 840 kvaser_usb_rx_can_err(priv, msg);
841 return; 841 return;
842 } else if (msg->u.rx_can.flag & ~MSG_FLAG_REMOTE_FRAME) { 842 } else if (msg->u.rx_can.flag & ~MSG_FLAG_REMOTE_FRAME) {
843 netdev_warn(priv->netdev, 843 netdev_warn(priv->netdev,
844 "Unhandled frame (flags: 0x%02x)", 844 "Unhandled frame (flags: 0x%02x)",
845 msg->u.rx_can.flag); 845 msg->u.rx_can.flag);
846 return; 846 return;
847 } 847 }
848 848
849 skb = alloc_can_skb(priv->netdev, &cf); 849 skb = alloc_can_skb(priv->netdev, &cf);
850 if (!skb) { 850 if (!skb) {
851 stats->tx_dropped++; 851 stats->tx_dropped++;
852 return; 852 return;
853 } 853 }
854 854
855 if (msg->id == CMD_LOG_MESSAGE) { 855 if (msg->id == CMD_LOG_MESSAGE) {
856 cf->can_id = le32_to_cpu(msg->u.log_message.id); 856 cf->can_id = le32_to_cpu(msg->u.log_message.id);
857 if (cf->can_id & KVASER_EXTENDED_FRAME) 857 if (cf->can_id & KVASER_EXTENDED_FRAME)
858 cf->can_id &= CAN_EFF_MASK | CAN_EFF_FLAG; 858 cf->can_id &= CAN_EFF_MASK | CAN_EFF_FLAG;
859 else 859 else
860 cf->can_id &= CAN_SFF_MASK; 860 cf->can_id &= CAN_SFF_MASK;
861 861
862 cf->can_dlc = get_can_dlc(msg->u.log_message.dlc); 862 cf->can_dlc = get_can_dlc(msg->u.log_message.dlc);
863 863
864 if (msg->u.log_message.flags & MSG_FLAG_REMOTE_FRAME) 864 if (msg->u.log_message.flags & MSG_FLAG_REMOTE_FRAME)
865 cf->can_id |= CAN_RTR_FLAG; 865 cf->can_id |= CAN_RTR_FLAG;
866 else 866 else
867 memcpy(cf->data, &msg->u.log_message.data, 867 memcpy(cf->data, &msg->u.log_message.data,
868 cf->can_dlc); 868 cf->can_dlc);
869 } else { 869 } else {
870 cf->can_id = ((msg->u.rx_can.msg[0] & 0x1f) << 6) | 870 cf->can_id = ((msg->u.rx_can.msg[0] & 0x1f) << 6) |
871 (msg->u.rx_can.msg[1] & 0x3f); 871 (msg->u.rx_can.msg[1] & 0x3f);
872 872
873 if (msg->id == CMD_RX_EXT_MESSAGE) { 873 if (msg->id == CMD_RX_EXT_MESSAGE) {
874 cf->can_id <<= 18; 874 cf->can_id <<= 18;
875 cf->can_id |= ((msg->u.rx_can.msg[2] & 0x0f) << 14) | 875 cf->can_id |= ((msg->u.rx_can.msg[2] & 0x0f) << 14) |
876 ((msg->u.rx_can.msg[3] & 0xff) << 6) | 876 ((msg->u.rx_can.msg[3] & 0xff) << 6) |
877 (msg->u.rx_can.msg[4] & 0x3f); 877 (msg->u.rx_can.msg[4] & 0x3f);
878 cf->can_id |= CAN_EFF_FLAG; 878 cf->can_id |= CAN_EFF_FLAG;
879 } 879 }
880 880
881 cf->can_dlc = get_can_dlc(msg->u.rx_can.msg[5]); 881 cf->can_dlc = get_can_dlc(msg->u.rx_can.msg[5]);
882 882
883 if (msg->u.rx_can.flag & MSG_FLAG_REMOTE_FRAME) 883 if (msg->u.rx_can.flag & MSG_FLAG_REMOTE_FRAME)
884 cf->can_id |= CAN_RTR_FLAG; 884 cf->can_id |= CAN_RTR_FLAG;
885 else 885 else
886 memcpy(cf->data, &msg->u.rx_can.msg[6], 886 memcpy(cf->data, &msg->u.rx_can.msg[6],
887 cf->can_dlc); 887 cf->can_dlc);
888 } 888 }
889 889
890 netif_rx(skb); 890 netif_rx(skb);
891 891
892 stats->rx_packets++; 892 stats->rx_packets++;
893 stats->rx_bytes += cf->can_dlc; 893 stats->rx_bytes += cf->can_dlc;
894 } 894 }
895 895
896 static void kvaser_usb_start_chip_reply(const struct kvaser_usb *dev, 896 static void kvaser_usb_start_chip_reply(const struct kvaser_usb *dev,
897 const struct kvaser_msg *msg) 897 const struct kvaser_msg *msg)
898 { 898 {
899 struct kvaser_usb_net_priv *priv; 899 struct kvaser_usb_net_priv *priv;
900 u8 channel = msg->u.simple.channel; 900 u8 channel = msg->u.simple.channel;
901 901
902 if (channel >= dev->nchannels) { 902 if (channel >= dev->nchannels) {
903 dev_err(dev->udev->dev.parent, 903 dev_err(dev->udev->dev.parent,
904 "Invalid channel number (%d)\n", channel); 904 "Invalid channel number (%d)\n", channel);
905 return; 905 return;
906 } 906 }
907 907
908 priv = dev->nets[channel]; 908 priv = dev->nets[channel];
909 909
910 if (completion_done(&priv->start_comp) && 910 if (completion_done(&priv->start_comp) &&
911 netif_queue_stopped(priv->netdev)) { 911 netif_queue_stopped(priv->netdev)) {
912 netif_wake_queue(priv->netdev); 912 netif_wake_queue(priv->netdev);
913 } else { 913 } else {
914 netif_start_queue(priv->netdev); 914 netif_start_queue(priv->netdev);
915 complete(&priv->start_comp); 915 complete(&priv->start_comp);
916 } 916 }
917 } 917 }
918 918
919 static void kvaser_usb_stop_chip_reply(const struct kvaser_usb *dev, 919 static void kvaser_usb_stop_chip_reply(const struct kvaser_usb *dev,
920 const struct kvaser_msg *msg) 920 const struct kvaser_msg *msg)
921 { 921 {
922 struct kvaser_usb_net_priv *priv; 922 struct kvaser_usb_net_priv *priv;
923 u8 channel = msg->u.simple.channel; 923 u8 channel = msg->u.simple.channel;
924 924
925 if (channel >= dev->nchannels) { 925 if (channel >= dev->nchannels) {
926 dev_err(dev->udev->dev.parent, 926 dev_err(dev->udev->dev.parent,
927 "Invalid channel number (%d)\n", channel); 927 "Invalid channel number (%d)\n", channel);
928 return; 928 return;
929 } 929 }
930 930
931 priv = dev->nets[channel]; 931 priv = dev->nets[channel];
932 932
933 complete(&priv->stop_comp); 933 complete(&priv->stop_comp);
934 } 934 }
935 935
936 static void kvaser_usb_handle_message(const struct kvaser_usb *dev, 936 static void kvaser_usb_handle_message(const struct kvaser_usb *dev,
937 const struct kvaser_msg *msg) 937 const struct kvaser_msg *msg)
938 { 938 {
939 switch (msg->id) { 939 switch (msg->id) {
940 case CMD_START_CHIP_REPLY: 940 case CMD_START_CHIP_REPLY:
941 kvaser_usb_start_chip_reply(dev, msg); 941 kvaser_usb_start_chip_reply(dev, msg);
942 break; 942 break;
943 943
944 case CMD_STOP_CHIP_REPLY: 944 case CMD_STOP_CHIP_REPLY:
945 kvaser_usb_stop_chip_reply(dev, msg); 945 kvaser_usb_stop_chip_reply(dev, msg);
946 break; 946 break;
947 947
948 case CMD_RX_STD_MESSAGE: 948 case CMD_RX_STD_MESSAGE:
949 case CMD_RX_EXT_MESSAGE: 949 case CMD_RX_EXT_MESSAGE:
950 case CMD_LOG_MESSAGE: 950 case CMD_LOG_MESSAGE:
951 kvaser_usb_rx_can_msg(dev, msg); 951 kvaser_usb_rx_can_msg(dev, msg);
952 break; 952 break;
953 953
954 case CMD_CHIP_STATE_EVENT: 954 case CMD_CHIP_STATE_EVENT:
955 case CMD_CAN_ERROR_EVENT: 955 case CMD_CAN_ERROR_EVENT:
956 kvaser_usb_rx_error(dev, msg); 956 kvaser_usb_rx_error(dev, msg);
957 break; 957 break;
958 958
959 case CMD_TX_ACKNOWLEDGE: 959 case CMD_TX_ACKNOWLEDGE:
960 kvaser_usb_tx_acknowledge(dev, msg); 960 kvaser_usb_tx_acknowledge(dev, msg);
961 break; 961 break;
962 962
963 default: 963 default:
964 dev_warn(dev->udev->dev.parent, 964 dev_warn(dev->udev->dev.parent,
965 "Unhandled message (%d)\n", msg->id); 965 "Unhandled message (%d)\n", msg->id);
966 break; 966 break;
967 } 967 }
968 } 968 }
969 969
970 static void kvaser_usb_read_bulk_callback(struct urb *urb) 970 static void kvaser_usb_read_bulk_callback(struct urb *urb)
971 { 971 {
972 struct kvaser_usb *dev = urb->context; 972 struct kvaser_usb *dev = urb->context;
973 struct kvaser_msg *msg; 973 struct kvaser_msg *msg;
974 int pos = 0; 974 int pos = 0;
975 int err, i; 975 int err, i;
976 976
977 switch (urb->status) { 977 switch (urb->status) {
978 case 0: 978 case 0:
979 break; 979 break;
980 case -ENOENT: 980 case -ENOENT:
981 case -ESHUTDOWN: 981 case -ESHUTDOWN:
982 return; 982 return;
983 default: 983 default:
984 dev_info(dev->udev->dev.parent, "Rx URB aborted (%d)\n", 984 dev_info(dev->udev->dev.parent, "Rx URB aborted (%d)\n",
985 urb->status); 985 urb->status);
986 goto resubmit_urb; 986 goto resubmit_urb;
987 } 987 }
988 988
989 while (pos <= urb->actual_length - MSG_HEADER_LEN) { 989 while (pos <= urb->actual_length - MSG_HEADER_LEN) {
990 msg = urb->transfer_buffer + pos; 990 msg = urb->transfer_buffer + pos;
991 991
992 if (!msg->len) 992 if (!msg->len)
993 break; 993 break;
994 994
995 if (pos + msg->len > urb->actual_length) { 995 if (pos + msg->len > urb->actual_length) {
996 dev_err(dev->udev->dev.parent, "Format error\n"); 996 dev_err(dev->udev->dev.parent, "Format error\n");
997 break; 997 break;
998 } 998 }
999 999
1000 kvaser_usb_handle_message(dev, msg); 1000 kvaser_usb_handle_message(dev, msg);
1001 1001
1002 pos += msg->len; 1002 pos += msg->len;
1003 } 1003 }
1004 1004
1005 resubmit_urb: 1005 resubmit_urb:
1006 usb_fill_bulk_urb(urb, dev->udev, 1006 usb_fill_bulk_urb(urb, dev->udev,
1007 usb_rcvbulkpipe(dev->udev, 1007 usb_rcvbulkpipe(dev->udev,
1008 dev->bulk_in->bEndpointAddress), 1008 dev->bulk_in->bEndpointAddress),
1009 urb->transfer_buffer, RX_BUFFER_SIZE, 1009 urb->transfer_buffer, RX_BUFFER_SIZE,
1010 kvaser_usb_read_bulk_callback, dev); 1010 kvaser_usb_read_bulk_callback, dev);
1011 1011
1012 err = usb_submit_urb(urb, GFP_ATOMIC); 1012 err = usb_submit_urb(urb, GFP_ATOMIC);
1013 if (err == -ENODEV) { 1013 if (err == -ENODEV) {
1014 for (i = 0; i < dev->nchannels; i++) { 1014 for (i = 0; i < dev->nchannels; i++) {
1015 if (!dev->nets[i]) 1015 if (!dev->nets[i])
1016 continue; 1016 continue;
1017 1017
1018 netif_device_detach(dev->nets[i]->netdev); 1018 netif_device_detach(dev->nets[i]->netdev);
1019 } 1019 }
1020 } else if (err) { 1020 } else if (err) {
1021 dev_err(dev->udev->dev.parent, 1021 dev_err(dev->udev->dev.parent,
1022 "Failed resubmitting read bulk urb: %d\n", err); 1022 "Failed resubmitting read bulk urb: %d\n", err);
1023 } 1023 }
1024 1024
1025 return; 1025 return;
1026 } 1026 }
1027 1027
1028 static int kvaser_usb_setup_rx_urbs(struct kvaser_usb *dev) 1028 static int kvaser_usb_setup_rx_urbs(struct kvaser_usb *dev)
1029 { 1029 {
1030 int i, err = 0; 1030 int i, err = 0;
1031 1031
1032 if (dev->rxinitdone) 1032 if (dev->rxinitdone)
1033 return 0; 1033 return 0;
1034 1034
1035 for (i = 0; i < MAX_RX_URBS; i++) { 1035 for (i = 0; i < MAX_RX_URBS; i++) {
1036 struct urb *urb = NULL; 1036 struct urb *urb = NULL;
1037 u8 *buf = NULL; 1037 u8 *buf = NULL;
1038 dma_addr_t buf_dma; 1038 dma_addr_t buf_dma;
1039 1039
1040 urb = usb_alloc_urb(0, GFP_KERNEL); 1040 urb = usb_alloc_urb(0, GFP_KERNEL);
1041 if (!urb) { 1041 if (!urb) {
1042 dev_warn(dev->udev->dev.parent, 1042 dev_warn(dev->udev->dev.parent,
1043 "No memory left for URBs\n"); 1043 "No memory left for URBs\n");
1044 err = -ENOMEM; 1044 err = -ENOMEM;
1045 break; 1045 break;
1046 } 1046 }
1047 1047
1048 buf = usb_alloc_coherent(dev->udev, RX_BUFFER_SIZE, 1048 buf = usb_alloc_coherent(dev->udev, RX_BUFFER_SIZE,
1049 GFP_KERNEL, &buf_dma); 1049 GFP_KERNEL, &buf_dma);
1050 if (!buf) { 1050 if (!buf) {
1051 dev_warn(dev->udev->dev.parent, 1051 dev_warn(dev->udev->dev.parent,
1052 "No memory left for USB buffer\n"); 1052 "No memory left for USB buffer\n");
1053 usb_free_urb(urb); 1053 usb_free_urb(urb);
1054 err = -ENOMEM; 1054 err = -ENOMEM;
1055 break; 1055 break;
1056 } 1056 }
1057 1057
1058 usb_fill_bulk_urb(urb, dev->udev, 1058 usb_fill_bulk_urb(urb, dev->udev,
1059 usb_rcvbulkpipe(dev->udev, 1059 usb_rcvbulkpipe(dev->udev,
1060 dev->bulk_in->bEndpointAddress), 1060 dev->bulk_in->bEndpointAddress),
1061 buf, RX_BUFFER_SIZE, 1061 buf, RX_BUFFER_SIZE,
1062 kvaser_usb_read_bulk_callback, 1062 kvaser_usb_read_bulk_callback,
1063 dev); 1063 dev);
1064 urb->transfer_dma = buf_dma; 1064 urb->transfer_dma = buf_dma;
1065 urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; 1065 urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
1066 usb_anchor_urb(urb, &dev->rx_submitted); 1066 usb_anchor_urb(urb, &dev->rx_submitted);
1067 1067
1068 err = usb_submit_urb(urb, GFP_KERNEL); 1068 err = usb_submit_urb(urb, GFP_KERNEL);
1069 if (err) { 1069 if (err) {
1070 usb_unanchor_urb(urb); 1070 usb_unanchor_urb(urb);
1071 usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf, 1071 usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf,
1072 buf_dma); 1072 buf_dma);
1073 usb_free_urb(urb); 1073 usb_free_urb(urb);
1074 break; 1074 break;
1075 } 1075 }
1076 1076
1077 dev->rxbuf[i] = buf; 1077 dev->rxbuf[i] = buf;
1078 dev->rxbuf_dma[i] = buf_dma; 1078 dev->rxbuf_dma[i] = buf_dma;
1079 1079
1080 usb_free_urb(urb); 1080 usb_free_urb(urb);
1081 } 1081 }
1082 1082
1083 if (i == 0) { 1083 if (i == 0) {
1084 dev_warn(dev->udev->dev.parent, 1084 dev_warn(dev->udev->dev.parent,
1085 "Cannot setup read URBs, error %d\n", err); 1085 "Cannot setup read URBs, error %d\n", err);
1086 return err; 1086 return err;
1087 } else if (i < MAX_RX_URBS) { 1087 } else if (i < MAX_RX_URBS) {
1088 dev_warn(dev->udev->dev.parent, 1088 dev_warn(dev->udev->dev.parent,
1089 "RX performances may be slow\n"); 1089 "RX performances may be slow\n");
1090 } 1090 }
1091 1091
1092 dev->rxinitdone = true; 1092 dev->rxinitdone = true;
1093 1093
1094 return 0; 1094 return 0;
1095 } 1095 }
1096 1096
1097 static int kvaser_usb_set_opt_mode(const struct kvaser_usb_net_priv *priv) 1097 static int kvaser_usb_set_opt_mode(const struct kvaser_usb_net_priv *priv)
1098 { 1098 {
1099 struct kvaser_msg *msg; 1099 struct kvaser_msg *msg;
1100 int rc; 1100 int rc;
1101 1101
1102 msg = kmalloc(sizeof(*msg), GFP_KERNEL); 1102 msg = kmalloc(sizeof(*msg), GFP_KERNEL);
1103 if (!msg) 1103 if (!msg)
1104 return -ENOMEM; 1104 return -ENOMEM;
1105 1105
1106 msg->id = CMD_SET_CTRL_MODE; 1106 msg->id = CMD_SET_CTRL_MODE;
1107 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_ctrl_mode); 1107 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_ctrl_mode);
1108 msg->u.ctrl_mode.tid = 0xff; 1108 msg->u.ctrl_mode.tid = 0xff;
1109 msg->u.ctrl_mode.channel = priv->channel; 1109 msg->u.ctrl_mode.channel = priv->channel;
1110 1110
1111 if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) 1111 if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
1112 msg->u.ctrl_mode.ctrl_mode = KVASER_CTRL_MODE_SILENT; 1112 msg->u.ctrl_mode.ctrl_mode = KVASER_CTRL_MODE_SILENT;
1113 else 1113 else
1114 msg->u.ctrl_mode.ctrl_mode = KVASER_CTRL_MODE_NORMAL; 1114 msg->u.ctrl_mode.ctrl_mode = KVASER_CTRL_MODE_NORMAL;
1115 1115
1116 rc = kvaser_usb_send_msg(priv->dev, msg); 1116 rc = kvaser_usb_send_msg(priv->dev, msg);
1117 1117
1118 kfree(msg); 1118 kfree(msg);
1119 return rc; 1119 return rc;
1120 } 1120 }
1121 1121
1122 static int kvaser_usb_start_chip(struct kvaser_usb_net_priv *priv) 1122 static int kvaser_usb_start_chip(struct kvaser_usb_net_priv *priv)
1123 { 1123 {
1124 int err; 1124 int err;
1125 1125
1126 init_completion(&priv->start_comp); 1126 init_completion(&priv->start_comp);
1127 1127
1128 err = kvaser_usb_send_simple_msg(priv->dev, CMD_START_CHIP, 1128 err = kvaser_usb_send_simple_msg(priv->dev, CMD_START_CHIP,
1129 priv->channel); 1129 priv->channel);
1130 if (err) 1130 if (err)
1131 return err; 1131 return err;
1132 1132
1133 if (!wait_for_completion_timeout(&priv->start_comp, 1133 if (!wait_for_completion_timeout(&priv->start_comp,
1134 msecs_to_jiffies(START_TIMEOUT))) 1134 msecs_to_jiffies(START_TIMEOUT)))
1135 return -ETIMEDOUT; 1135 return -ETIMEDOUT;
1136 1136
1137 return 0; 1137 return 0;
1138 } 1138 }
1139 1139
1140 static int kvaser_usb_open(struct net_device *netdev) 1140 static int kvaser_usb_open(struct net_device *netdev)
1141 { 1141 {
1142 struct kvaser_usb_net_priv *priv = netdev_priv(netdev); 1142 struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
1143 struct kvaser_usb *dev = priv->dev; 1143 struct kvaser_usb *dev = priv->dev;
1144 int err; 1144 int err;
1145 1145
1146 err = open_candev(netdev); 1146 err = open_candev(netdev);
1147 if (err) 1147 if (err)
1148 return err; 1148 return err;
1149 1149
1150 err = kvaser_usb_setup_rx_urbs(dev); 1150 err = kvaser_usb_setup_rx_urbs(dev);
1151 if (err) 1151 if (err)
1152 goto error; 1152 goto error;
1153 1153
1154 err = kvaser_usb_set_opt_mode(priv); 1154 err = kvaser_usb_set_opt_mode(priv);
1155 if (err) 1155 if (err)
1156 goto error; 1156 goto error;
1157 1157
1158 err = kvaser_usb_start_chip(priv); 1158 err = kvaser_usb_start_chip(priv);
1159 if (err) { 1159 if (err) {
1160 netdev_warn(netdev, "Cannot start device, error %d\n", err); 1160 netdev_warn(netdev, "Cannot start device, error %d\n", err);
1161 goto error; 1161 goto error;
1162 } 1162 }
1163 1163
1164 priv->can.state = CAN_STATE_ERROR_ACTIVE; 1164 priv->can.state = CAN_STATE_ERROR_ACTIVE;
1165 1165
1166 return 0; 1166 return 0;
1167 1167
1168 error: 1168 error:
1169 close_candev(netdev); 1169 close_candev(netdev);
1170 return err; 1170 return err;
1171 } 1171 }
1172 1172
1173 static void kvaser_usb_unlink_all_urbs(struct kvaser_usb *dev) 1173 static void kvaser_usb_unlink_all_urbs(struct kvaser_usb *dev)
1174 { 1174 {
1175 int i; 1175 int i;
1176 1176
1177 usb_kill_anchored_urbs(&dev->rx_submitted); 1177 usb_kill_anchored_urbs(&dev->rx_submitted);
1178 1178
1179 for (i = 0; i < MAX_RX_URBS; i++) 1179 for (i = 0; i < MAX_RX_URBS; i++)
1180 usb_free_coherent(dev->udev, RX_BUFFER_SIZE, 1180 usb_free_coherent(dev->udev, RX_BUFFER_SIZE,
1181 dev->rxbuf[i], 1181 dev->rxbuf[i],
1182 dev->rxbuf_dma[i]); 1182 dev->rxbuf_dma[i]);
1183 1183
1184 for (i = 0; i < MAX_NET_DEVICES; i++) { 1184 for (i = 0; i < MAX_NET_DEVICES; i++) {
1185 struct kvaser_usb_net_priv *priv = dev->nets[i]; 1185 struct kvaser_usb_net_priv *priv = dev->nets[i];
1186 1186
1187 if (priv) 1187 if (priv)
1188 kvaser_usb_unlink_tx_urbs(priv); 1188 kvaser_usb_unlink_tx_urbs(priv);
1189 } 1189 }
1190 } 1190 }
1191 1191
1192 static int kvaser_usb_stop_chip(struct kvaser_usb_net_priv *priv) 1192 static int kvaser_usb_stop_chip(struct kvaser_usb_net_priv *priv)
1193 { 1193 {
1194 int err; 1194 int err;
1195 1195
1196 init_completion(&priv->stop_comp); 1196 init_completion(&priv->stop_comp);
1197 1197
1198 err = kvaser_usb_send_simple_msg(priv->dev, CMD_STOP_CHIP, 1198 err = kvaser_usb_send_simple_msg(priv->dev, CMD_STOP_CHIP,
1199 priv->channel); 1199 priv->channel);
1200 if (err) 1200 if (err)
1201 return err; 1201 return err;
1202 1202
1203 if (!wait_for_completion_timeout(&priv->stop_comp, 1203 if (!wait_for_completion_timeout(&priv->stop_comp,
1204 msecs_to_jiffies(STOP_TIMEOUT))) 1204 msecs_to_jiffies(STOP_TIMEOUT)))
1205 return -ETIMEDOUT; 1205 return -ETIMEDOUT;
1206 1206
1207 return 0; 1207 return 0;
1208 } 1208 }
1209 1209
1210 static int kvaser_usb_flush_queue(struct kvaser_usb_net_priv *priv) 1210 static int kvaser_usb_flush_queue(struct kvaser_usb_net_priv *priv)
1211 { 1211 {
1212 struct kvaser_msg *msg; 1212 struct kvaser_msg *msg;
1213 int rc; 1213 int rc;
1214 1214
1215 msg = kmalloc(sizeof(*msg), GFP_KERNEL); 1215 msg = kmalloc(sizeof(*msg), GFP_KERNEL);
1216 if (!msg) 1216 if (!msg)
1217 return -ENOMEM; 1217 return -ENOMEM;
1218 1218
1219 msg->id = CMD_FLUSH_QUEUE; 1219 msg->id = CMD_FLUSH_QUEUE;
1220 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_flush_queue); 1220 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_flush_queue);
1221 msg->u.flush_queue.channel = priv->channel; 1221 msg->u.flush_queue.channel = priv->channel;
1222 msg->u.flush_queue.flags = 0x00; 1222 msg->u.flush_queue.flags = 0x00;
1223 1223
1224 rc = kvaser_usb_send_msg(priv->dev, msg); 1224 rc = kvaser_usb_send_msg(priv->dev, msg);
1225 1225
1226 kfree(msg); 1226 kfree(msg);
1227 return rc; 1227 return rc;
1228 } 1228 }
1229 1229
1230 static int kvaser_usb_close(struct net_device *netdev) 1230 static int kvaser_usb_close(struct net_device *netdev)
1231 { 1231 {
1232 struct kvaser_usb_net_priv *priv = netdev_priv(netdev); 1232 struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
1233 struct kvaser_usb *dev = priv->dev; 1233 struct kvaser_usb *dev = priv->dev;
1234 int err; 1234 int err;
1235 1235
1236 netif_stop_queue(netdev); 1236 netif_stop_queue(netdev);
1237 1237
1238 err = kvaser_usb_flush_queue(priv); 1238 err = kvaser_usb_flush_queue(priv);
1239 if (err) 1239 if (err)
1240 netdev_warn(netdev, "Cannot flush queue, error %d\n", err); 1240 netdev_warn(netdev, "Cannot flush queue, error %d\n", err);
1241 1241
1242 if (kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, priv->channel)) 1242 if (kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, priv->channel))
1243 netdev_warn(netdev, "Cannot reset card, error %d\n", err); 1243 netdev_warn(netdev, "Cannot reset card, error %d\n", err);
1244 1244
1245 err = kvaser_usb_stop_chip(priv); 1245 err = kvaser_usb_stop_chip(priv);
1246 if (err) 1246 if (err)
1247 netdev_warn(netdev, "Cannot stop device, error %d\n", err); 1247 netdev_warn(netdev, "Cannot stop device, error %d\n", err);
1248 1248
1249 priv->can.state = CAN_STATE_STOPPED; 1249 priv->can.state = CAN_STATE_STOPPED;
1250 close_candev(priv->netdev); 1250 close_candev(priv->netdev);
1251 1251
1252 return 0; 1252 return 0;
1253 } 1253 }
1254 1254
1255 static void kvaser_usb_write_bulk_callback(struct urb *urb) 1255 static void kvaser_usb_write_bulk_callback(struct urb *urb)
1256 { 1256 {
1257 struct kvaser_usb_tx_urb_context *context = urb->context; 1257 struct kvaser_usb_tx_urb_context *context = urb->context;
1258 struct kvaser_usb_net_priv *priv; 1258 struct kvaser_usb_net_priv *priv;
1259 struct net_device *netdev; 1259 struct net_device *netdev;
1260 1260
1261 if (WARN_ON(!context)) 1261 if (WARN_ON(!context))
1262 return; 1262 return;
1263 1263
1264 priv = context->priv; 1264 priv = context->priv;
1265 netdev = priv->netdev; 1265 netdev = priv->netdev;
1266 1266
1267 kfree(urb->transfer_buffer); 1267 kfree(urb->transfer_buffer);
1268 1268
1269 if (!netif_device_present(netdev)) 1269 if (!netif_device_present(netdev))
1270 return; 1270 return;
1271 1271
1272 if (urb->status) 1272 if (urb->status)
1273 netdev_info(netdev, "Tx URB aborted (%d)\n", urb->status); 1273 netdev_info(netdev, "Tx URB aborted (%d)\n", urb->status);
1274 } 1274 }
1275 1275
1276 static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb, 1276 static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,
1277 struct net_device *netdev) 1277 struct net_device *netdev)
1278 { 1278 {
1279 struct kvaser_usb_net_priv *priv = netdev_priv(netdev); 1279 struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
1280 struct kvaser_usb *dev = priv->dev; 1280 struct kvaser_usb *dev = priv->dev;
1281 struct net_device_stats *stats = &netdev->stats; 1281 struct net_device_stats *stats = &netdev->stats;
1282 struct can_frame *cf = (struct can_frame *)skb->data; 1282 struct can_frame *cf = (struct can_frame *)skb->data;
1283 struct kvaser_usb_tx_urb_context *context = NULL; 1283 struct kvaser_usb_tx_urb_context *context = NULL;
1284 struct urb *urb; 1284 struct urb *urb;
1285 void *buf; 1285 void *buf;
1286 struct kvaser_msg *msg; 1286 struct kvaser_msg *msg;
1287 int i, err; 1287 int i, err;
1288 int ret = NETDEV_TX_OK; 1288 int ret = NETDEV_TX_OK;
1289 1289
1290 if (can_dropped_invalid_skb(netdev, skb)) 1290 if (can_dropped_invalid_skb(netdev, skb))
1291 return NETDEV_TX_OK; 1291 return NETDEV_TX_OK;
1292 1292
1293 urb = usb_alloc_urb(0, GFP_ATOMIC); 1293 urb = usb_alloc_urb(0, GFP_ATOMIC);
1294 if (!urb) { 1294 if (!urb) {
1295 netdev_err(netdev, "No memory left for URBs\n"); 1295 netdev_err(netdev, "No memory left for URBs\n");
1296 stats->tx_dropped++; 1296 stats->tx_dropped++;
1297 goto nourbmem; 1297 dev_kfree_skb(skb);
1298 return NETDEV_TX_OK;
1298 } 1299 }
1299 1300
1300 buf = kmalloc(sizeof(struct kvaser_msg), GFP_ATOMIC); 1301 buf = kmalloc(sizeof(struct kvaser_msg), GFP_ATOMIC);
1301 if (!buf) { 1302 if (!buf) {
1302 stats->tx_dropped++; 1303 stats->tx_dropped++;
1304 dev_kfree_skb(skb);
1303 goto nobufmem; 1305 goto nobufmem;
1304 } 1306 }
1305 1307
1306 msg = buf; 1308 msg = buf;
1307 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_tx_can); 1309 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_tx_can);
1308 msg->u.tx_can.flags = 0; 1310 msg->u.tx_can.flags = 0;
1309 msg->u.tx_can.channel = priv->channel; 1311 msg->u.tx_can.channel = priv->channel;
1310 1312
1311 if (cf->can_id & CAN_EFF_FLAG) { 1313 if (cf->can_id & CAN_EFF_FLAG) {
1312 msg->id = CMD_TX_EXT_MESSAGE; 1314 msg->id = CMD_TX_EXT_MESSAGE;
1313 msg->u.tx_can.msg[0] = (cf->can_id >> 24) & 0x1f; 1315 msg->u.tx_can.msg[0] = (cf->can_id >> 24) & 0x1f;
1314 msg->u.tx_can.msg[1] = (cf->can_id >> 18) & 0x3f; 1316 msg->u.tx_can.msg[1] = (cf->can_id >> 18) & 0x3f;
1315 msg->u.tx_can.msg[2] = (cf->can_id >> 14) & 0x0f; 1317 msg->u.tx_can.msg[2] = (cf->can_id >> 14) & 0x0f;
1316 msg->u.tx_can.msg[3] = (cf->can_id >> 6) & 0xff; 1318 msg->u.tx_can.msg[3] = (cf->can_id >> 6) & 0xff;
1317 msg->u.tx_can.msg[4] = cf->can_id & 0x3f; 1319 msg->u.tx_can.msg[4] = cf->can_id & 0x3f;
1318 } else { 1320 } else {
1319 msg->id = CMD_TX_STD_MESSAGE; 1321 msg->id = CMD_TX_STD_MESSAGE;
1320 msg->u.tx_can.msg[0] = (cf->can_id >> 6) & 0x1f; 1322 msg->u.tx_can.msg[0] = (cf->can_id >> 6) & 0x1f;
1321 msg->u.tx_can.msg[1] = cf->can_id & 0x3f; 1323 msg->u.tx_can.msg[1] = cf->can_id & 0x3f;
1322 } 1324 }
1323 1325
1324 msg->u.tx_can.msg[5] = cf->can_dlc; 1326 msg->u.tx_can.msg[5] = cf->can_dlc;
1325 memcpy(&msg->u.tx_can.msg[6], cf->data, cf->can_dlc); 1327 memcpy(&msg->u.tx_can.msg[6], cf->data, cf->can_dlc);
1326 1328
1327 if (cf->can_id & CAN_RTR_FLAG) 1329 if (cf->can_id & CAN_RTR_FLAG)
1328 msg->u.tx_can.flags |= MSG_FLAG_REMOTE_FRAME; 1330 msg->u.tx_can.flags |= MSG_FLAG_REMOTE_FRAME;
1329 1331
1330 for (i = 0; i < ARRAY_SIZE(priv->tx_contexts); i++) { 1332 for (i = 0; i < ARRAY_SIZE(priv->tx_contexts); i++) {
1331 if (priv->tx_contexts[i].echo_index == MAX_TX_URBS) { 1333 if (priv->tx_contexts[i].echo_index == MAX_TX_URBS) {
1332 context = &priv->tx_contexts[i]; 1334 context = &priv->tx_contexts[i];
1333 break; 1335 break;
1334 } 1336 }
1335 } 1337 }
1336 1338
1339 /* This should never happen; it implies a flow control bug */
1337 if (!context) { 1340 if (!context) {
1338 netdev_warn(netdev, "cannot find free context\n"); 1341 netdev_warn(netdev, "cannot find free context\n");
1339 ret = NETDEV_TX_BUSY; 1342 ret = NETDEV_TX_BUSY;
1340 goto releasebuf; 1343 goto releasebuf;
1341 } 1344 }
1342 1345
1343 context->priv = priv; 1346 context->priv = priv;
1344 context->echo_index = i; 1347 context->echo_index = i;
1345 context->dlc = cf->can_dlc; 1348 context->dlc = cf->can_dlc;
1346 1349
1347 msg->u.tx_can.tid = context->echo_index; 1350 msg->u.tx_can.tid = context->echo_index;
1348 1351
1349 usb_fill_bulk_urb(urb, dev->udev, 1352 usb_fill_bulk_urb(urb, dev->udev,
1350 usb_sndbulkpipe(dev->udev, 1353 usb_sndbulkpipe(dev->udev,
1351 dev->bulk_out->bEndpointAddress), 1354 dev->bulk_out->bEndpointAddress),
1352 buf, msg->len, 1355 buf, msg->len,
1353 kvaser_usb_write_bulk_callback, context); 1356 kvaser_usb_write_bulk_callback, context);
1354 usb_anchor_urb(urb, &priv->tx_submitted); 1357 usb_anchor_urb(urb, &priv->tx_submitted);
1355 1358
1356 can_put_echo_skb(skb, netdev, context->echo_index); 1359 can_put_echo_skb(skb, netdev, context->echo_index);
1357 1360
1358 atomic_inc(&priv->active_tx_urbs); 1361 atomic_inc(&priv->active_tx_urbs);
1359 1362
1360 if (atomic_read(&priv->active_tx_urbs) >= MAX_TX_URBS) 1363 if (atomic_read(&priv->active_tx_urbs) >= MAX_TX_URBS)
1361 netif_stop_queue(netdev); 1364 netif_stop_queue(netdev);
1362 1365
1363 err = usb_submit_urb(urb, GFP_ATOMIC); 1366 err = usb_submit_urb(urb, GFP_ATOMIC);
1364 if (unlikely(err)) { 1367 if (unlikely(err)) {
1365 can_free_echo_skb(netdev, context->echo_index); 1368 can_free_echo_skb(netdev, context->echo_index);
1366 1369
1367 skb = NULL; /* set to NULL to avoid double free in
1368 * dev_kfree_skb(skb) */
1369
1370 atomic_dec(&priv->active_tx_urbs); 1370 atomic_dec(&priv->active_tx_urbs);
1371 usb_unanchor_urb(urb); 1371 usb_unanchor_urb(urb);
1372 1372
1373 stats->tx_dropped++; 1373 stats->tx_dropped++;
1374 1374
1375 if (err == -ENODEV) 1375 if (err == -ENODEV)
1376 netif_device_detach(netdev); 1376 netif_device_detach(netdev);
1377 else 1377 else
1378 netdev_warn(netdev, "Failed tx_urb %d\n", err); 1378 netdev_warn(netdev, "Failed tx_urb %d\n", err);
1379 1379
1380 goto releasebuf; 1380 goto releasebuf;
1381 } 1381 }
1382 1382
1383 usb_free_urb(urb); 1383 usb_free_urb(urb);
1384 1384
1385 return NETDEV_TX_OK; 1385 return NETDEV_TX_OK;
1386 1386
1387 releasebuf: 1387 releasebuf:
1388 kfree(buf); 1388 kfree(buf);
1389 nobufmem: 1389 nobufmem:
1390 usb_free_urb(urb); 1390 usb_free_urb(urb);
1391 nourbmem:
1392 dev_kfree_skb(skb);
1393 return ret; 1391 return ret;
1394 } 1392 }
1395 1393
1396 static const struct net_device_ops kvaser_usb_netdev_ops = { 1394 static const struct net_device_ops kvaser_usb_netdev_ops = {
1397 .ndo_open = kvaser_usb_open, 1395 .ndo_open = kvaser_usb_open,
1398 .ndo_stop = kvaser_usb_close, 1396 .ndo_stop = kvaser_usb_close,
1399 .ndo_start_xmit = kvaser_usb_start_xmit, 1397 .ndo_start_xmit = kvaser_usb_start_xmit,
1400 .ndo_change_mtu = can_change_mtu, 1398 .ndo_change_mtu = can_change_mtu,
1401 }; 1399 };
1402 1400
1403 static const struct can_bittiming_const kvaser_usb_bittiming_const = { 1401 static const struct can_bittiming_const kvaser_usb_bittiming_const = {
1404 .name = "kvaser_usb", 1402 .name = "kvaser_usb",
1405 .tseg1_min = KVASER_USB_TSEG1_MIN, 1403 .tseg1_min = KVASER_USB_TSEG1_MIN,
1406 .tseg1_max = KVASER_USB_TSEG1_MAX, 1404 .tseg1_max = KVASER_USB_TSEG1_MAX,
1407 .tseg2_min = KVASER_USB_TSEG2_MIN, 1405 .tseg2_min = KVASER_USB_TSEG2_MIN,
1408 .tseg2_max = KVASER_USB_TSEG2_MAX, 1406 .tseg2_max = KVASER_USB_TSEG2_MAX,
1409 .sjw_max = KVASER_USB_SJW_MAX, 1407 .sjw_max = KVASER_USB_SJW_MAX,
1410 .brp_min = KVASER_USB_BRP_MIN, 1408 .brp_min = KVASER_USB_BRP_MIN,
1411 .brp_max = KVASER_USB_BRP_MAX, 1409 .brp_max = KVASER_USB_BRP_MAX,
1412 .brp_inc = KVASER_USB_BRP_INC, 1410 .brp_inc = KVASER_USB_BRP_INC,
1413 }; 1411 };
1414 1412
1415 static int kvaser_usb_set_bittiming(struct net_device *netdev) 1413 static int kvaser_usb_set_bittiming(struct net_device *netdev)
1416 { 1414 {
1417 struct kvaser_usb_net_priv *priv = netdev_priv(netdev); 1415 struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
1418 struct can_bittiming *bt = &priv->can.bittiming; 1416 struct can_bittiming *bt = &priv->can.bittiming;
1419 struct kvaser_usb *dev = priv->dev; 1417 struct kvaser_usb *dev = priv->dev;
1420 struct kvaser_msg *msg; 1418 struct kvaser_msg *msg;
1421 int rc; 1419 int rc;
1422 1420
1423 msg = kmalloc(sizeof(*msg), GFP_KERNEL); 1421 msg = kmalloc(sizeof(*msg), GFP_KERNEL);
1424 if (!msg) 1422 if (!msg)
1425 return -ENOMEM; 1423 return -ENOMEM;
1426 1424
1427 msg->id = CMD_SET_BUS_PARAMS; 1425 msg->id = CMD_SET_BUS_PARAMS;
1428 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_busparams); 1426 msg->len = MSG_HEADER_LEN + sizeof(struct kvaser_msg_busparams);
1429 msg->u.busparams.channel = priv->channel; 1427 msg->u.busparams.channel = priv->channel;
1430 msg->u.busparams.tid = 0xff; 1428 msg->u.busparams.tid = 0xff;
1431 msg->u.busparams.bitrate = cpu_to_le32(bt->bitrate); 1429 msg->u.busparams.bitrate = cpu_to_le32(bt->bitrate);
1432 msg->u.busparams.sjw = bt->sjw; 1430 msg->u.busparams.sjw = bt->sjw;
1433 msg->u.busparams.tseg1 = bt->prop_seg + bt->phase_seg1; 1431 msg->u.busparams.tseg1 = bt->prop_seg + bt->phase_seg1;
1434 msg->u.busparams.tseg2 = bt->phase_seg2; 1432 msg->u.busparams.tseg2 = bt->phase_seg2;
1435 1433
1436 if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) 1434 if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
1437 msg->u.busparams.no_samp = 3; 1435 msg->u.busparams.no_samp = 3;
1438 else 1436 else
1439 msg->u.busparams.no_samp = 1; 1437 msg->u.busparams.no_samp = 1;
1440 1438
1441 rc = kvaser_usb_send_msg(dev, msg); 1439 rc = kvaser_usb_send_msg(dev, msg);
1442 1440
1443 kfree(msg); 1441 kfree(msg);
1444 return rc; 1442 return rc;
1445 } 1443 }
1446 1444
1447 static int kvaser_usb_set_mode(struct net_device *netdev, 1445 static int kvaser_usb_set_mode(struct net_device *netdev,
1448 enum can_mode mode) 1446 enum can_mode mode)
1449 { 1447 {
1450 struct kvaser_usb_net_priv *priv = netdev_priv(netdev); 1448 struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
1451 int err; 1449 int err;
1452 1450
1453 switch (mode) { 1451 switch (mode) {
1454 case CAN_MODE_START: 1452 case CAN_MODE_START:
1455 err = kvaser_usb_simple_msg_async(priv, CMD_START_CHIP); 1453 err = kvaser_usb_simple_msg_async(priv, CMD_START_CHIP);
1456 if (err) 1454 if (err)
1457 return err; 1455 return err;
1458 break; 1456 break;
1459 default: 1457 default:
1460 return -EOPNOTSUPP; 1458 return -EOPNOTSUPP;
1461 } 1459 }
1462 1460
1463 return 0; 1461 return 0;
1464 } 1462 }
1465 1463
1466 static int kvaser_usb_get_berr_counter(const struct net_device *netdev, 1464 static int kvaser_usb_get_berr_counter(const struct net_device *netdev,
1467 struct can_berr_counter *bec) 1465 struct can_berr_counter *bec)
1468 { 1466 {
1469 struct kvaser_usb_net_priv *priv = netdev_priv(netdev); 1467 struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
1470 1468
1471 *bec = priv->bec; 1469 *bec = priv->bec;
1472 1470
1473 return 0; 1471 return 0;
1474 } 1472 }
1475 1473
1476 static void kvaser_usb_remove_interfaces(struct kvaser_usb *dev) 1474 static void kvaser_usb_remove_interfaces(struct kvaser_usb *dev)
1477 { 1475 {
1478 int i; 1476 int i;
1479 1477
1480 for (i = 0; i < dev->nchannels; i++) { 1478 for (i = 0; i < dev->nchannels; i++) {
1481 if (!dev->nets[i]) 1479 if (!dev->nets[i])
1482 continue; 1480 continue;
1483 1481
1484 unregister_netdev(dev->nets[i]->netdev); 1482 unregister_netdev(dev->nets[i]->netdev);
1485 } 1483 }
1486 1484
1487 kvaser_usb_unlink_all_urbs(dev); 1485 kvaser_usb_unlink_all_urbs(dev);
1488 1486
1489 for (i = 0; i < dev->nchannels; i++) { 1487 for (i = 0; i < dev->nchannels; i++) {
1490 if (!dev->nets[i]) 1488 if (!dev->nets[i])
1491 continue; 1489 continue;
1492 1490
1493 free_candev(dev->nets[i]->netdev); 1491 free_candev(dev->nets[i]->netdev);
1494 } 1492 }
1495 } 1493 }
1496 1494
1497 static int kvaser_usb_init_one(struct usb_interface *intf, 1495 static int kvaser_usb_init_one(struct usb_interface *intf,
1498 const struct usb_device_id *id, int channel) 1496 const struct usb_device_id *id, int channel)
1499 { 1497 {
1500 struct kvaser_usb *dev = usb_get_intfdata(intf); 1498 struct kvaser_usb *dev = usb_get_intfdata(intf);
1501 struct net_device *netdev; 1499 struct net_device *netdev;
1502 struct kvaser_usb_net_priv *priv; 1500 struct kvaser_usb_net_priv *priv;
1503 int i, err; 1501 int i, err;
1504 1502
1505 netdev = alloc_candev(sizeof(*priv), MAX_TX_URBS); 1503 netdev = alloc_candev(sizeof(*priv), MAX_TX_URBS);
1506 if (!netdev) { 1504 if (!netdev) {
1507 dev_err(&intf->dev, "Cannot alloc candev\n"); 1505 dev_err(&intf->dev, "Cannot alloc candev\n");
1508 return -ENOMEM; 1506 return -ENOMEM;
1509 } 1507 }
1510 1508
1511 priv = netdev_priv(netdev); 1509 priv = netdev_priv(netdev);
1512 1510
1513 init_completion(&priv->start_comp); 1511 init_completion(&priv->start_comp);
1514 init_completion(&priv->stop_comp); 1512 init_completion(&priv->stop_comp);
1515 1513
1516 init_usb_anchor(&priv->tx_submitted); 1514 init_usb_anchor(&priv->tx_submitted);
1517 atomic_set(&priv->active_tx_urbs, 0); 1515 atomic_set(&priv->active_tx_urbs, 0);
1518 1516
1519 for (i = 0; i < ARRAY_SIZE(priv->tx_contexts); i++) 1517 for (i = 0; i < ARRAY_SIZE(priv->tx_contexts); i++)
1520 priv->tx_contexts[i].echo_index = MAX_TX_URBS; 1518 priv->tx_contexts[i].echo_index = MAX_TX_URBS;
1521 1519
1522 priv->dev = dev; 1520 priv->dev = dev;
1523 priv->netdev = netdev; 1521 priv->netdev = netdev;
1524 priv->channel = channel; 1522 priv->channel = channel;
1525 1523
1526 priv->can.state = CAN_STATE_STOPPED; 1524 priv->can.state = CAN_STATE_STOPPED;
1527 priv->can.clock.freq = CAN_USB_CLOCK; 1525 priv->can.clock.freq = CAN_USB_CLOCK;
1528 priv->can.bittiming_const = &kvaser_usb_bittiming_const; 1526 priv->can.bittiming_const = &kvaser_usb_bittiming_const;
1529 priv->can.do_set_bittiming = kvaser_usb_set_bittiming; 1527 priv->can.do_set_bittiming = kvaser_usb_set_bittiming;
1530 priv->can.do_set_mode = kvaser_usb_set_mode; 1528 priv->can.do_set_mode = kvaser_usb_set_mode;
1531 if (id->driver_info & KVASER_HAS_TXRX_ERRORS) 1529 if (id->driver_info & KVASER_HAS_TXRX_ERRORS)
1532 priv->can.do_get_berr_counter = kvaser_usb_get_berr_counter; 1530 priv->can.do_get_berr_counter = kvaser_usb_get_berr_counter;
1533 priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES; 1531 priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
1534 if (id->driver_info & KVASER_HAS_SILENT_MODE) 1532 if (id->driver_info & KVASER_HAS_SILENT_MODE)
1535 priv->can.ctrlmode_supported |= CAN_CTRLMODE_LISTENONLY; 1533 priv->can.ctrlmode_supported |= CAN_CTRLMODE_LISTENONLY;
1536 1534
1537 netdev->flags |= IFF_ECHO; 1535 netdev->flags |= IFF_ECHO;
1538 1536
1539 netdev->netdev_ops = &kvaser_usb_netdev_ops; 1537 netdev->netdev_ops = &kvaser_usb_netdev_ops;
1540 1538
1541 SET_NETDEV_DEV(netdev, &intf->dev); 1539 SET_NETDEV_DEV(netdev, &intf->dev);
1542 netdev->dev_id = channel; 1540 netdev->dev_id = channel;
1543 1541
1544 dev->nets[channel] = priv; 1542 dev->nets[channel] = priv;
1545 1543
1546 err = register_candev(netdev); 1544 err = register_candev(netdev);
1547 if (err) { 1545 if (err) {
1548 dev_err(&intf->dev, "Failed to register can device\n"); 1546 dev_err(&intf->dev, "Failed to register can device\n");
1549 free_candev(netdev); 1547 free_candev(netdev);
1550 dev->nets[channel] = NULL; 1548 dev->nets[channel] = NULL;
1551 return err; 1549 return err;
1552 } 1550 }
1553 1551
1554 netdev_dbg(netdev, "device registered\n"); 1552 netdev_dbg(netdev, "device registered\n");
1555 1553
1556 return 0; 1554 return 0;
1557 } 1555 }
1558 1556
1559 static int kvaser_usb_get_endpoints(const struct usb_interface *intf, 1557 static int kvaser_usb_get_endpoints(const struct usb_interface *intf,
1560 struct usb_endpoint_descriptor **in, 1558 struct usb_endpoint_descriptor **in,
1561 struct usb_endpoint_descriptor **out) 1559 struct usb_endpoint_descriptor **out)
1562 { 1560 {
1563 const struct usb_host_interface *iface_desc; 1561 const struct usb_host_interface *iface_desc;
1564 struct usb_endpoint_descriptor *endpoint; 1562 struct usb_endpoint_descriptor *endpoint;
1565 int i; 1563 int i;
1566 1564
1567 iface_desc = &intf->altsetting[0]; 1565 iface_desc = &intf->altsetting[0];
1568 1566
1569 for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { 1567 for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
1570 endpoint = &iface_desc->endpoint[i].desc; 1568 endpoint = &iface_desc->endpoint[i].desc;
1571 1569
1572 if (!*in && usb_endpoint_is_bulk_in(endpoint)) 1570 if (!*in && usb_endpoint_is_bulk_in(endpoint))
1573 *in = endpoint; 1571 *in = endpoint;
1574 1572
1575 if (!*out && usb_endpoint_is_bulk_out(endpoint)) 1573 if (!*out && usb_endpoint_is_bulk_out(endpoint))
1576 *out = endpoint; 1574 *out = endpoint;
1577 1575
1578 /* use first bulk endpoint for in and out */ 1576 /* use first bulk endpoint for in and out */
1579 if (*in && *out) 1577 if (*in && *out)
1580 return 0; 1578 return 0;
1581 } 1579 }
1582 1580
1583 return -ENODEV; 1581 return -ENODEV;
1584 } 1582 }
1585 1583
1586 static int kvaser_usb_probe(struct usb_interface *intf, 1584 static int kvaser_usb_probe(struct usb_interface *intf,
1587 const struct usb_device_id *id) 1585 const struct usb_device_id *id)
1588 { 1586 {
1589 struct kvaser_usb *dev; 1587 struct kvaser_usb *dev;
1590 int err = -ENOMEM; 1588 int err = -ENOMEM;
1591 int i; 1589 int i;
1592 1590
1593 dev = devm_kzalloc(&intf->dev, sizeof(*dev), GFP_KERNEL); 1591 dev = devm_kzalloc(&intf->dev, sizeof(*dev), GFP_KERNEL);
1594 if (!dev) 1592 if (!dev)
1595 return -ENOMEM; 1593 return -ENOMEM;
1596 1594
1597 err = kvaser_usb_get_endpoints(intf, &dev->bulk_in, &dev->bulk_out); 1595 err = kvaser_usb_get_endpoints(intf, &dev->bulk_in, &dev->bulk_out);
1598 if (err) { 1596 if (err) {
1599 dev_err(&intf->dev, "Cannot get usb endpoint(s)"); 1597 dev_err(&intf->dev, "Cannot get usb endpoint(s)");
1600 return err; 1598 return err;
1601 } 1599 }
1602 1600
1603 dev->udev = interface_to_usbdev(intf); 1601 dev->udev = interface_to_usbdev(intf);
1604 1602
1605 init_usb_anchor(&dev->rx_submitted); 1603 init_usb_anchor(&dev->rx_submitted);
1606 1604
1607 usb_set_intfdata(intf, dev); 1605 usb_set_intfdata(intf, dev);
1608 1606
1609 for (i = 0; i < MAX_NET_DEVICES; i++) 1607 for (i = 0; i < MAX_NET_DEVICES; i++)
1610 kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, i); 1608 kvaser_usb_send_simple_msg(dev, CMD_RESET_CHIP, i);
1611 1609
1612 err = kvaser_usb_get_software_info(dev); 1610 err = kvaser_usb_get_software_info(dev);
1613 if (err) { 1611 if (err) {
1614 dev_err(&intf->dev, 1612 dev_err(&intf->dev,
1615 "Cannot get software infos, error %d\n", err); 1613 "Cannot get software infos, error %d\n", err);
1616 return err; 1614 return err;
1617 } 1615 }
1618 1616
1619 err = kvaser_usb_get_card_info(dev); 1617 err = kvaser_usb_get_card_info(dev);
1620 if (err) { 1618 if (err) {
1621 dev_err(&intf->dev, 1619 dev_err(&intf->dev,
1622 "Cannot get card infos, error %d\n", err); 1620 "Cannot get card infos, error %d\n", err);
1623 return err; 1621 return err;
1624 } 1622 }
1625 1623
1626 dev_dbg(&intf->dev, "Firmware version: %d.%d.%d\n", 1624 dev_dbg(&intf->dev, "Firmware version: %d.%d.%d\n",
1627 ((dev->fw_version >> 24) & 0xff), 1625 ((dev->fw_version >> 24) & 0xff),
1628 ((dev->fw_version >> 16) & 0xff), 1626 ((dev->fw_version >> 16) & 0xff),
1629 (dev->fw_version & 0xffff)); 1627 (dev->fw_version & 0xffff));
1630 1628
1631 for (i = 0; i < dev->nchannels; i++) { 1629 for (i = 0; i < dev->nchannels; i++) {
1632 err = kvaser_usb_init_one(intf, id, i); 1630 err = kvaser_usb_init_one(intf, id, i);
1633 if (err) { 1631 if (err) {
1634 kvaser_usb_remove_interfaces(dev); 1632 kvaser_usb_remove_interfaces(dev);
1635 return err; 1633 return err;
1636 } 1634 }
1637 } 1635 }
1638 1636
1639 return 0; 1637 return 0;
1640 } 1638 }
1641 1639
1642 static void kvaser_usb_disconnect(struct usb_interface *intf) 1640 static void kvaser_usb_disconnect(struct usb_interface *intf)
1643 { 1641 {
1644 struct kvaser_usb *dev = usb_get_intfdata(intf); 1642 struct kvaser_usb *dev = usb_get_intfdata(intf);
1645 1643
1646 usb_set_intfdata(intf, NULL); 1644 usb_set_intfdata(intf, NULL);
1647 1645
1648 if (!dev) 1646 if (!dev)
1649 return; 1647 return;
1650 1648
1651 kvaser_usb_remove_interfaces(dev); 1649 kvaser_usb_remove_interfaces(dev);
1652 } 1650 }
1653 1651
1654 static struct usb_driver kvaser_usb_driver = { 1652 static struct usb_driver kvaser_usb_driver = {
1655 .name = "kvaser_usb", 1653 .name = "kvaser_usb",
1656 .probe = kvaser_usb_probe, 1654 .probe = kvaser_usb_probe,
1657 .disconnect = kvaser_usb_disconnect, 1655 .disconnect = kvaser_usb_disconnect,
1658 .id_table = kvaser_usb_table, 1656 .id_table = kvaser_usb_table,
1659 }; 1657 };
1660 1658
1661 module_usb_driver(kvaser_usb_driver); 1659 module_usb_driver(kvaser_usb_driver);
1662 1660
1663 MODULE_AUTHOR("Olivier Sobrie <olivier@sobrie.be>"); 1661 MODULE_AUTHOR("Olivier Sobrie <olivier@sobrie.be>");