* [PATCH 2/6] can: kvaser_usb: kvaser_usb_hydra: Fix KCAN bittiming limits
2020-11-15 16:30 [PATCH 1/6] can: kvaser_pciefd: Fix KCAN bittiming limits Jimmy Assarsson
@ 2020-11-15 16:30 ` Jimmy Assarsson
2020-11-15 16:30 ` [PATCH 3/6] can: kvaser_usb: Add USB_{LEAF,HYDRA}_PRODUCT_ID_END defines Jimmy Assarsson
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Jimmy Assarsson @ 2020-11-15 16:30 UTC (permalink / raw)
To: linux-can; +Cc: Jimmy Assarsson, Jimmy Assarsson
From: Jimmy Assarsson <extja@kvaser.com>
Use correct bittiming limits for the KCAN CAN controller.
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
---
| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
index 7ab87a758754..218fadc91155 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
@@ -367,7 +367,7 @@ static const struct can_bittiming_const kvaser_usb_hydra_kcan_bittiming_c = {
.tseg2_max = 32,
.sjw_max = 16,
.brp_min = 1,
- .brp_max = 4096,
+ .brp_max = 8192,
.brp_inc = 1,
};
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/6] can: kvaser_usb: Add USB_{LEAF,HYDRA}_PRODUCT_ID_END defines
2020-11-15 16:30 [PATCH 1/6] can: kvaser_pciefd: Fix KCAN bittiming limits Jimmy Assarsson
2020-11-15 16:30 ` [PATCH 2/6] can: kvaser_usb: kvaser_usb_hydra: " Jimmy Assarsson
@ 2020-11-15 16:30 ` Jimmy Assarsson
2020-11-15 16:30 ` [PATCH 4/6] can: kvaser_usb: Add new Kvaser Leaf v2 devices Jimmy Assarsson
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Jimmy Assarsson @ 2020-11-15 16:30 UTC (permalink / raw)
To: linux-can; +Cc: Jimmy Assarsson, Jimmy Assarsson
From: Jimmy Assarsson <extja@kvaser.com>
Add USB_{LEAF,HYDRA}_PRODUCT_ID_END defines, representing the last USB PID
entry in respectively family. This removes the need to update the
kvaser_is_{leaf,hydra}() functions whenever new devices are added.
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
---
| 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
index 0f1d3e807d63..091c8209af92 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
@@ -58,6 +58,8 @@
#define USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID 290
#define USB_USBCAN_LIGHT_2HS_PRODUCT_ID 291
#define USB_MINI_PCIE_2HS_PRODUCT_ID 292
+#define USB_LEAF_PRODUCT_ID_END \
+ USB_MINI_PCIE_2HS_PRODUCT_ID
/* Kvaser USBCan-II devices product ids */
#define USB_USBCAN_REVB_PRODUCT_ID 2
@@ -78,13 +80,15 @@
#define USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID 268
#define USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID 269
#define USB_HYBRID_PRO_CANLIN_PRODUCT_ID 270
+#define USB_HYDRA_PRODUCT_ID_END \
+ USB_HYBRID_PRO_CANLIN_PRODUCT_ID
static inline bool kvaser_is_leaf(const struct usb_device_id *id)
{
return (id->idProduct >= USB_LEAF_DEVEL_PRODUCT_ID &&
id->idProduct <= USB_CAN_R_PRODUCT_ID) ||
(id->idProduct >= USB_LEAF_LITE_V2_PRODUCT_ID &&
- id->idProduct <= USB_MINI_PCIE_2HS_PRODUCT_ID);
+ id->idProduct <= USB_LEAF_PRODUCT_ID_END);
}
static inline bool kvaser_is_usbcan(const struct usb_device_id *id)
@@ -96,7 +100,7 @@ static inline bool kvaser_is_usbcan(const struct usb_device_id *id)
static inline bool kvaser_is_hydra(const struct usb_device_id *id)
{
return id->idProduct >= USB_BLACKBIRD_V2_PRODUCT_ID &&
- id->idProduct <= USB_HYBRID_PRO_CANLIN_PRODUCT_ID;
+ id->idProduct <= USB_HYDRA_PRODUCT_ID_END;
}
static const struct usb_device_id kvaser_usb_table[] = {
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/6] can: kvaser_usb: Add new Kvaser Leaf v2 devices
2020-11-15 16:30 [PATCH 1/6] can: kvaser_pciefd: Fix KCAN bittiming limits Jimmy Assarsson
2020-11-15 16:30 ` [PATCH 2/6] can: kvaser_usb: kvaser_usb_hydra: " Jimmy Assarsson
2020-11-15 16:30 ` [PATCH 3/6] can: kvaser_usb: Add USB_{LEAF,HYDRA}_PRODUCT_ID_END defines Jimmy Assarsson
@ 2020-11-15 16:30 ` Jimmy Assarsson
2020-11-15 16:30 ` [PATCH 5/6] can: kvaser_usb: kvaser_usb_hydra: Add support for new device variant Jimmy Assarsson
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Jimmy Assarsson @ 2020-11-15 16:30 UTC (permalink / raw)
To: linux-can; +Cc: Jimmy Assarsson, Jimmy Assarsson
From: Jimmy Assarsson <extja@kvaser.com>
Add new Kvaser Leaf v2 devices.
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
---
| 2 ++
| 8 +++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
--git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig
index bcb331b0c958..161f15e5218d 100644
--- a/drivers/net/can/usb/Kconfig
+++ b/drivers/net/can/usb/Kconfig
@@ -52,7 +52,9 @@ config CAN_KVASER_USB
- Kvaser Leaf Light "China"
- Kvaser BlackBird SemiPro
- Kvaser USBcan R
+ - Kvaser USBcan R v2
- Kvaser Leaf Light v2
+ - Kvaser Leaf Light R v2
- Kvaser Mini PCI Express HS
- Kvaser Mini PCI Express 2xHS
- Kvaser USBcan Light 2xHS
--git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
index 091c8209af92..b7d20320961a 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
@@ -58,8 +58,11 @@
#define USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID 290
#define USB_USBCAN_LIGHT_2HS_PRODUCT_ID 291
#define USB_MINI_PCIE_2HS_PRODUCT_ID 292
+#define USB_USBCAN_R_V2_PRODUCT_ID 294
+#define USB_LEAF_LIGHT_R_V2_PRODUCT_ID 295
+#define USB_LEAF_LIGHT_HS_V2_OEM2_PRODUCT_ID 296
#define USB_LEAF_PRODUCT_ID_END \
- USB_MINI_PCIE_2HS_PRODUCT_ID
+ USB_LEAF_LIGHT_HS_V2_OEM2_PRODUCT_ID
/* Kvaser USBCan-II devices product ids */
#define USB_USBCAN_REVB_PRODUCT_ID 2
@@ -157,6 +160,9 @@ static const struct usb_device_id kvaser_usb_table[] = {
{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID) },
{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_2HS_PRODUCT_ID) },
{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_2HS_PRODUCT_ID) },
+ { USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_R_V2_PRODUCT_ID) },
+ { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_R_V2_PRODUCT_ID) },
+ { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM2_PRODUCT_ID) },
/* USBCANII USB product IDs */
{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN2_PRODUCT_ID),
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/6] can: kvaser_usb: kvaser_usb_hydra: Add support for new device variant
2020-11-15 16:30 [PATCH 1/6] can: kvaser_pciefd: Fix KCAN bittiming limits Jimmy Assarsson
` (2 preceding siblings ...)
2020-11-15 16:30 ` [PATCH 4/6] can: kvaser_usb: Add new Kvaser Leaf v2 devices Jimmy Assarsson
@ 2020-11-15 16:30 ` Jimmy Assarsson
2020-11-15 16:30 ` [PATCH 6/6] can: kvaser_usb: Add new Kvaser hydra devices Jimmy Assarsson
2020-11-15 17:55 ` [PATCH 1/6] can: kvaser_pciefd: Fix KCAN bittiming limits Marc Kleine-Budde
5 siblings, 0 replies; 8+ messages in thread
From: Jimmy Assarsson @ 2020-11-15 16:30 UTC (permalink / raw)
To: linux-can; +Cc: Jimmy Assarsson, Jimmy Assarsson
From: Christer Beskow <chbe@kvaser.com>
Add support for a new variant of devices using the hydra platform, based on
NXP i.MX RT (flexcan).
Signed-off-by: Christer Beskow <chbe@kvaser.com>
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
---
| 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
--git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
index 218fadc91155..980ff3acfefd 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
@@ -34,6 +34,7 @@
/* Forward declarations */
static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_kcan;
static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc;
+static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_rt;
#define KVASER_USB_HYDRA_BULK_EP_IN_ADDR 0x82
#define KVASER_USB_HYDRA_BULK_EP_OUT_ADDR 0x02
@@ -135,6 +136,7 @@ struct kvaser_cmd_sw_detail_req {
#define KVASER_USB_HYDRA_SW_FLAG_CANFD BIT(10)
#define KVASER_USB_HYDRA_SW_FLAG_NONISO BIT(11)
#define KVASER_USB_HYDRA_SW_FLAG_EXT_CAP BIT(12)
+#define KVASER_USB_HYDRA_SW_FLAG_CAN_FREQ_80M BIT(13)
struct kvaser_cmd_sw_detail_res {
__le32 sw_flags;
__le32 sw_version;
@@ -383,6 +385,30 @@ static const struct can_bittiming_const kvaser_usb_hydra_flexc_bittiming_c = {
.brp_inc = 1,
};
+static const struct can_bittiming_const kvaser_usb_hydra_rt_bittiming_c = {
+ .name = "kvaser_usb_rt",
+ .tseg1_min = 2,
+ .tseg1_max = 96,
+ .tseg2_min = 2,
+ .tseg2_max = 32,
+ .sjw_max = 32,
+ .brp_min = 1,
+ .brp_max = 1024,
+ .brp_inc = 1,
+};
+
+static const struct can_bittiming_const kvaser_usb_hydra_rtd_bittiming_c = {
+ .name = "kvaser_usb_rt",
+ .tseg1_min = 2,
+ .tseg1_max = 39,
+ .tseg2_min = 2,
+ .tseg2_max = 8,
+ .sjw_max = 8,
+ .brp_min = 1,
+ .brp_max = 1024,
+ .brp_inc = 1,
+};
+
#define KVASER_USB_HYDRA_TRANSID_BITS 12
#define KVASER_USB_HYDRA_TRANSID_MASK \
GENMASK(KVASER_USB_HYDRA_TRANSID_BITS - 1, 0)
@@ -1727,6 +1753,8 @@ static int kvaser_usb_hydra_get_software_details(struct kvaser_usb *dev)
if (flags & KVASER_USB_HYDRA_SW_FLAG_FREQ_80M)
dev->cfg = &kvaser_usb_hydra_dev_cfg_kcan;
+ else if (flags & KVASER_USB_HYDRA_SW_FLAG_CAN_FREQ_80M)
+ dev->cfg = &kvaser_usb_hydra_dev_cfg_rt;
else
dev->cfg = &kvaser_usb_hydra_dev_cfg_flexc;
@@ -2026,3 +2054,12 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc = {
.timestamp_freq = 1,
.bittiming_const = &kvaser_usb_hydra_flexc_bittiming_c,
};
+
+static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_rt = {
+ .clock = {
+ .freq = 80000000,
+ },
+ .timestamp_freq = 24,
+ .bittiming_const = &kvaser_usb_hydra_rt_bittiming_c,
+ .data_bittiming_const = &kvaser_usb_hydra_rtd_bittiming_c,
+};
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 6/6] can: kvaser_usb: Add new Kvaser hydra devices
2020-11-15 16:30 [PATCH 1/6] can: kvaser_pciefd: Fix KCAN bittiming limits Jimmy Assarsson
` (3 preceding siblings ...)
2020-11-15 16:30 ` [PATCH 5/6] can: kvaser_usb: kvaser_usb_hydra: Add support for new device variant Jimmy Assarsson
@ 2020-11-15 16:30 ` Jimmy Assarsson
2020-11-15 17:55 ` [PATCH 1/6] can: kvaser_pciefd: Fix KCAN bittiming limits Marc Kleine-Budde
5 siblings, 0 replies; 8+ messages in thread
From: Jimmy Assarsson @ 2020-11-15 16:30 UTC (permalink / raw)
To: linux-can; +Cc: Jimmy Assarsson, Jimmy Assarsson
From: Jimmy Assarsson <extja@kvaser.com>
Add new Kvaser hydra devices.
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
---
| 3 +++
| 8 +++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
--git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig
index 161f15e5218d..c1e5d5b570b6 100644
--- a/drivers/net/can/usb/Kconfig
+++ b/drivers/net/can/usb/Kconfig
@@ -74,6 +74,9 @@ config CAN_KVASER_USB
- Kvaser USBcan Light 4xHS
- Kvaser USBcan Pro 2xHS v2
- Kvaser USBcan Pro 5xHS
+ - Kvaser U100
+ - Kvaser U100P
+ - Kvaser U100S
- ATI Memorator Pro 2xHS v2
- ATI USBcan Pro 2xHS v2
--git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
index b7d20320961a..a9b3f12bc2ef 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
@@ -83,8 +83,11 @@
#define USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID 268
#define USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID 269
#define USB_HYBRID_PRO_CANLIN_PRODUCT_ID 270
+#define USB_U100_PRODUCT_ID 273
+#define USB_U100P_PRODUCT_ID 274
+#define USB_U100S_PRODUCT_ID 275
#define USB_HYDRA_PRODUCT_ID_END \
- USB_HYBRID_PRO_CANLIN_PRODUCT_ID
+ USB_U100S_PRODUCT_ID
static inline bool kvaser_is_leaf(const struct usb_device_id *id)
{
@@ -187,6 +190,9 @@ static const struct usb_device_id kvaser_usb_table[] = {
{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID) },
{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID) },
{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_CANLIN_PRODUCT_ID) },
+ { USB_DEVICE(KVASER_VENDOR_ID, USB_U100_PRODUCT_ID) },
+ { USB_DEVICE(KVASER_VENDOR_ID, USB_U100P_PRODUCT_ID) },
+ { USB_DEVICE(KVASER_VENDOR_ID, USB_U100S_PRODUCT_ID) },
{ }
};
MODULE_DEVICE_TABLE(usb, kvaser_usb_table);
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/6] can: kvaser_pciefd: Fix KCAN bittiming limits
2020-11-15 16:30 [PATCH 1/6] can: kvaser_pciefd: Fix KCAN bittiming limits Jimmy Assarsson
` (4 preceding siblings ...)
2020-11-15 16:30 ` [PATCH 6/6] can: kvaser_usb: Add new Kvaser hydra devices Jimmy Assarsson
@ 2020-11-15 17:55 ` Marc Kleine-Budde
2020-11-15 21:10 ` Jimmy Assarsson
5 siblings, 1 reply; 8+ messages in thread
From: Marc Kleine-Budde @ 2020-11-15 17:55 UTC (permalink / raw)
To: Jimmy Assarsson; +Cc: linux-can, Jimmy Assarsson
[-- Attachment #1: Type: text/plain, Size: 601 bytes --]
On Sun, Nov 15, 2020 at 05:30:22PM +0100, Jimmy Assarsson wrote:
> From: Jimmy Assarsson <extja@kvaser.com>
>
> Use correct bittiming limits for the KCAN CAN controller.
>
> Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Applied this and 2 to linux-can/testing. The rest to linux-can-next/testing.
regards,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/6] can: kvaser_pciefd: Fix KCAN bittiming limits
2020-11-15 17:55 ` [PATCH 1/6] can: kvaser_pciefd: Fix KCAN bittiming limits Marc Kleine-Budde
@ 2020-11-15 21:10 ` Jimmy Assarsson
0 siblings, 0 replies; 8+ messages in thread
From: Jimmy Assarsson @ 2020-11-15 21:10 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: linux-can, Jimmy Assarsson
On 2020-11-15 18:55, Marc Kleine-Budde wrote:
> On Sun, Nov 15, 2020 at 05:30:22PM +0100, Jimmy Assarsson wrote:
>> From: Jimmy Assarsson <extja@kvaser.com>
>>
>> Use correct bittiming limits for the KCAN CAN controller.
>>
>> Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
>
> Applied this and 2 to linux-can/testing. The rest to linux-can-next/testing.
>
> regards,
> Marc
Thanks!
Regards,
jimmy
^ permalink raw reply [flat|nested] 8+ messages in thread