Commit ecc383e5 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-6.17-20250725' of... 

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

Marc Kleine-Budde says:

====================
pull-request: can-next 2025-07-25

The first patch is by Khaled Elnaggar and converts the janz-ican3
driver's fwinfo_show() to sysfs_emit().

Vincent Mailhol contributes 3 patches that first fix a warning in the
ti_hecc driver and then add missing COMPILE_TEST more compile
coverage to the ti_hecc and tscan1 driver.

Randy Dunlap's patch let's the tscan1 driver depend on PC104.

A patch by Luis Felipe Hernandez fixes a kernel-doc error in the
ctucanfd driver.

Jimmy Assarsson contributes 10 patches for the kvaser_pciefd and 11
for the kvaser_usb driver. Both series simplify the identification of
physical the CAN interfaces and add devlink support to get information
about the running firmware.

* tag 'linux-can-next-for-6.17-20250725' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: (27 commits)
  Documentation: devlink: add devlink documentation for the kvaser_usb driver
  can: kvaser_usb: Add devlink port support
  can: kvaser_usb: Expose device information via devlink info_get()
  can: kvaser_usb: Add devlink support
  can: kvaser_usb: Store additional device information
  can: kvaser_usb: Store the different firmware version components in a struct
  can: kvaser_usb: Move comment regarding max_tx_urbs
  can: kvaser_usb: Add intermediate variables
  can: kvaser_usb: Assign netdev.dev_port based on device channel index
  can: kvaser_usb: Add support for ethtool set_phys_id()
  can: kvaser_usb: Add support to control CAN LEDs on device
  Documentation: devlink: add devlink documentation for the kvaser_pciefd driver
  can: kvaser_pciefd: Add devlink port support
  can: kvaser_pciefd: Expose device firmware version via devlink info_get()
  can: kvaser_pciefd: Add devlink support
  can: kvaser_pciefd: Split driver into C-file and header-file.
  can: kvaser_pciefd: Store device channel index
  can: kvaser_pciefd: Store the different firmware version components in a struct
  can: kvaser_pciefd: Add intermediate variable for device struct in probe()
  can: kvaser_pciefd: Add support for ethtool set_phys_id()
  ...
====================

Link: https://patch.msgid.link/20250725161327.4165174-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e9e91870 ecd82dfb

Documentation/networking/devlink/index.rst

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ parameters, info versions, and other features it supports. 
   ionic

   ice

   ixgbe

   kvaser_pciefd

   kvaser_usb

   mlx4

   mlx5

   mlxsw

Documentation/networking/devlink/kvaser_pciefd.rst

0 → 100644
+24 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



=============================

kvaser_pciefd devlink support

=============================



This document describes the devlink features implemented by the

``kvaser_pciefd`` device driver.



Info versions

=============



The ``kvaser_pciefd`` driver reports the following versions



.. list-table:: devlink info versions implemented

   :widths: 5 5 90



   * - Name

     - Type

     - Description

   * - ``fw``

     - running

     - Version of the firmware running on the device. Also available

       through ``ethtool -i`` as ``firmware-version``.

Documentation/networking/devlink/kvaser_usb.rst

0 → 100644
+33 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



==========================

kvaser_usb devlink support

==========================



This document describes the devlink features implemented by the

``kvaser_usb`` device driver.



Info versions

=============



The ``kvaser_usb`` driver reports the following versions



.. list-table:: devlink info versions implemented

   :widths: 5 5 90



   * - Name

     - Type

     - Description

   * - ``fw``

     - running

     - Version of the firmware running on the device. Also available

       through ``ethtool -i`` as ``firmware-version``.

   * - ``board.rev``

     - fixed

     - The device hardware revision.

   * - ``board.id``

     - fixed

     - The device EAN (product number).

   * - ``serial_number``

     - fixed

     - The device serial number.

drivers/net/can/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ config CAN_JANZ_ICAN3 
config CAN_KVASER_PCIEFD

	depends on PCI

	tristate "Kvaser PCIe FD cards"

	select NET_DEVLINK

	help

	  This is a driver for the Kvaser PCI Express CAN FD family.
@@ -201,7 +202,7 @@ config CAN_SUN4I 
	  be called sun4i_can.



config CAN_TI_HECC

	depends on ARM

	depends on ARM || COMPILE_TEST

	tristate "TI High End CAN Controller"

	select CAN_RX_OFFLOAD

	help

drivers/net/can/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ obj-$(CONFIG_CAN_FLEXCAN) += flexcan/ 
obj-$(CONFIG_CAN_GRCAN)		+= grcan.o

obj-$(CONFIG_CAN_IFI_CANFD)	+= ifi_canfd/

obj-$(CONFIG_CAN_JANZ_ICAN3)	+= janz-ican3.o

obj-$(CONFIG_CAN_KVASER_PCIEFD)	+= kvaser_pciefd.o

obj-$(CONFIG_CAN_KVASER_PCIEFD)	+= kvaser_pciefd/

obj-$(CONFIG_CAN_MSCAN)		+= mscan/

obj-$(CONFIG_CAN_M_CAN)		+= m_can/

obj-$(CONFIG_CAN_PEAK_PCIEFD)	+= peak_canfd/