Commit 08d05cea authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-fixes-for-6.12-20241104' of... 

Merge tag 'linux-can-fixes-for-6.12-20241104' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
pull-request: can 2024-11-04

Alexander Hölzl contributes a patch to fix an error in the CAN j1939
documentation.

Thomas Mühlbacher's patch allows building of the {cc770,sja1000}_isa
drivers on x86_64 again.

A patch by me targets the m_can driver and limits the call to
free_irq() to devices with IRQs.

Dario Binacchi's patch fixes the RX and TX error counters in the c_can
driver.

The next 2 patches target the rockchip_canfd driver. Geert
Uytterhoeven's patch lets the driver depend on ARCH_ROCKCHIP. Jean
Delvare's patch drops the obsolete dependency on COMPILE_TEST.

The last 2 patches are by me and fix 2 regressions in the mcp251xfd
driver: fix broken coalescing configuration when switching CAN modes
and fix the length calculation of the Transmit Event FIFO (TEF) on
full TEF.

* tag 'linux-can-fixes-for-6.12-20241104' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
  can: mcp251xfd: mcp251xfd_get_tef_len(): fix length calculation
  can: mcp251xfd: mcp251xfd_ring_alloc(): fix coalescing configuration when switching CAN modes
  can: rockchip_canfd: Drop obsolete dependency on COMPILE_TEST
  can: rockchip_canfd: CAN_ROCKCHIP_CANFD should depend on ARCH_ROCKCHIP
  can: c_can: fix {rx,tx}_errors statistics
  can: m_can: m_can_close(): don't call free_irq() for IRQ-less devices
  can: {cc770,sja1000}_isa: allow building on x86_64
  can: j1939: fix error in J1939 documentation.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5ccdcdf1 3c1c1855

Documentation/networking/j1939.rst

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ format, the Group Extension is set in the PS-field. 


On the other hand, when using PDU1 format, the PS-field contains a so-called

Destination Address, which is _not_ part of the PGN. When communicating a PGN

from user space to kernel (or vice versa) and PDU2 format is used, the PS-field

from user space to kernel (or vice versa) and PDU1 format is used, the PS-field

of the PGN shall be set to zero. The Destination Address shall be set

elsewhere.

drivers/net/can/c_can/c_can_main.c

+6 −1
Original line number Diff line number Diff line
@@ -1011,7 +1011,6 @@ static int c_can_handle_bus_err(struct net_device *dev, 


	/* common for all type of bus errors */

	priv->can.can_stats.bus_error++;

	stats->rx_errors++;



	/* propagate the error condition to the CAN stack */

	skb = alloc_can_err_skb(dev, &cf);
@@ -1027,26 +1026,32 @@ static int c_can_handle_bus_err(struct net_device *dev, 
	case LEC_STUFF_ERROR:

		netdev_dbg(dev, "stuff error\n");

		cf->data[2] |= CAN_ERR_PROT_STUFF;

		stats->rx_errors++;

		break;

	case LEC_FORM_ERROR:

		netdev_dbg(dev, "form error\n");

		cf->data[2] |= CAN_ERR_PROT_FORM;

		stats->rx_errors++;

		break;

	case LEC_ACK_ERROR:

		netdev_dbg(dev, "ack error\n");

		cf->data[3] = CAN_ERR_PROT_LOC_ACK;

		stats->tx_errors++;

		break;

	case LEC_BIT1_ERROR:

		netdev_dbg(dev, "bit1 error\n");

		cf->data[2] |= CAN_ERR_PROT_BIT1;

		stats->tx_errors++;

		break;

	case LEC_BIT0_ERROR:

		netdev_dbg(dev, "bit0 error\n");

		cf->data[2] |= CAN_ERR_PROT_BIT0;

		stats->tx_errors++;

		break;

	case LEC_CRC_ERROR:

		netdev_dbg(dev, "CRC error\n");

		cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;

		stats->rx_errors++;

		break;

	default:

		break;

drivers/net/can/cc770/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ if CAN_CC770 


config CAN_CC770_ISA

	tristate "ISA Bus based legacy CC770 driver"

	depends on ISA

	depends on HAS_IOPORT

	help

	  This driver adds legacy support for CC770 and AN82527 chips

	  connected to the ISA bus using I/O port, memory mapped or

drivers/net/can/m_can/m_can.c

+2 −1
Original line number Diff line number Diff line
@@ -1765,6 +1765,7 @@ static int m_can_close(struct net_device *dev) 
	netif_stop_queue(dev);



	m_can_stop(dev);

	if (dev->irq)

		free_irq(dev->irq, dev);



	m_can_clean(dev);

drivers/net/can/rockchip/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 


config CAN_ROCKCHIP_CANFD

	tristate "Rockchip CAN-FD controller"

	depends on OF || COMPILE_TEST

	depends on OF

	depends on ARCH_ROCKCHIP || COMPILE_TEST

	select CAN_RX_OFFLOAD

	help

	  Say Y here if you want to use CAN-FD controller found on