forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-05-11 297b60346df8beafee954a0fd7c2d64f33f3b9bc 
 kernel/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
....@@ -79,104 +79,134 @@
7979 #define USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID	269
8080 #define USB_HYBRID_PRO_CANLIN_PRODUCT_ID	270
8181 
82
-static inline bool kvaser_is_leaf(const struct usb_device_id *id)
83
-{
84
-	return (id->idProduct >= USB_LEAF_DEVEL_PRODUCT_ID &&
85
-		id->idProduct <= USB_CAN_R_PRODUCT_ID) ||
86
-		(id->idProduct >= USB_LEAF_LITE_V2_PRODUCT_ID &&
87
-		 id->idProduct <= USB_MINI_PCIE_2HS_PRODUCT_ID);
88
-}
82
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_hydra = {
83
+	.quirks = 0,
84
+	.ops = &kvaser_usb_hydra_dev_ops,
85
+};
8986 
90
-static inline bool kvaser_is_usbcan(const struct usb_device_id *id)
91
-{
92
-	return id->idProduct >= USB_USBCAN_REVB_PRODUCT_ID &&
93
-	       id->idProduct <= USB_MEMORATOR_PRODUCT_ID;
94
-}
87
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_usbcan = {
88
+	.quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |
89
+		  KVASER_USB_QUIRK_HAS_SILENT_MODE,
90
+	.family = KVASER_USBCAN,
91
+	.ops = &kvaser_usb_leaf_dev_ops,
92
+};
9593 
96
-static inline bool kvaser_is_hydra(const struct usb_device_id *id)
97
-{
98
-	return id->idProduct >= USB_BLACKBIRD_V2_PRODUCT_ID &&
99
-	       id->idProduct <= USB_HYBRID_PRO_CANLIN_PRODUCT_ID;
100
-}
94
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf = {
95
+	.quirks = KVASER_USB_QUIRK_IGNORE_CLK_FREQ,
96
+	.family = KVASER_LEAF,
97
+	.ops = &kvaser_usb_leaf_dev_ops,
98
+};
99
+
100
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf_err = {
101
+	.quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |
102
+		  KVASER_USB_QUIRK_IGNORE_CLK_FREQ,
103
+	.family = KVASER_LEAF,
104
+	.ops = &kvaser_usb_leaf_dev_ops,
105
+};
106
+
107
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf_err_listen = {
108
+	.quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |
109
+		  KVASER_USB_QUIRK_HAS_SILENT_MODE |
110
+		  KVASER_USB_QUIRK_IGNORE_CLK_FREQ,
111
+	.family = KVASER_LEAF,
112
+	.ops = &kvaser_usb_leaf_dev_ops,
113
+};
114
+
115
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leafimx = {
116
+	.quirks = 0,
117
+	.ops = &kvaser_usb_leaf_dev_ops,
118
+};
101119 
102120 static const struct usb_device_id kvaser_usb_table[] = {
103
-	/* Leaf USB product IDs */
104
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_DEVEL_PRODUCT_ID) },
105
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_PRODUCT_ID) },
121
+	/* Leaf M32C USB product IDs */
122
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_DEVEL_PRODUCT_ID),
123
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf },
124
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_PRODUCT_ID),
125
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf },
106126 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_PRODUCT_ID),
107
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
108
-			       KVASER_USB_HAS_SILENT_MODE },
127
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
109128 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_PRODUCT_ID),
110
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
111
-			       KVASER_USB_HAS_SILENT_MODE },
129
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
112130 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_LS_PRODUCT_ID),
113
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
114
-			       KVASER_USB_HAS_SILENT_MODE },
131
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
115132 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_SWC_PRODUCT_ID),
116
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
117
-			       KVASER_USB_HAS_SILENT_MODE },
133
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
118134 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_LIN_PRODUCT_ID),
119
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
120
-			       KVASER_USB_HAS_SILENT_MODE },
135
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
121136 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_LS_PRODUCT_ID),
122
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
123
-			       KVASER_USB_HAS_SILENT_MODE },
137
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
124138 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_SWC_PRODUCT_ID),
125
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
126
-			       KVASER_USB_HAS_SILENT_MODE },
139
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
127140 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_DEVEL_PRODUCT_ID),
128
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
129
-			       KVASER_USB_HAS_SILENT_MODE },
141
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
130142 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_HSHS_PRODUCT_ID),
131
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
132
-			       KVASER_USB_HAS_SILENT_MODE },
143
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
133144 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_UPRO_HSHS_PRODUCT_ID),
134
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
135
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_GI_PRODUCT_ID) },
145
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
146
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_GI_PRODUCT_ID),
147
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf },
136148 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_OBDII_PRODUCT_ID),
137
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
138
-			       KVASER_USB_HAS_SILENT_MODE },
149
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
139150 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_HSLS_PRODUCT_ID),
140
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
151
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
141152 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_CH_PRODUCT_ID),
142
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
153
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
143154 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_SPRO_PRODUCT_ID),
144
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
155
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
145156 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_OEM_MERCURY_PRODUCT_ID),
146
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
157
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
147158 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_OEM_LEAF_PRODUCT_ID),
148
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
159
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
149160 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_CAN_R_PRODUCT_ID),
150
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
151
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID) },
152
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID) },
153
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID) },
154
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_2HS_PRODUCT_ID) },
155
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_2HS_PRODUCT_ID) },
161
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
162
+
163
+	/* Leaf i.MX28 USB product IDs */
164
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID),
165
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx },
166
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID),
167
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx },
168
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID),
169
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx },
170
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_2HS_PRODUCT_ID),
171
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx },
172
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_2HS_PRODUCT_ID),
173
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx },
156174 
157175 	/* USBCANII USB product IDs */
158176 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN2_PRODUCT_ID),
159
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
177
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_usbcan },
160178 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_REVB_PRODUCT_ID),
161
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
179
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_usbcan },
162180 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMORATOR_PRODUCT_ID),
163
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
181
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_usbcan },
164182 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_VCI2_PRODUCT_ID),
165
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
183
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_usbcan },
166184 
167185 	/* Minihydra USB product IDs */
168
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_V2_PRODUCT_ID) },
169
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_5HS_PRODUCT_ID) },
170
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_5HS_PRODUCT_ID) },
171
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_4HS_PRODUCT_ID) },
172
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_HS_V2_PRODUCT_ID) },
173
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_2HS_V2_PRODUCT_ID) },
174
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_2HS_PRODUCT_ID) },
175
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_2HS_V2_PRODUCT_ID) },
176
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_CANLIN_PRODUCT_ID) },
177
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID) },
178
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID) },
179
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_CANLIN_PRODUCT_ID) },
186
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_V2_PRODUCT_ID),
187
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
188
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_5HS_PRODUCT_ID),
189
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
190
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_5HS_PRODUCT_ID),
191
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
192
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_4HS_PRODUCT_ID),
193
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
194
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_HS_V2_PRODUCT_ID),
195
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
196
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_2HS_V2_PRODUCT_ID),
197
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
198
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_2HS_PRODUCT_ID),
199
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
200
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_2HS_V2_PRODUCT_ID),
201
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
202
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_CANLIN_PRODUCT_ID),
203
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
204
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID),
205
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
206
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID),
207
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
208
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_CANLIN_PRODUCT_ID),
209
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
180210 	{ }
181211 };
182212 MODULE_DEVICE_TABLE(usb, kvaser_usb_table);
....@@ -267,6 +297,7 @@
267297 static void kvaser_usb_read_bulk_callback(struct urb *urb)
268298 {
269299 	struct kvaser_usb *dev = urb->context;
300
+	const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
270301 	int err;
271302 	unsigned int i;
272303 
....@@ -283,8 +314,8 @@
283314 		goto resubmit_urb;
284315 	}
285316 
286
-	dev->ops->dev_read_bulk_callback(dev, urb->transfer_buffer,
287
-					 urb->actual_length);
317
+	ops->dev_read_bulk_callback(dev, urb->transfer_buffer,
318
+				    urb->actual_length);
288319 
289320 resubmit_urb:
290321 	usb_fill_bulk_urb(urb, dev->udev,
....@@ -378,21 +409,18 @@
378409 {
379410 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
380411 	struct kvaser_usb *dev = priv->dev;
412
+	const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
381413 	int err;
382414 
383415 	err = open_candev(netdev);
384416 	if (err)
385417 		return err;
386418 
387
-	err = kvaser_usb_setup_rx_urbs(dev);
419
+	err = ops->dev_set_opt_mode(priv);
388420 	if (err)
389421 		goto error;
390422 
391
-	err = dev->ops->dev_set_opt_mode(priv);
392
-	if (err)
393
-		goto error;
394
-
395
-	err = dev->ops->dev_start_chip(priv);
423
+	err = ops->dev_start_chip(priv);
396424 	if (err) {
397425 		netdev_warn(netdev, "Cannot start device, error %d\n", err);
398426 		goto error;
....@@ -421,7 +449,7 @@
421449 /* This method might sleep. Do not call it in the atomic context
422450  * of URB completions.
423451  */
424
-static void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv)
452
+void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv)
425453 {
426454 	usb_kill_anchored_urbs(&priv->tx_submitted);
427455 	kvaser_usb_reset_tx_urb_contexts(priv);
....@@ -449,22 +477,23 @@
449477 {
450478 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
451479 	struct kvaser_usb *dev = priv->dev;
480
+	const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
452481 	int err;
453482 
454483 	netif_stop_queue(netdev);
455484 
456
-	err = dev->ops->dev_flush_queue(priv);
485
+	err = ops->dev_flush_queue(priv);
457486 	if (err)
458487 		netdev_warn(netdev, "Cannot flush queue, error %d\n", err);
459488 
460
-	if (dev->ops->dev_reset_chip) {
461
-		err = dev->ops->dev_reset_chip(dev, priv->channel);
489
+	if (ops->dev_reset_chip) {
490
+		err = ops->dev_reset_chip(dev, priv->channel);
462491 		if (err)
463492 			netdev_warn(netdev, "Cannot reset card, error %d\n",
464493 				    err);
465494 	}
466495 
467
-	err = dev->ops->dev_stop_chip(priv);
496
+	err = ops->dev_stop_chip(priv);
468497 	if (err)
469498 		netdev_warn(netdev, "Cannot stop device, error %d\n", err);
470499 
....@@ -475,6 +504,93 @@
475504 	close_candev(priv->netdev);
476505 
477506 	return 0;
507
+}
508
+
509
+static int kvaser_usb_set_bittiming(struct net_device *netdev)
510
+{
511
+	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
512
+	struct kvaser_usb *dev = priv->dev;
513
+	const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
514
+	struct can_bittiming *bt = &priv->can.bittiming;
515
+
516
+	struct kvaser_usb_busparams busparams;
517
+	int tseg1 = bt->prop_seg + bt->phase_seg1;
518
+	int tseg2 = bt->phase_seg2;
519
+	int sjw = bt->sjw;
520
+	int err = -EOPNOTSUPP;
521
+
522
+	busparams.bitrate = cpu_to_le32(bt->bitrate);
523
+	busparams.sjw = (u8)sjw;
524
+	busparams.tseg1 = (u8)tseg1;
525
+	busparams.tseg2 = (u8)tseg2;
526
+	if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
527
+		busparams.nsamples = 3;
528
+	else
529
+		busparams.nsamples = 1;
530
+
531
+	err = ops->dev_set_bittiming(netdev, &busparams);
532
+	if (err)
533
+		return err;
534
+
535
+	err = kvaser_usb_setup_rx_urbs(priv->dev);
536
+	if (err)
537
+		return err;
538
+
539
+	err = ops->dev_get_busparams(priv);
540
+	if (err) {
541
+		/* Treat EOPNOTSUPP as success */
542
+		if (err == -EOPNOTSUPP)
543
+			err = 0;
544
+		return err;
545
+	}
546
+
547
+	if (memcmp(&busparams, &priv->busparams_nominal,
548
+		   sizeof(priv->busparams_nominal)) != 0)
549
+		err = -EINVAL;
550
+
551
+	return err;
552
+}
553
+
554
+static int kvaser_usb_set_data_bittiming(struct net_device *netdev)
555
+{
556
+	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
557
+	struct kvaser_usb *dev = priv->dev;
558
+	const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
559
+	struct can_bittiming *dbt = &priv->can.data_bittiming;
560
+
561
+	struct kvaser_usb_busparams busparams;
562
+	int tseg1 = dbt->prop_seg + dbt->phase_seg1;
563
+	int tseg2 = dbt->phase_seg2;
564
+	int sjw = dbt->sjw;
565
+	int err;
566
+
567
+	if (!ops->dev_set_data_bittiming ||
568
+	    !ops->dev_get_data_busparams)
569
+		return -EOPNOTSUPP;
570
+
571
+	busparams.bitrate = cpu_to_le32(dbt->bitrate);
572
+	busparams.sjw = (u8)sjw;
573
+	busparams.tseg1 = (u8)tseg1;
574
+	busparams.tseg2 = (u8)tseg2;
575
+	busparams.nsamples = 1;
576
+
577
+	err = ops->dev_set_data_bittiming(netdev, &busparams);
578
+	if (err)
579
+		return err;
580
+
581
+	err = kvaser_usb_setup_rx_urbs(priv->dev);
582
+	if (err)
583
+		return err;
584
+
585
+	err = ops->dev_get_data_busparams(priv);
586
+	if (err)
587
+		return err;
588
+
589
+	if (memcmp(&busparams, &priv->busparams_data,
590
+		   sizeof(priv->busparams_data)) != 0)
591
+		err = -EINVAL;
592
+
593
+	return err;
478594 }
479595 
480596 static void kvaser_usb_write_bulk_callback(struct urb *urb)
....@@ -503,6 +619,7 @@
503619 {
504620 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
505621 	struct kvaser_usb *dev = priv->dev;
622
+	const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
506623 	struct net_device_stats *stats = &netdev->stats;
507624 	struct kvaser_usb_tx_urb_context *context = NULL;
508625 	struct urb *urb;
....@@ -545,8 +662,8 @@
545662 		goto freeurb;
546663 	}
547664 
548
-	buf = dev->ops->dev_frame_to_cmd(priv, skb, &context->dlc, &cmd_len,
549
-					 context->echo_index);
665
+	buf = ops->dev_frame_to_cmd(priv, skb, &context->dlc, &cmd_len,
666
+				    context->echo_index);
550667 	if (!buf) {
551668 		stats->tx_dropped++;
552669 		dev_kfree_skb(skb);
....@@ -611,6 +728,7 @@
611728 
612729 static void kvaser_usb_remove_interfaces(struct kvaser_usb *dev)
613730 {
731
+	const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
614732 	int i;
615733 
616734 	for (i = 0; i < dev->nchannels; i++) {
....@@ -626,25 +744,28 @@
626744 		if (!dev->nets[i])
627745 			continue;
628746 
747
+		if (ops->dev_remove_channel)
748
+			ops->dev_remove_channel(dev->nets[i]);
749
+
629750 		free_candev(dev->nets[i]->netdev);
630751 	}
631752 }
632753 
633
-static int kvaser_usb_init_one(struct kvaser_usb *dev,
634
-			       const struct usb_device_id *id, int channel)
754
+static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel)
635755 {
636756 	struct net_device *netdev;
637757 	struct kvaser_usb_net_priv *priv;
758
+	const struct kvaser_usb_driver_info *driver_info = dev->driver_info;
759
+	const struct kvaser_usb_dev_ops *ops = driver_info->ops;
638760 	int err;
639761 
640
-	if (dev->ops->dev_reset_chip) {
641
-		err = dev->ops->dev_reset_chip(dev, channel);
762
+	if (ops->dev_reset_chip) {
763
+		err = ops->dev_reset_chip(dev, channel);
642764 		if (err)
643765 			return err;
644766 	}
645767 
646
-	netdev = alloc_candev(sizeof(*priv) +
647
-			      dev->max_tx_urbs * sizeof(*priv->tx_contexts),
768
+	netdev = alloc_candev(struct_size(priv, tx_contexts, dev->max_tx_urbs),
648769 			      dev->max_tx_urbs);
649770 	if (!netdev) {
650771 		dev_err(&dev->intf->dev, "Cannot alloc candev\n");
....@@ -656,6 +777,8 @@
656777 	init_usb_anchor(&priv->tx_submitted);
657778 	init_completion(&priv->start_comp);
658779 	init_completion(&priv->stop_comp);
780
+	init_completion(&priv->flush_comp);
781
+	init_completion(&priv->get_busparams_comp);
659782 	priv->can.ctrlmode_supported = 0;
660783 
661784 	priv->dev = dev;
....@@ -668,20 +791,19 @@
668791 	priv->can.state = CAN_STATE_STOPPED;
669792 	priv->can.clock.freq = dev->cfg->clock.freq;
670793 	priv->can.bittiming_const = dev->cfg->bittiming_const;
671
-	priv->can.do_set_bittiming = dev->ops->dev_set_bittiming;
672
-	priv->can.do_set_mode = dev->ops->dev_set_mode;
673
-	if ((id->driver_info & KVASER_USB_HAS_TXRX_ERRORS) ||
794
+	priv->can.do_set_bittiming = kvaser_usb_set_bittiming;
795
+	priv->can.do_set_mode = ops->dev_set_mode;
796
+	if ((driver_info->quirks & KVASER_USB_QUIRK_HAS_TXRX_ERRORS) ||
674797 	    (priv->dev->card_data.capabilities & KVASER_USB_CAP_BERR_CAP))
675
-		priv->can.do_get_berr_counter = dev->ops->dev_get_berr_counter;
676
-	if (id->driver_info & KVASER_USB_HAS_SILENT_MODE)
798
+		priv->can.do_get_berr_counter = ops->dev_get_berr_counter;
799
+	if (driver_info->quirks & KVASER_USB_QUIRK_HAS_SILENT_MODE)
677800 		priv->can.ctrlmode_supported |= CAN_CTRLMODE_LISTENONLY;
678801 
679802 	priv->can.ctrlmode_supported |= dev->card_data.ctrlmode_supported;
680803 
681804 	if (priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) {
682805 		priv->can.data_bittiming_const = dev->cfg->data_bittiming_const;
683
-		priv->can.do_set_data_bittiming =
684
-					dev->ops->dev_set_data_bittiming;
806
+		priv->can.do_set_data_bittiming = kvaser_usb_set_data_bittiming;
685807 	}
686808 
687809 	netdev->flags |= IFF_ECHO;
....@@ -693,17 +815,26 @@
693815 
694816 	dev->nets[channel] = priv;
695817 
818
+	if (ops->dev_init_channel) {
819
+		err = ops->dev_init_channel(priv);
820
+		if (err)
821
+			goto err;
822
+	}
823
+
696824 	err = register_candev(netdev);
697825 	if (err) {
698826 		dev_err(&dev->intf->dev, "Failed to register CAN device\n");
699
-		free_candev(netdev);
700
-		dev->nets[channel] = NULL;
701
-		return err;
827
+		goto err;
702828 	}
703829 
704830 	netdev_dbg(netdev, "device registered\n");
705831 
706832 	return 0;
833
+
834
+err:
835
+	free_candev(netdev);
836
+	dev->nets[channel] = NULL;
837
+	return err;
707838 }
708839 
709840 static int kvaser_usb_probe(struct usb_interface *intf,
....@@ -712,29 +843,22 @@
712843 	struct kvaser_usb *dev;
713844 	int err;
714845 	int i;
846
+	const struct kvaser_usb_driver_info *driver_info;
847
+	const struct kvaser_usb_dev_ops *ops;
848
+
849
+	driver_info = (const struct kvaser_usb_driver_info *)id->driver_info;
850
+	if (!driver_info)
851
+		return -ENODEV;
715852 
716853 	dev = devm_kzalloc(&intf->dev, sizeof(*dev), GFP_KERNEL);
717854 	if (!dev)
718855 		return -ENOMEM;
719856 
720
-	if (kvaser_is_leaf(id)) {
721
-		dev->card_data.leaf.family = KVASER_LEAF;
722
-		dev->ops = &kvaser_usb_leaf_dev_ops;
723
-	} else if (kvaser_is_usbcan(id)) {
724
-		dev->card_data.leaf.family = KVASER_USBCAN;
725
-		dev->ops = &kvaser_usb_leaf_dev_ops;
726
-	} else if (kvaser_is_hydra(id)) {
727
-		dev->ops = &kvaser_usb_hydra_dev_ops;
728
-	} else {
729
-		dev_err(&intf->dev,
730
-			"Product ID (%d) is not a supported Kvaser USB device\n",
731
-			id->idProduct);
732
-		return -ENODEV;
733
-	}
734
-
735857 	dev->intf = intf;
858
+	dev->driver_info = driver_info;
859
+	ops = driver_info->ops;
736860 
737
-	err = dev->ops->dev_setup_endpoints(dev);
861
+	err = ops->dev_setup_endpoints(dev);
738862 	if (err) {
739863 		dev_err(&intf->dev, "Cannot get usb endpoint(s)");
740864 		return err;
....@@ -748,22 +872,22 @@
748872 
749873 	dev->card_data.ctrlmode_supported = 0;
750874 	dev->card_data.capabilities = 0;
751
-	err = dev->ops->dev_init_card(dev);
875
+	err = ops->dev_init_card(dev);
752876 	if (err) {
753877 		dev_err(&intf->dev,
754878 			"Failed to initialize card, error %d\n", err);
755879 		return err;
756880 	}
757881 
758
-	err = dev->ops->dev_get_software_info(dev);
882
+	err = ops->dev_get_software_info(dev);
759883 	if (err) {
760884 		dev_err(&intf->dev,
761885 			"Cannot get software info, error %d\n", err);
762886 		return err;
763887 	}
764888 
765
-	if (dev->ops->dev_get_software_details) {
766
-		err = dev->ops->dev_get_software_details(dev);
889
+	if (ops->dev_get_software_details) {
890
+		err = ops->dev_get_software_details(dev);
767891 		if (err) {
768892 			dev_err(&intf->dev,
769893 				"Cannot get software details, error %d\n", err);
....@@ -781,14 +905,14 @@
781905 
782906 	dev_dbg(&intf->dev, "Max outstanding tx = %d URBs\n", dev->max_tx_urbs);
783907 
784
-	err = dev->ops->dev_get_card_info(dev);
908
+	err = ops->dev_get_card_info(dev);
785909 	if (err) {
786910 		dev_err(&intf->dev, "Cannot get card info, error %d\n", err);
787911 		return err;
788912 	}
789913 
790
-	if (dev->ops->dev_get_capabilities) {
791
-		err = dev->ops->dev_get_capabilities(dev);
914
+	if (ops->dev_get_capabilities) {
915
+		err = ops->dev_get_capabilities(dev);
792916 		if (err) {
793917 			dev_err(&intf->dev,
794918 				"Cannot get capabilities, error %d\n", err);
....@@ -798,7 +922,7 @@
798922 	}
799923 
800924 	for (i = 0; i < dev->nchannels; i++) {
801
-		err = kvaser_usb_init_one(dev, id, i);
925
+		err = kvaser_usb_init_one(dev, i);
802926 		if (err) {
803927 			kvaser_usb_remove_interfaces(dev);
804928 			return err;