Commit 46647a84 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

Merge patch series "can: kvaser_pciefd: Simplify identification of physical CAN interfaces" 

Jimmy Assarsson <extja@kvaser.com> says:

This patch series simplifies the process of identifying which network
interface (can0..canX) corresponds to which physical CAN channel on
Kvaser PCIe based CAN interfaces.

Changes in v4:
  - Fix transient Sparse warning
  - Add tag Reviewed-by Vincent Mailhol

Changes in v3:
  - Fixed typo; kvaser_pcied -> kvaser_pciefd in documentation patch

Changes in v2:
  - Replace use of netdev.dev_id with netdev.dev_port
  - Formatting and refactoring
  - New patch with devlink documentation

Link: https://patch.msgid.link/20250725123230.8-1-extja@kvaser.com


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parents 2db7a52c fed55247

Documentation/networking/devlink/index.rst

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

   ice

   ixgbe

   kvaser_pciefd

   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``.

drivers/net/can/Kconfig

+1 −0
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.

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/

drivers/net/can/kvaser_pciefd/Makefile

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

obj-$(CONFIG_CAN_KVASER_PCIEFD) += kvaser_pciefd.o

kvaser_pciefd-y = kvaser_pciefd_core.o kvaser_pciefd_devlink.o