tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Fixes: e8784c0aec03 ("drivers: usb: dwc3: Add AM62 USB wrapper driver")
Cc: stable@vger.kernel.org # v5.19+
Signed-off-by: Roger Quadros <rogerq@kernel.org>
Link: https://lore.kernel.org/r/20240227-for-v6-9-am62-usb-errata-3-0-v4-1-0ada8ddb0767@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Roger Quadros and committed by
Greg Kroah-Hartman 6661befe 8d36c0e4

+2 -10
+2 -10
drivers/usb/dwc3/dwc3-am62.c
··· 267 267 return ret; 268 268 } 269 269 270 - static int dwc3_ti_remove_core(struct device *dev, void *c) 271 - { 272 - struct platform_device *pdev = to_platform_device(dev); 273 - 274 - platform_device_unregister(pdev); 275 - return 0; 276 - } 277 - 278 270 static void dwc3_ti_remove(struct platform_device *pdev) 279 271 { 280 272 struct device *dev = &pdev->dev; 281 273 struct dwc3_am62 *am62 = platform_get_drvdata(pdev); 282 274 u32 reg; 283 275 284 - device_for_each_child(dev, NULL, dwc3_ti_remove_core); 276 + pm_runtime_get_sync(dev); 277 + of_platform_depopulate(dev); 285 278 286 279 /* Clear mode valid bit */ 287 280 reg = dwc3_ti_readl(am62, USBSS_MODE_CONTROL); ··· 282 289 dwc3_ti_writel(am62, USBSS_MODE_CONTROL, reg); 283 290 284 291 pm_runtime_put_sync(dev); 285 - clk_disable_unprepare(am62->usb2_refclk); 286 292 pm_runtime_disable(dev); 287 293 pm_runtime_set_suspended(dev); 288 294 }