Commit e1a00373 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-6.9-20240213' of... 

Merge tag 'linux-can-next-for-6.9-20240213' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next



Marc Kleine-Budde says:

====================
linux-can-next-for-6.9-20240213

this is a pull request of 23 patches for net-next/master.

The first patch is by Nicolas Maier and targets the CAN Broadcast
Manager (bcm), it adds message flags to distinguish between own local
and remote traffic.

Oliver Hartkopp contributes a patch for the CAN ISOTP protocol that
adds dynamic flow control parameters.

Stefan Mätje's patch series add support for the esd PCIe/402 CAN
interface family.

Markus Schneider-Pargmann contributes 14 patches for the m_can to
optimize for the SPI attached tcan4x5x controller.

A patch by Vincent Mailhol replaces Wolfgang Grandegger by Vincent
Mailhol as the CAN drivers Co-Maintainer.

Jimmy Assarsson's patch add support for the Kvaser M.2 PCIe 4xCAN
adapter.

A patch by Daniil Dulov removed a redundant NULL check in the softing
driver.

Oliver Hartkopp contributes a patch to add CANXL virtual CAN network
identifier support.

A patch by myself removes Naga Sureshkumar Relli as the maintainer of
the xilinx_can driver, as their email bounces.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f77581bf 73b8f501

Documentation/networking/can.rst

+18 −16
Original line number Diff line number Diff line
@@ -444,6 +444,24 @@ definitions are specified for CAN specific MTUs in include/linux/can.h: 
  #define CANFD_MTU (sizeof(struct canfd_frame)) == 72  => CAN FD frame





Returned Message Flags

----------------------



When using the system call recvmsg(2) on a RAW or a BCM socket, the

msg->msg_flags field may contain the following flags:



MSG_DONTROUTE:

	set when the received frame was created on the local host.



MSG_CONFIRM:

	set when the frame was sent via the socket it is received on.

	This flag can be interpreted as a 'transmission confirmation' when the

	CAN driver supports the echo of frames on driver level, see

	:ref:`socketcan-local-loopback1` and :ref:`socketcan-local-loopback2`.

	(Note: In order to receive such messages on a RAW socket,

	CAN_RAW_RECV_OWN_MSGS must be set.)





.. _socketcan-raw-sockets:



RAW Protocol Sockets with can_filters (SOCK_RAW)
@@ -693,22 +711,6 @@ where the CAN_INV_FILTER flag is set in order to notch single CAN IDs or 
CAN ID ranges from the incoming traffic.





RAW Socket Returned Message Flags

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



When using recvmsg() call, the msg->msg_flags may contain following flags:



MSG_DONTROUTE:

	set when the received frame was created on the local host.



MSG_CONFIRM:

	set when the frame was sent via the socket it is received on.

	This flag can be interpreted as a 'transmission confirmation' when the

	CAN driver supports the echo of frames on driver level, see

	:ref:`socketcan-local-loopback1` and :ref:`socketcan-local-loopback2`.

	In order to receive such messages, CAN_RAW_RECV_OWN_MSGS must be set.





Broadcast Manager Protocol Sockets (SOCK_DGRAM)

-----------------------------------------------

MAINTAINERS

+8 −2
Original line number Diff line number Diff line
@@ -4632,8 +4632,8 @@ S: Maintained 
F:	net/sched/sch_cake.c









CAN NETWORK DRIVERS









M:	Wolfgang Grandegger <wg@grandegger.com>









M:	Marc Kleine-Budde <mkl@pengutronix.de>









M:	Vincent Mailhol <mailhol.vincent@wanadoo.fr>









L:	linux-can@vger.kernel.org









S:	Maintained









W:	https://github.com/linux-can








@@ -7887,6 +7887,13 @@ S:	Maintained







F:	include/linux/errseq.h









F:	lib/errseq.c

















ESD CAN NETWORK DRIVERS









M:	Stefan Mätje <stefan.maetje@esd.eu>









R:	socketcan@esd.eu









L:	linux-can@vger.kernel.org









S:	Maintained









F:	drivers/net/can/esd/

















ESD CAN/USB DRIVERS









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









R:	socketcan@esd.eu








@@ -24142,7 +24149,6 @@ F:	drivers/net/ethernet/xilinx/xilinx_axienet*















XILINX CAN DRIVER









M:	Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com>









R:	Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>









L:	linux-can@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/can/xilinx,can.yaml

























drivers/net/can/Kconfig



+2
−0






























Original line number
Diff line number
Diff line







@@ -168,6 +168,7 @@ config CAN_KVASER_PCIEFD







	    Kvaser Mini PCI Express 2xHS v2









	    Kvaser Mini PCI Express 1xCAN v3









	    Kvaser Mini PCI Express 2xCAN v3









	    Kvaser M.2 PCIe 4xCAN



















config CAN_SLCAN









	tristate "Serial / USB serial CAN Adaptors (slcan)"








@@ -218,6 +219,7 @@ config CAN_XILINXCAN







source "drivers/net/can/c_can/Kconfig"









source "drivers/net/can/cc770/Kconfig"









source "drivers/net/can/ctucanfd/Kconfig"









source "drivers/net/can/esd/Kconfig"









source "drivers/net/can/ifi_canfd/Kconfig"









source "drivers/net/can/m_can/Kconfig"









source "drivers/net/can/mscan/Kconfig"
































drivers/net/can/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -8,6 +8,7 @@ obj-$(CONFIG_CAN_VXCAN)		+= vxcan.o







obj-$(CONFIG_CAN_SLCAN)		+= slcan/



















obj-y				+= dev/









obj-y				+= esd/









obj-y				+= rcar/









obj-y				+= spi/









obj-y				+= usb/
































drivers/net/can/esd/Kconfig
0 → 100644



+12
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









config CAN_ESD_402_PCI









	tristate "esd electronics gmbh CAN-PCI(e)/402 family"









	depends on PCI && HAS_DMA









	help









	  Support for C402 card family from esd electronics gmbh.









	  This card family is based on the ESDACC CAN controller and









	  available in several form factors:  PCI, PCIe, PCIe Mini,









	  M.2 PCIe, CPCIserial, PMC, XMC  (see https://esd.eu/en)



















	  This driver can also be built as a module. In this case the









	  module will be called esd_402_pci.