5.15-stable patches

added patches:
	can-mcan-m_can_class_unregister-fix-order-of-unregistration-calls.patch
	can-mcp251xfd-mcp251xfd_remove-fix-order-of-unregistration-calls.patch
	series

diff --git a/queue-5.15/can-mcan-m_can_class_unregister-fix-order-of-unregistration-calls.patch b/queue-5.15/can-mcan-m_can_class_unregister-fix-order-of-unregistration-calls.patch
new file mode 100644 (file)
index 0000000..d0e9d86
--- /dev/null
+++ b/queue-5.15/can-mcan-m_can_class_unregister-fix-order-of-unregistration-calls.patch
@@ -0,0 +1,45 @@
+From 0713a1b3276b98c7dafbeefef00d7bc3a9119a84 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Fri, 2 May 2025 16:13:46 +0200
+Subject: can: mcan: m_can_class_unregister(): fix order of unregistration calls
+
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+
+commit 0713a1b3276b98c7dafbeefef00d7bc3a9119a84 upstream.
+
+If a driver is removed, the driver framework invokes the driver's
+remove callback. A CAN driver's remove function calls
+unregister_candev(), which calls net_device_ops::ndo_stop further down
+in the call stack for interfaces which are in the "up" state.
+
+The removal of the module causes a warning, as can_rx_offload_del()
+deletes the NAPI, while it is still active, because the interface is
+still up.
+
+To fix the warning, first unregister the network interface, which
+calls net_device_ops::ndo_stop, which disables the NAPI, and then call
+can_rx_offload_del().
+
+Fixes: 1be37d3b0414 ("can: m_can: fix periph RX path: use rx-offload to ensure skbs are sent from softirq context")
+Cc: stable@vger.kernel.org
+Link: https://patch.msgid.link/20250502-can-rx-offload-del-v1-3-59a9b131589d@pengutronix.de
+Reviewed-by: Markus Schneider-Pargmann <msp@baylibre.com>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/can/m_can/m_can.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/can/m_can/m_can.c
++++ b/drivers/net/can/m_can/m_can.c
+@@ -2066,9 +2066,9 @@ EXPORT_SYMBOL_GPL(m_can_class_register);
+ 
+ void m_can_class_unregister(struct m_can_classdev *cdev)
+ {
++      unregister_candev(cdev->net);
+       if (cdev->is_peripheral)
+               can_rx_offload_del(&cdev->offload);
+-      unregister_candev(cdev->net);
+ }
+ EXPORT_SYMBOL_GPL(m_can_class_unregister);
+ 

diff --git a/queue-5.15/can-mcp251xfd-mcp251xfd_remove-fix-order-of-unregistration-calls.patch b/queue-5.15/can-mcp251xfd-mcp251xfd_remove-fix-order-of-unregistration-calls.patch
new file mode 100644 (file)
index 0000000..c8104ab
--- /dev/null
+++ b/queue-5.15/can-mcp251xfd-mcp251xfd_remove-fix-order-of-unregistration-calls.patch
@@ -0,0 +1,47 @@
+From 84f5eb833f53ae192baed4cfb8d9eaab43481fc9 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Fri, 2 May 2025 16:13:44 +0200
+Subject: can: mcp251xfd: mcp251xfd_remove(): fix order of unregistration calls
+
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+
+commit 84f5eb833f53ae192baed4cfb8d9eaab43481fc9 upstream.
+
+If a driver is removed, the driver framework invokes the driver's
+remove callback. A CAN driver's remove function calls
+unregister_candev(), which calls net_device_ops::ndo_stop further down
+in the call stack for interfaces which are in the "up" state.
+
+With the mcp251xfd driver the removal of the module causes the
+following warning:
+
+| WARNING: CPU: 0 PID: 352 at net/core/dev.c:7342 __netif_napi_del_locked+0xc8/0xd8
+
+as can_rx_offload_del() deletes the NAPI, while it is still active,
+because the interface is still up.
+
+To fix the warning, first unregister the network interface, which
+calls net_device_ops::ndo_stop, which disables the NAPI, and then call
+can_rx_offload_del().
+
+Fixes: 55e5b97f003e ("can: mcp25xxfd: add driver for Microchip MCP25xxFD SPI CAN")
+Cc: stable@vger.kernel.org
+Link: https://patch.msgid.link/20250502-can-rx-offload-del-v1-1-59a9b131589d@pengutronix.de
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
++++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+@@ -3020,8 +3020,8 @@ static int mcp251xfd_remove(struct spi_d
+       struct mcp251xfd_priv *priv = spi_get_drvdata(spi);
+       struct net_device *ndev = priv->ndev;
+ 
+-      can_rx_offload_del(&priv->offload);
+       mcp251xfd_unregister(priv);
++      can_rx_offload_del(&priv->offload);
+       spi->max_speed_hz = priv->spi_max_speed_hz_orig;
+       free_candev(ndev);
+ 

diff --git a/queue-5.15/series b/queue-5.15/series
new file mode 100644 (file)
index 0000000..d63f905
--- /dev/null
+++ b/queue-5.15/series
@@ -0,0 +1,2 @@
+can-mcan-m_can_class_unregister-fix-order-of-unregistration-calls.patch
+can-mcp251xfd-mcp251xfd_remove-fix-order-of-unregistration-calls.patch