FAILED: Patch "usb: dwc3-am62: fix module unload/reload behavior" failed to apply to 6.1-stable tree
Subsystems (3)
Sasha Levin
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Thanks,
Sasha
------------------ original commit in Linus's tree ------------------
From 6661befe41009c210efa2c1bcd16a5cc4cff8a06 Mon Sep 17 00:00:00 2001
From: Roger Quadros <[email protected]>
Date: Tue, 27 Feb 2024 11:23:48 +0200
Subject: [PATCH] usb: dwc3-am62: fix module unload/reload behavior
As runtime PM is enabled, the module can be runtime suspended when .remove() is called.
Do a pm_runtime_get_sync() to make sure module is active before doing any register operations.
Doing a pm_runtime_put_sync() should disable the refclk so no need to disable it again.
Fixes the below warning at module removel.
[ 39.705310] ------------[ cut here ]------------ [ 39.710004] clk:162:3 already disabled [ 39.713941] WARNING: CPU: 0 PID: 921 at drivers/clk/clk.c:1090 clk_core_disable+0xb0/0xb8
We called of_platform_populate() in .probe() so call the cleanup function of_platform_depopulate() in .remove(). Get rid of the now unnnecessary dwc3_ti_remove_core(). Without this, module re-load doesn't work properly.
--- drivers/usb/dwc3/dwc3-am62.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/usb/dwc3/dwc3-am62.c +2 -10
@@ -267,21 +267,14 @@ static int dwc3_ti_probe(struct platform_device *pdev)return ret; } -static int dwc3_ti_remove_core (struct device *dev,void *c) -{ -struct platform_device *pdev =to_platform_device (dev); - -platform_device_unregister (pdev); -return 0 ; -} -static void dwc3_ti_remove (struct platform_device *pdev) {struct device *dev = &pdev->dev;struct dwc3_am62 *am62 =platform_get_drvdata (pdev);u32 reg; -device_for_each_child (dev,NULL , dwc3_ti_remove_core); +pm_runtime_get_sync (dev); +of_platform_depopulate (dev);/* Clear mode valid bit */ reg =dwc3_ti_readl (am62,USBSS_MODE_CONTROL );
@@ -289,7 +282,6 @@ static void dwc3_ti_remove(struct platform_device *pdev)dwc3_ti_writel (am62,USBSS_MODE_CONTROL , reg);pm_runtime_put_sync (dev); -clk_disable_unprepare (am62->usb2_refclk);pm_runtime_disable (dev);pm_runtime_set_suspended (dev); }
Signature · 1 line
2.43.0