]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
can: m_can: m_can_close(): stop clocks after device has been shut down
authorMarc Kleine-Budde <mkl@pengutronix.de>
Mon, 9 Sep 2024 13:07:41 +0000 (15:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Oct 2024 13:10:46 +0000 (15:10 +0200)
[ Upstream commit 2c09b50efcad985cf920ca88baa9aa52b1999dcc ]

After calling m_can_stop() an interrupt may be pending or NAPI might
still be executed. This means the driver might still touch registers
of the IP core after the clocks have been disabled. This is not good
practice and might lead to aborts depending on the SoC integration.

To avoid these potential problems, make m_can_close() symmetric to
m_can_open(), i.e. stop the clocks at the end, right before shutting
down the transceiver.

Fixes: e0d1f4816f2a ("can: m_can: add Bosch M_CAN controller support")
Link: https://patch.msgid.link/20240910-can-m_can-fix-ifup-v3-2-6c1720ba45ce@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/can/m_can/m_can.c

index 07f61ee76ca60b1137eee3478f170167eb3dc98a..a87f6ce86cea38f2058937ec7af407f5694fafb4 100644 (file)
@@ -1583,7 +1583,6 @@ static int m_can_close(struct net_device *dev)
                napi_disable(&cdev->napi);
 
        m_can_stop(dev);
-       m_can_clk_stop(cdev);
        free_irq(dev->irq, dev);
 
        if (cdev->is_peripheral) {
@@ -1598,6 +1597,7 @@ static int m_can_close(struct net_device *dev)
        close_candev(dev);
        can_led_event(dev, CAN_LED_EVENT_STOP);
 
+       m_can_clk_stop(cdev);
        phy_power_off(cdev->transceiver);
 
        return 0;