* [PATCH net-next 0/4] pull-request: can-next 2024-03-04
@ 2024-03-04 9:13 Marc Kleine-Budde
2024-03-04 9:13 ` [PATCH net-next 1/4] can: kvaser_usb: Add support for Leaf v3 Marc Kleine-Budde
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2024-03-04 9:13 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel
Hello netdev-team,
this is a pull request of 4 patches for net-next/master.
The 1st patch is by Jimmy Assarsson and adds support for the Leaf v3
to the kvaser_usb driver.
Martin Jocić's patch targets the kvaser_pciefd driver and adds support
for the Kvaser PCIe 8xCAN device.
Followed by a patch by me that adds a missing a cpu_to_le32() to the
gs_usb driver, the change is not critical as the assigned value is 0.
The last patch is also by me and replaces a literal 256 with a proper
define.
regards,
Marc
---
The following changes since commit 4b2765ae410abf01154cf97876384d8a58c43953:
Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next (2024-03-02 20:50:59 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-6.9-20240304
for you to fetch changes up to 79f7319908fb568f60b7ddbe0cb9c9d2e714ac87:
can: mcp251xfd: __mcp251xfd_get_berr_counter(): use CAN_BUS_OFF_THRESHOLD instead of open coding it (2024-03-04 08:47:04 +0100)
----------------------------------------------------------------
linux-can-next-for-6.9-20240304
----------------------------------------------------------------
Jimmy Assarsson (1):
can: kvaser_usb: Add support for Leaf v3
Marc Kleine-Budde (2):
can: gs_usb: gs_cmd_reset(): use cpu_to_le32() to assign mode
can: mcp251xfd: __mcp251xfd_get_berr_counter(): use CAN_BUS_OFF_THRESHOLD instead of open coding it
Martin Jocić (1):
can: kvaser_pciefd: Add support for Kvaser PCIe 8xCAN
drivers/net/can/Kconfig | 1 +
drivers/net/can/kvaser_pciefd.c | 7 ++++++-
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +-
drivers/net/can/usb/Kconfig | 1 +
drivers/net/can/usb/gs_usb.c | 2 +-
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 3 +++
6 files changed, 13 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next 1/4] can: kvaser_usb: Add support for Leaf v3
2024-03-04 9:13 [PATCH net-next 0/4] pull-request: can-next 2024-03-04 Marc Kleine-Budde
@ 2024-03-04 9:13 ` Marc Kleine-Budde
2024-03-05 14:40 ` patchwork-bot+netdevbpf
2024-03-04 9:13 ` [PATCH net-next 2/4] can: kvaser_pciefd: Add support for Kvaser PCIe 8xCAN Marc Kleine-Budde
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2024-03-04 9:13 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Jimmy Assarsson,
Marc Kleine-Budde
From: Jimmy Assarsson <extja@kvaser.com>
Add support for Kvaser Leaf v3, based on the hydra platform.
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Link: https://lore.kernel.org/all/20240223095217.43783-1-extja@kvaser.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/usb/Kconfig | 1 +
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 3 +++
2 files changed, 4 insertions(+)
diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig
index d1450722cb3c..bd58c636d465 100644
--- a/drivers/net/can/usb/Kconfig
+++ b/drivers/net/can/usb/Kconfig
@@ -100,6 +100,7 @@ config CAN_KVASER_USB
- Scania VCI2 (if you have the Kvaser logo on top)
- Kvaser BlackBird v2
- Kvaser Leaf Pro HS v2
+ - Kvaser Leaf v3
- Kvaser Hybrid CAN/LIN
- Kvaser Hybrid 2xCAN/LIN
- Kvaser Hybrid Pro CAN/LIN
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
index 71ef4db5c09f..8faf8a462c05 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
@@ -88,6 +88,7 @@
#define USB_USBCAN_PRO_4HS_PRODUCT_ID 0x0114
#define USB_HYBRID_CANLIN_PRODUCT_ID 0x0115
#define USB_HYBRID_PRO_CANLIN_PRODUCT_ID 0x0116
+#define USB_LEAF_V3_PRODUCT_ID 0x0117
static const struct kvaser_usb_driver_info kvaser_usb_driver_info_hydra = {
.quirks = KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP,
@@ -235,6 +236,8 @@ static const struct usb_device_id kvaser_usb_table[] = {
.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_CANLIN_PRODUCT_ID),
.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
+ { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_V3_PRODUCT_ID),
+ .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
{ }
};
MODULE_DEVICE_TABLE(usb, kvaser_usb_table);
base-commit: 4b2765ae410abf01154cf97876384d8a58c43953
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 2/4] can: kvaser_pciefd: Add support for Kvaser PCIe 8xCAN
2024-03-04 9:13 [PATCH net-next 0/4] pull-request: can-next 2024-03-04 Marc Kleine-Budde
2024-03-04 9:13 ` [PATCH net-next 1/4] can: kvaser_usb: Add support for Leaf v3 Marc Kleine-Budde
@ 2024-03-04 9:13 ` Marc Kleine-Budde
2024-03-04 9:13 ` [PATCH net-next 3/4] can: gs_usb: gs_cmd_reset(): use cpu_to_le32() to assign mode Marc Kleine-Budde
2024-03-04 9:13 ` [PATCH net-next 4/4] can: mcp251xfd: __mcp251xfd_get_berr_counter(): use CAN_BUS_OFF_THRESHOLD instead of open coding it Marc Kleine-Budde
3 siblings, 0 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2024-03-04 9:13 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Martin Jocić,
Marc Kleine-Budde
From: Martin Jocić <martin.jocic@kvaser.com>
Add support for new Kvaser pciefd device, PCIe 8xCAN, based on Xilinx FPGA.
Signed-off-by: Martin Jocic <martin.jocic@kvaser.com>
Link: https://lore.kernel.org/all/2b2c720a788e1904283e354abb320adb5b631d26.camel@kvaser.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/Kconfig | 1 +
drivers/net/can/kvaser_pciefd.c | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 620766eb6bc1..2e31db55d927 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -169,6 +169,7 @@ config CAN_KVASER_PCIEFD
Kvaser Mini PCI Express 1xCAN v3
Kvaser Mini PCI Express 2xCAN v3
Kvaser M.2 PCIe 4xCAN
+ Kvaser PCIe 8xCAN
config CAN_SLCAN
tristate "Serial / USB serial CAN Adaptors (slcan)"
diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c
index 416f10480b40..f81b598147b3 100644
--- a/drivers/net/can/kvaser_pciefd.c
+++ b/drivers/net/can/kvaser_pciefd.c
@@ -27,7 +27,7 @@ MODULE_DESCRIPTION("CAN driver for Kvaser CAN/PCIe devices");
#define KVASER_PCIEFD_BEC_POLL_FREQ (jiffies + msecs_to_jiffies(200))
#define KVASER_PCIEFD_MAX_ERR_REP 256U
#define KVASER_PCIEFD_CAN_TX_MAX_COUNT 17U
-#define KVASER_PCIEFD_MAX_CAN_CHANNELS 4UL
+#define KVASER_PCIEFD_MAX_CAN_CHANNELS 8UL
#define KVASER_PCIEFD_DMA_COUNT 2U
#define KVASER_PCIEFD_DMA_SIZE (4U * 1024U)
@@ -49,6 +49,7 @@ MODULE_DESCRIPTION("CAN driver for Kvaser CAN/PCIe devices");
/* Xilinx based devices */
#define KVASER_PCIEFD_M2_4CAN_DEVICE_ID 0x0017
+#define KVASER_PCIEFD_8CAN_DEVICE_ID 0x0019
/* Altera SerDes Enable 64-bit DMA address translation */
#define KVASER_PCIEFD_ALTERA_DMA_64BIT BIT(0)
@@ -496,6 +497,10 @@ static struct pci_device_id kvaser_pciefd_id_table[] = {
PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_M2_4CAN_DEVICE_ID),
.driver_data = (kernel_ulong_t)&kvaser_pciefd_xilinx_driver_data,
},
+ {
+ PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_8CAN_DEVICE_ID),
+ .driver_data = (kernel_ulong_t)&kvaser_pciefd_xilinx_driver_data,
+ },
{
0,
},
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 3/4] can: gs_usb: gs_cmd_reset(): use cpu_to_le32() to assign mode
2024-03-04 9:13 [PATCH net-next 0/4] pull-request: can-next 2024-03-04 Marc Kleine-Budde
2024-03-04 9:13 ` [PATCH net-next 1/4] can: kvaser_usb: Add support for Leaf v3 Marc Kleine-Budde
2024-03-04 9:13 ` [PATCH net-next 2/4] can: kvaser_pciefd: Add support for Kvaser PCIe 8xCAN Marc Kleine-Budde
@ 2024-03-04 9:13 ` Marc Kleine-Budde
2024-03-04 9:13 ` [PATCH net-next 4/4] can: mcp251xfd: __mcp251xfd_get_berr_counter(): use CAN_BUS_OFF_THRESHOLD instead of open coding it Marc Kleine-Budde
3 siblings, 0 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2024-03-04 9:13 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Marc Kleine-Budde
The structure gs_device_mode dm::mode is a __le32, use cpu_to_le32()
to assign GS_CAN_MODE_RESET.
As GS_CAN_MODE_RESET is 0x0, this is basically a no-op.
Link: https://lore.kernel.org/all/20240304074540.3584842-1-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/usb/gs_usb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index 95b0fdb602c8..65c962f76898 100644
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -385,7 +385,7 @@ static struct gs_tx_context *gs_get_tx_context(struct gs_can *dev,
static int gs_cmd_reset(struct gs_can *dev)
{
struct gs_device_mode dm = {
- .mode = GS_CAN_MODE_RESET,
+ .mode = cpu_to_le32(GS_CAN_MODE_RESET),
};
return usb_control_msg_send(dev->udev, 0, GS_USB_BREQ_MODE,
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 4/4] can: mcp251xfd: __mcp251xfd_get_berr_counter(): use CAN_BUS_OFF_THRESHOLD instead of open coding it
2024-03-04 9:13 [PATCH net-next 0/4] pull-request: can-next 2024-03-04 Marc Kleine-Budde
` (2 preceding siblings ...)
2024-03-04 9:13 ` [PATCH net-next 3/4] can: gs_usb: gs_cmd_reset(): use cpu_to_le32() to assign mode Marc Kleine-Budde
@ 2024-03-04 9:13 ` Marc Kleine-Budde
3 siblings, 0 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2024-03-04 9:13 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel, Marc Kleine-Budde
Since 3f9c26210cf8 ("can: error: add definitions for the different CAN
error thresholds") we have proper defines for the various CAN error
thresholds. So make use of it and replace 256 by
CAN_BUS_OFF_THRESHOLD.
Link: https://lore.kernel.org/all/20240304074503.3584662-1-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
index eebf967f4711..1d9057dc44f2 100644
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
@@ -837,7 +837,7 @@ static int __mcp251xfd_get_berr_counter(const struct net_device *ndev,
return err;
if (trec & MCP251XFD_REG_TREC_TXBO)
- bec->txerr = 256;
+ bec->txerr = CAN_BUS_OFF_THRESHOLD;
else
bec->txerr = FIELD_GET(MCP251XFD_REG_TREC_TEC_MASK, trec);
bec->rxerr = FIELD_GET(MCP251XFD_REG_TREC_REC_MASK, trec);
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 1/4] can: kvaser_usb: Add support for Leaf v3
2024-03-04 9:13 ` [PATCH net-next 1/4] can: kvaser_usb: Add support for Leaf v3 Marc Kleine-Budde
@ 2024-03-05 14:40 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-03-05 14:40 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: netdev, davem, kuba, linux-can, kernel, extja
Hello:
This series was applied to netdev/net-next.git (main)
by Marc Kleine-Budde <mkl@pengutronix.de>:
On Mon, 4 Mar 2024 10:13:55 +0100 you wrote:
> From: Jimmy Assarsson <extja@kvaser.com>
>
> Add support for Kvaser Leaf v3, based on the hydra platform.
>
> Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
> Link: https://lore.kernel.org/all/20240223095217.43783-1-extja@kvaser.com
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
>
> [...]
Here is the summary with links:
- [net-next,1/4] can: kvaser_usb: Add support for Leaf v3
https://git.kernel.org/netdev/net-next/c/0b40cd9b4ecc
- [net-next,2/4] can: kvaser_pciefd: Add support for Kvaser PCIe 8xCAN
https://git.kernel.org/netdev/net-next/c/9b221ba452aa
- [net-next,3/4] can: gs_usb: gs_cmd_reset(): use cpu_to_le32() to assign mode
https://git.kernel.org/netdev/net-next/c/ef488e47e060
- [net-next,4/4] can: mcp251xfd: __mcp251xfd_get_berr_counter(): use CAN_BUS_OFF_THRESHOLD instead of open coding it
https://git.kernel.org/netdev/net-next/c/79f7319908fb
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-03-05 14:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-04 9:13 [PATCH net-next 0/4] pull-request: can-next 2024-03-04 Marc Kleine-Budde
2024-03-04 9:13 ` [PATCH net-next 1/4] can: kvaser_usb: Add support for Leaf v3 Marc Kleine-Budde
2024-03-05 14:40 ` patchwork-bot+netdevbpf
2024-03-04 9:13 ` [PATCH net-next 2/4] can: kvaser_pciefd: Add support for Kvaser PCIe 8xCAN Marc Kleine-Budde
2024-03-04 9:13 ` [PATCH net-next 3/4] can: gs_usb: gs_cmd_reset(): use cpu_to_le32() to assign mode Marc Kleine-Budde
2024-03-04 9:13 ` [PATCH net-next 4/4] can: mcp251xfd: __mcp251xfd_get_berr_counter(): use CAN_BUS_OFF_THRESHOLD instead of open coding it Marc Kleine-Budde
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.