Skip to content

Commit f747313

Browse files
Fabrice Gasniergregkh
authored andcommitted
usb: dwc2: fix a devres leak in hw_enable upon suspend resume
Each time the platform goes to low power, PM suspend / resume routines call: __dwc2_lowlevel_hw_enable -> devm_add_action_or_reset(). This adds a new devres each time. This may also happen at runtime, as dwc2_lowlevel_hw_enable() can be called from udc_start(). This can be seen with tracing: - echo 1 > /sys/kernel/debug/tracing/events/dev/devres_log/enable - go to low power - cat /sys/kernel/debug/tracing/trace A new "ADD" entry is found upon each low power cycle: ... devres_log: 49000000.usb-otg ADD 82a13bba devm_action_release (8 bytes) ... devres_log: 49000000.usb-otg ADD 49889daf devm_action_release (8 bytes) ... A second issue is addressed here: - regulator_bulk_enable() is called upon each PM cycle (suspend/resume). - regulator_bulk_disable() never gets called. So the reference count for these regulators constantly increase, by one upon each low power cycle, due to missing regulator_bulk_disable() call in __dwc2_lowlevel_hw_disable(). The original fix that introduced the devm_add_action_or_reset() call, fixed an issue during probe, that happens due to other errors in dwc2_driver_probe() -> dwc2_core_reset(). Then the probe fails without disabling regulators, when dr_mode == USB_DR_MODE_PERIPHERAL. Rather fix the error path: disable all the low level hardware in the error path, by using the "hsotg->ll_hw_enabled" flag. Checking dr_mode has been introduced to avoid a dual call to dwc2_lowlevel_hw_disable(). "ll_hw_enabled" should achieve the same (and is used currently in the remove() routine). Fixes: 54c1960 ("usb: dwc2: Always disable regulators on driver teardown") Fixes: 33a06f1 ("usb: dwc2: Fix error path in gadget registration") Cc: stable <stable@kernel.org> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com> Link: https://lore.kernel.org/r/20230316084127.126084-1-fabrice.gasnier@foss.st.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 451b15e commit f747313

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

drivers/usb/dwc2/platform.c

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,6 @@ static int dwc2_get_dr_mode(struct dwc2_hsotg *hsotg)
9191
return 0;
9292
}
9393

94-
static void __dwc2_disable_regulators(void *data)
95-
{
96-
struct dwc2_hsotg *hsotg = data;
97-
98-
regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
99-
}
100-
10194
static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg)
10295
{
10396
struct platform_device *pdev = to_platform_device(hsotg->dev);
@@ -108,11 +101,6 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg)
108101
if (ret)
109102
return ret;
110103

111-
ret = devm_add_action_or_reset(&pdev->dev,
112-
__dwc2_disable_regulators, hsotg);
113-
if (ret)
114-
return ret;
115-
116104
if (hsotg->clk) {
117105
ret = clk_prepare_enable(hsotg->clk);
118106
if (ret)
@@ -168,7 +156,7 @@ static int __dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg)
168156
if (hsotg->clk)
169157
clk_disable_unprepare(hsotg->clk);
170158

171-
return 0;
159+
return regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
172160
}
173161

174162
/**
@@ -608,7 +596,7 @@ static int dwc2_driver_probe(struct platform_device *dev)
608596
if (hsotg->params.activate_stm_id_vb_detection)
609597
regulator_disable(hsotg->usb33d);
610598
error:
611-
if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL)
599+
if (hsotg->ll_hw_enabled)
612600
dwc2_lowlevel_hw_disable(hsotg);
613601
return retval;
614602
}

0 commit comments

Comments
 (0)