diff mbox series

[v2,6/8] usb: chipidea: tegra: Support runtime PM

Message ID 20201217094007.19336-7-digetx@gmail.com (mailing list archive)
State Superseded
Headers show
Series Support Runtime PM and host mode by Tegra ChipIdea USB driver | expand

Commit Message

Dmitry Osipenko Dec. 17, 2020, 9:40 a.m. UTC 
Tegra PHY driver now supports waking up controller from a low power mode.
Enable runtime PM in order to put controller into the LPM during idle.

Tested-by: Matt Merhar <mattmerhar@protonmail.com>
Tested-by: Nicolas Chauvet <kwizart@gmail.com>
Tested-by: Peter Geis <pgwipeout@gmail.com>
Tested-by: Ion Agorria <ion@agorria.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
 drivers/usb/chipidea/ci_hdrc_tegra.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Comments

Thierry Reding Dec. 17, 2020, 1:41 p.m. UTC | #1 
On Thu, Dec 17, 2020 at 12:40:05PM +0300, Dmitry Osipenko wrote:
> Tegra PHY driver now supports waking up controller from a low power mode.
> Enable runtime PM in order to put controller into the LPM during idle.
> 
> Tested-by: Matt Merhar <mattmerhar@protonmail.com>
> Tested-by: Nicolas Chauvet <kwizart@gmail.com>
> Tested-by: Peter Geis <pgwipeout@gmail.com>
> Tested-by: Ion Agorria <ion@agorria.com>
> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
> ---
>  drivers/usb/chipidea/ci_hdrc_tegra.c | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
> index 5fccdeeefc64..655671159511 100644
> --- a/drivers/usb/chipidea/ci_hdrc_tegra.c
> +++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
> @@ -38,21 +38,24 @@ struct tegra_usb_soc_info {
>  
>  static const struct tegra_usb_soc_info tegra20_ehci_soc_info = {
>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
>  	.dr_mode = USB_DR_MODE_HOST,
>  	.txfifothresh = 10,
>  };
>  
>  static const struct tegra_usb_soc_info tegra30_ehci_soc_info = {
>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
>  	.dr_mode = USB_DR_MODE_HOST,
>  	.txfifothresh = 16,
>  };
>  
>  static const struct tegra_usb_soc_info tegra_udc_soc_info = {
>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
>  	.dr_mode = USB_DR_MODE_UNKNOWN,
>  };
>  
> @@ -323,6 +326,10 @@ static int tegra_usb_probe(struct platform_device *pdev)
>  	usb->data.hub_control = tegra_ehci_hub_control;
>  	usb->data.notify_event = tegra_usb_notify_event;
>  
> +	/* Tegra PHY driver currently doesn't support LPM for ULPI */
> +	if (of_usb_get_phy_mode(pdev->dev.of_node) == USBPHY_INTERFACE_MODE_ULPI)
> +		usb->data.flags &= ~CI_HDRC_SUPPORTS_RUNTIME_PM;
> +

Does this prevent the wakeup_enabled from being set for ULPI PHYs?

Thierry
Dmitry Osipenko Dec. 17, 2020, 1:45 p.m. UTC | #2 
17.12.2020 16:41, Thierry Reding пишет:
> On Thu, Dec 17, 2020 at 12:40:05PM +0300, Dmitry Osipenko wrote:
>> Tegra PHY driver now supports waking up controller from a low power mode.
>> Enable runtime PM in order to put controller into the LPM during idle.
>>
>> Tested-by: Matt Merhar <mattmerhar@protonmail.com>
>> Tested-by: Nicolas Chauvet <kwizart@gmail.com>
>> Tested-by: Peter Geis <pgwipeout@gmail.com>
>> Tested-by: Ion Agorria <ion@agorria.com>
>> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
>> ---
>>  drivers/usb/chipidea/ci_hdrc_tegra.c | 13 ++++++++++---
>>  1 file changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
>> index 5fccdeeefc64..655671159511 100644
>> --- a/drivers/usb/chipidea/ci_hdrc_tegra.c
>> +++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
>> @@ -38,21 +38,24 @@ struct tegra_usb_soc_info {
>>  
>>  static const struct tegra_usb_soc_info tegra20_ehci_soc_info = {
>>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
>> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
>> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
>> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
>>  	.dr_mode = USB_DR_MODE_HOST,
>>  	.txfifothresh = 10,
>>  };
>>  
>>  static const struct tegra_usb_soc_info tegra30_ehci_soc_info = {
>>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
>> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
>> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
>> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
>>  	.dr_mode = USB_DR_MODE_HOST,
>>  	.txfifothresh = 16,
>>  };
>>  
>>  static const struct tegra_usb_soc_info tegra_udc_soc_info = {
>>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
>> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
>> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
>> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
>>  	.dr_mode = USB_DR_MODE_UNKNOWN,
>>  };
>>  
>> @@ -323,6 +326,10 @@ static int tegra_usb_probe(struct platform_device *pdev)
>>  	usb->data.hub_control = tegra_ehci_hub_control;
>>  	usb->data.notify_event = tegra_usb_notify_event;
>>  
>> +	/* Tegra PHY driver currently doesn't support LPM for ULPI */
>> +	if (of_usb_get_phy_mode(pdev->dev.of_node) == USBPHY_INTERFACE_MODE_ULPI)
>> +		usb->data.flags &= ~CI_HDRC_SUPPORTS_RUNTIME_PM;
>> +
> 
> Does this prevent the wakeup_enabled from being set for ULPI PHYs?

Yes
Thierry Reding Dec. 17, 2020, 3:02 p.m. UTC | #3 
On Thu, Dec 17, 2020 at 04:45:03PM +0300, Dmitry Osipenko wrote:
> 17.12.2020 16:41, Thierry Reding пишет:
> > On Thu, Dec 17, 2020 at 12:40:05PM +0300, Dmitry Osipenko wrote:
> >> Tegra PHY driver now supports waking up controller from a low power mode.
> >> Enable runtime PM in order to put controller into the LPM during idle.
> >>
> >> Tested-by: Matt Merhar <mattmerhar@protonmail.com>
> >> Tested-by: Nicolas Chauvet <kwizart@gmail.com>
> >> Tested-by: Peter Geis <pgwipeout@gmail.com>
> >> Tested-by: Ion Agorria <ion@agorria.com>
> >> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
> >> ---
> >>  drivers/usb/chipidea/ci_hdrc_tegra.c | 13 ++++++++++---
> >>  1 file changed, 10 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
> >> index 5fccdeeefc64..655671159511 100644
> >> --- a/drivers/usb/chipidea/ci_hdrc_tegra.c
> >> +++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
> >> @@ -38,21 +38,24 @@ struct tegra_usb_soc_info {
> >>  
> >>  static const struct tegra_usb_soc_info tegra20_ehci_soc_info = {
> >>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
> >> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
> >> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
> >> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
> >>  	.dr_mode = USB_DR_MODE_HOST,
> >>  	.txfifothresh = 10,
> >>  };
> >>  
> >>  static const struct tegra_usb_soc_info tegra30_ehci_soc_info = {
> >>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
> >> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
> >> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
> >> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
> >>  	.dr_mode = USB_DR_MODE_HOST,
> >>  	.txfifothresh = 16,
> >>  };
> >>  
> >>  static const struct tegra_usb_soc_info tegra_udc_soc_info = {
> >>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
> >> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
> >> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
> >> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
> >>  	.dr_mode = USB_DR_MODE_UNKNOWN,
> >>  };
> >>  
> >> @@ -323,6 +326,10 @@ static int tegra_usb_probe(struct platform_device *pdev)
> >>  	usb->data.hub_control = tegra_ehci_hub_control;
> >>  	usb->data.notify_event = tegra_usb_notify_event;
> >>  
> >> +	/* Tegra PHY driver currently doesn't support LPM for ULPI */
> >> +	if (of_usb_get_phy_mode(pdev->dev.of_node) == USBPHY_INTERFACE_MODE_ULPI)
> >> +		usb->data.flags &= ~CI_HDRC_SUPPORTS_RUNTIME_PM;
> >> +
> > 
> > Does this prevent the wakeup_enabled from being set for ULPI PHYs?
> 
> Yes

Okay, it should be fine then to keep that WARN_ONCE in that prior patch
since we should really only get there if there's something seriously
wrong.

Thierry
Thierry Reding Dec. 17, 2020, 3:02 p.m. UTC | #4 
On Thu, Dec 17, 2020 at 12:40:05PM +0300, Dmitry Osipenko wrote:
> Tegra PHY driver now supports waking up controller from a low power mode.
> Enable runtime PM in order to put controller into the LPM during idle.
> 
> Tested-by: Matt Merhar <mattmerhar@protonmail.com>
> Tested-by: Nicolas Chauvet <kwizart@gmail.com>
> Tested-by: Peter Geis <pgwipeout@gmail.com>
> Tested-by: Ion Agorria <ion@agorria.com>
> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
> ---
>  drivers/usb/chipidea/ci_hdrc_tegra.c | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)

Acked-by: Thierry Reding <treding@nvidia.com>
Dmitry Osipenko Dec. 17, 2020, 7:51 p.m. UTC | #5 
17.12.2020 18:02, Thierry Reding пишет:
> On Thu, Dec 17, 2020 at 04:45:03PM +0300, Dmitry Osipenko wrote:
>> 17.12.2020 16:41, Thierry Reding пишет:
>>> On Thu, Dec 17, 2020 at 12:40:05PM +0300, Dmitry Osipenko wrote:
>>>> Tegra PHY driver now supports waking up controller from a low power mode.
>>>> Enable runtime PM in order to put controller into the LPM during idle.
>>>>
>>>> Tested-by: Matt Merhar <mattmerhar@protonmail.com>
>>>> Tested-by: Nicolas Chauvet <kwizart@gmail.com>
>>>> Tested-by: Peter Geis <pgwipeout@gmail.com>
>>>> Tested-by: Ion Agorria <ion@agorria.com>
>>>> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
>>>> ---
>>>>  drivers/usb/chipidea/ci_hdrc_tegra.c | 13 ++++++++++---
>>>>  1 file changed, 10 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
>>>> index 5fccdeeefc64..655671159511 100644
>>>> --- a/drivers/usb/chipidea/ci_hdrc_tegra.c
>>>> +++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
>>>> @@ -38,21 +38,24 @@ struct tegra_usb_soc_info {
>>>>  
>>>>  static const struct tegra_usb_soc_info tegra20_ehci_soc_info = {
>>>>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
>>>> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
>>>> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
>>>> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
>>>>  	.dr_mode = USB_DR_MODE_HOST,
>>>>  	.txfifothresh = 10,
>>>>  };
>>>>  
>>>>  static const struct tegra_usb_soc_info tegra30_ehci_soc_info = {
>>>>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
>>>> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
>>>> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
>>>> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
>>>>  	.dr_mode = USB_DR_MODE_HOST,
>>>>  	.txfifothresh = 16,
>>>>  };
>>>>  
>>>>  static const struct tegra_usb_soc_info tegra_udc_soc_info = {
>>>>  	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
>>>> -		 CI_HDRC_OVERRIDE_PHY_CONTROL,
>>>> +		 CI_HDRC_OVERRIDE_PHY_CONTROL |
>>>> +		 CI_HDRC_SUPPORTS_RUNTIME_PM,
>>>>  	.dr_mode = USB_DR_MODE_UNKNOWN,
>>>>  };
>>>>  
>>>> @@ -323,6 +326,10 @@ static int tegra_usb_probe(struct platform_device *pdev)
>>>>  	usb->data.hub_control = tegra_ehci_hub_control;
>>>>  	usb->data.notify_event = tegra_usb_notify_event;
>>>>  
>>>> +	/* Tegra PHY driver currently doesn't support LPM for ULPI */
>>>> +	if (of_usb_get_phy_mode(pdev->dev.of_node) == USBPHY_INTERFACE_MODE_ULPI)
>>>> +		usb->data.flags &= ~CI_HDRC_SUPPORTS_RUNTIME_PM;
>>>> +
>>>
>>> Does this prevent the wakeup_enabled from being set for ULPI PHYs?
>>
>> Yes
> 
> Okay, it should be fine then to keep that WARN_ONCE in that prior patch
> since we should really only get there if there's something seriously
> wrong.

Correct, that is the actual intention of the warning.
diff mbox series

Patch

diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
index 5fccdeeefc64..655671159511 100644
--- a/drivers/usb/chipidea/ci_hdrc_tegra.c
+++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
@@ -38,21 +38,24 @@  struct tegra_usb_soc_info {
 
 static const struct tegra_usb_soc_info tegra20_ehci_soc_info = {
 	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
-		 CI_HDRC_OVERRIDE_PHY_CONTROL,
+		 CI_HDRC_OVERRIDE_PHY_CONTROL |
+		 CI_HDRC_SUPPORTS_RUNTIME_PM,
 	.dr_mode = USB_DR_MODE_HOST,
 	.txfifothresh = 10,
 };
 
 static const struct tegra_usb_soc_info tegra30_ehci_soc_info = {
 	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
-		 CI_HDRC_OVERRIDE_PHY_CONTROL,
+		 CI_HDRC_OVERRIDE_PHY_CONTROL |
+		 CI_HDRC_SUPPORTS_RUNTIME_PM,
 	.dr_mode = USB_DR_MODE_HOST,
 	.txfifothresh = 16,
 };
 
 static const struct tegra_usb_soc_info tegra_udc_soc_info = {
 	.flags = CI_HDRC_REQUIRES_ALIGNED_DMA |
-		 CI_HDRC_OVERRIDE_PHY_CONTROL,
+		 CI_HDRC_OVERRIDE_PHY_CONTROL |
+		 CI_HDRC_SUPPORTS_RUNTIME_PM,
 	.dr_mode = USB_DR_MODE_UNKNOWN,
 };
 
@@ -323,6 +326,10 @@  static int tegra_usb_probe(struct platform_device *pdev)
 	usb->data.hub_control = tegra_ehci_hub_control;
 	usb->data.notify_event = tegra_usb_notify_event;
 
+	/* Tegra PHY driver currently doesn't support LPM for ULPI */
+	if (of_usb_get_phy_mode(pdev->dev.of_node) == USBPHY_INTERFACE_MODE_ULPI)
+		usb->data.flags &= ~CI_HDRC_SUPPORTS_RUNTIME_PM;
+
 	usb->dev = ci_hdrc_add_device(&pdev->dev, pdev->resource,
 				      pdev->num_resources, &usb->data);
 	if (IS_ERR(usb->dev)) {