The DRD module calls dwc3_set_mode() on role switches, i.e. when a device is
being plugged in. In order to support continuous runtime power management when
plugging in / unplugging a cable, we need to call pm_runtime_get_sync() in
this path.
Signed-off-by: Martin Kepplinger <[email protected]>
---
revision history
----------------
v3: call pm_runtime_get_sync() and fix commit message typo (thanks Sergei)
v2: move pm_rumtime calls into workqueue (thanks Roger)
remove unrelated documentation patch
https://lore.kernel.org/linux-usb/[email protected]/T/
v1: https://lore.kernel.org/linux-usb/[email protected]/T/
drivers/usb/dwc3/core.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 1d85c42b9c67..da93faef74a6 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -121,17 +121,19 @@ static void __dwc3_set_mode(struct work_struct *work)
if (dwc->dr_mode != USB_DR_MODE_OTG)
return;
+ pm_runtime_get_sync(dwc->dev);
+
if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_OTG)
dwc3_otg_update(dwc, 0);
if (!dwc->desired_dr_role)
- return;
+ goto out;
if (dwc->desired_dr_role == dwc->current_dr_role)
- return;
+ goto out;
if (dwc->desired_dr_role == DWC3_GCTL_PRTCAP_OTG && dwc->edev)
- return;
+ goto out;
switch (dwc->current_dr_role) {
case DWC3_GCTL_PRTCAP_HOST:
@@ -190,6 +192,9 @@ static void __dwc3_set_mode(struct work_struct *work)
break;
}
+out:
+ pm_runtime_mark_last_busy(dwc->dev);
+ pm_runtime_put_autosuspend(dwc->dev);
}
void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
--
2.20.1
On 19.03.20 11:02, Martin Kepplinger wrote:
> The DRD module calls dwc3_set_mode() on role switches, i.e. when a device is
> being plugged in. In order to support continuous runtime power management when
> plugging in / unplugging a cable, we need to call pm_runtime_get_sync() in
> this path.
>
> Signed-off-by: Martin Kepplinger <[email protected]>
> ---
>
>
> revision history
> ----------------
> v3: call pm_runtime_get_sync() and fix commit message typo (thanks Sergei)
> v2: move pm_rumtime calls into workqueue (thanks Roger)
> remove unrelated documentation patch
> https://lore.kernel.org/linux-usb/[email protected]/T/
> v1: https://lore.kernel.org/linux-usb/[email protected]/T/
>
>
> drivers/usb/dwc3/core.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> index 1d85c42b9c67..da93faef74a6 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -121,17 +121,19 @@ static void __dwc3_set_mode(struct work_struct *work)
> if (dwc->dr_mode != USB_DR_MODE_OTG)
> return;
>
> + pm_runtime_get_sync(dwc->dev);
> +
> if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_OTG)
> dwc3_otg_update(dwc, 0);
>
> if (!dwc->desired_dr_role)
> - return;
> + goto out;
>
> if (dwc->desired_dr_role == dwc->current_dr_role)
> - return;
> + goto out;
>
> if (dwc->desired_dr_role == DWC3_GCTL_PRTCAP_OTG && dwc->edev)
> - return;
> + goto out;
>
> switch (dwc->current_dr_role) {
> case DWC3_GCTL_PRTCAP_HOST:
> @@ -190,6 +192,9 @@ static void __dwc3_set_mode(struct work_struct *work)
> break;
> }
>
> +out:
> + pm_runtime_mark_last_busy(dwc->dev);
> + pm_runtime_put_autosuspend(dwc->dev);
> }
>
> void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
>
any objections or other thoughts about this? I'm using it successfully.
thanks,
martin
On 05.04.20 13:43, Martin Kepplinger wrote:
> On 19.03.20 11:02, Martin Kepplinger wrote:
>> The DRD module calls dwc3_set_mode() on role switches, i.e. when a device is
>> being plugged in. In order to support continuous runtime power management when
>> plugging in / unplugging a cable, we need to call pm_runtime_get_sync() in
>> this path.
>>
>> Signed-off-by: Martin Kepplinger <[email protected]>
>> ---
>>
>>
>> revision history
>> ----------------
>> v3: call pm_runtime_get_sync() and fix commit message typo (thanks Sergei)
>> v2: move pm_rumtime calls into workqueue (thanks Roger)
>> remove unrelated documentation patch
>> https://lore.kernel.org/linux-usb/[email protected]/T/
>> v1: https://lore.kernel.org/linux-usb/[email protected]/T/
>>
>>
>> drivers/usb/dwc3/core.c | 11 ++++++++---
>> 1 file changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
>> index 1d85c42b9c67..da93faef74a6 100644
>> --- a/drivers/usb/dwc3/core.c
>> +++ b/drivers/usb/dwc3/core.c
>> @@ -121,17 +121,19 @@ static void __dwc3_set_mode(struct work_struct *work)
>> if (dwc->dr_mode != USB_DR_MODE_OTG)
>> return;
>>
>> + pm_runtime_get_sync(dwc->dev);
>> +
>> if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_OTG)
>> dwc3_otg_update(dwc, 0);
>>
>> if (!dwc->desired_dr_role)
>> - return;
>> + goto out;
>>
>> if (dwc->desired_dr_role == dwc->current_dr_role)
>> - return;
>> + goto out;
>>
>> if (dwc->desired_dr_role == DWC3_GCTL_PRTCAP_OTG && dwc->edev)
>> - return;
>> + goto out;
>>
>> switch (dwc->current_dr_role) {
>> case DWC3_GCTL_PRTCAP_HOST:
>> @@ -190,6 +192,9 @@ static void __dwc3_set_mode(struct work_struct *work)
>> break;
>> }
>>
>> +out:
>> + pm_runtime_mark_last_busy(dwc->dev);
>> + pm_runtime_put_autosuspend(dwc->dev);
>> }
>>
>> void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
>>
>
> any objections or other thoughts about this? I'm using it successfully.
>
> thanks,
>
> martin
>
Again I want to remind of this change in case it has gotten overlooked.
thanks,
martin
On 19/03/2020 12:02, Martin Kepplinger wrote:
> The DRD module calls dwc3_set_mode() on role switches, i.e. when a device is
> being plugged in. In order to support continuous runtime power management when
> plugging in / unplugging a cable, we need to call pm_runtime_get_sync() in
> this path.
>
> Signed-off-by: Martin Kepplinger <[email protected]>
Reviewed-by: Roger Quadros <[email protected]>
cheers,
-roger
> ---
>
>
> revision history
> ----------------
> v3: call pm_runtime_get_sync() and fix commit message typo (thanks Sergei)
> v2: move pm_rumtime calls into workqueue (thanks Roger)
> remove unrelated documentation patch
> https://lore.kernel.org/linux-usb/[email protected]/T/
> v1: https://lore.kernel.org/linux-usb/[email protected]/T/
>
>
> drivers/usb/dwc3/core.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> index 1d85c42b9c67..da93faef74a6 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -121,17 +121,19 @@ static void __dwc3_set_mode(struct work_struct *work)
> if (dwc->dr_mode != USB_DR_MODE_OTG)
> return;
>
> + pm_runtime_get_sync(dwc->dev);
> +
> if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_OTG)
> dwc3_otg_update(dwc, 0);
>
> if (!dwc->desired_dr_role)
> - return;
> + goto out;
>
> if (dwc->desired_dr_role == dwc->current_dr_role)
> - return;
> + goto out;
>
> if (dwc->desired_dr_role == DWC3_GCTL_PRTCAP_OTG && dwc->edev)
> - return;
> + goto out;
>
> switch (dwc->current_dr_role) {
> case DWC3_GCTL_PRTCAP_HOST:
> @@ -190,6 +192,9 @@ static void __dwc3_set_mode(struct work_struct *work)
> break;
> }
>
> +out:
> + pm_runtime_mark_last_busy(dwc->dev);
> + pm_runtime_put_autosuspend(dwc->dev);
> }
>
> void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
>
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
On 24.04.20 09:48, Roger Quadros wrote:
>
>
> On 19/03/2020 12:02, Martin Kepplinger wrote:
>> The DRD module calls dwc3_set_mode() on role switches, i.e. when a
>> device is
>> being plugged in. In order to support continuous runtime power
>> management when
>> plugging in / unplugging a cable, we need to call
>> pm_runtime_get_sync() in
>> this path.
>>
>> Signed-off-by: Martin Kepplinger <[email protected]>
>
> Reviewed-by: Roger Quadros <[email protected]>
>
>
thank you very much Roger. Anything else that is holding this back?
martin
> cheers,
> -roger
>
>> ---
>>
>>
>> revision history
>> ----------------
>> v3: call pm_runtime_get_sync() and fix commit message typo (thanks
>> Sergei)
>> v2: move pm_rumtime calls into workqueue (thanks Roger)
>> remove unrelated documentation patch
>>
>> https://lore.kernel.org/linux-usb/[email protected]/T/
>>
>> v1:
>> https://lore.kernel.org/linux-usb/[email protected]/T/
>>
>>
>>
>> drivers/usb/dwc3/core.c | 11 ++++++++---
>> 1 file changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
>> index 1d85c42b9c67..da93faef74a6 100644
>> --- a/drivers/usb/dwc3/core.c
>> +++ b/drivers/usb/dwc3/core.c
>> @@ -121,17 +121,19 @@ static void __dwc3_set_mode(struct work_struct
>> *work)
>> if (dwc->dr_mode != USB_DR_MODE_OTG)
>> return;
>> + pm_runtime_get_sync(dwc->dev);
>> +
>> if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_OTG)
>> dwc3_otg_update(dwc, 0);
>> if (!dwc->desired_dr_role)
>> - return;
>> + goto out;
>> if (dwc->desired_dr_role == dwc->current_dr_role)
>> - return;
>> + goto out;
>> if (dwc->desired_dr_role == DWC3_GCTL_PRTCAP_OTG && dwc->edev)
>> - return;
>> + goto out;
>> switch (dwc->current_dr_role) {
>> case DWC3_GCTL_PRTCAP_HOST:
>> @@ -190,6 +192,9 @@ static void __dwc3_set_mode(struct work_struct *work)
>> break;
>> }
>> +out:
>> + pm_runtime_mark_last_busy(dwc->dev);
>> + pm_runtime_put_autosuspend(dwc->dev);
>> }
>> void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
>>
>
Martin Kepplinger <[email protected]> writes:
> On 24.04.20 09:48, Roger Quadros wrote:
>>
>>
>> On 19/03/2020 12:02, Martin Kepplinger wrote:
>>> The DRD module calls dwc3_set_mode() on role switches, i.e. when a
>>> device is
>>> being plugged in. In order to support continuous runtime power
>>> management when
>>> plugging in / unplugging a cable, we need to call
>>> pm_runtime_get_sync() in
>>> this path.
>>>
>>> Signed-off-by: Martin Kepplinger <[email protected]>
>>
>> Reviewed-by: Roger Quadros <[email protected]>
>>
>>
>
> thank you very much Roger. Anything else that is holding this back?
Merge window is holding it back :-) It has been in my tree for weeks:
https://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git/commit/?h=testing/next&id=c2cd3452d5f8b66d49a73138fba5baadd5b489bd
Gotta wait for the next merge window for new features to be merged.
--
balbi