redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

MLK-23342-4 usb: dwc3: imx8mp: add set role post API 

Do dwc3 core auto suspend enable for device and disable for host
after role set completed, this can make sure dwc3 core device auto
suspend setting is correct all the time, the background of disable
dwc3 core device auto suspend is to make its parent device suspend
immediately(so wakeup enable can be enabled) after xhci-plat device
suspended, for device mode, we keep the dwc3 core device auto suspend
is to give some wait for gadget to be enumerated. Also set imx8mp
dwc3 glue device to be active after system pm resume as it's really
at active state, with those issues resolved, we enable its runtime
pm by default.

Reviewed-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
5.4-rM2-2.2.x-imx-squashed
Li Jun 2020-02-18 20:35:41 +08:00
parent 6ffc6e5d14
commit cd0718decb
1 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/usb/dwc3/dwc3-imx8mp.c
View File

@ -88,7 +88,18 @@ static irqreturn_t dwc3_imx8mp_interrupt(int irq, void *_dwc_imx)
* runtime resume xhci or gadget, dwc3_imx8mp itself
* as parent device will be resumed firstly by pm core
*/
if ((dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc->xhci) {
if ((dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc->xhci)
pm_runtime_resume(&dwc->xhci->dev);
else if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_DEVICE)
pm_runtime_resume(dwc->dev);
return IRQ_HANDLED;
}
static void dwc3_imx8mp_set_role_post(struct dwc3 *dwc, u32 role)
{
switch (role) {
case DWC3_GCTL_PRTCAP_HOST:
/*
* For xhci host, we need disable dwc core auto
* suspend, because during this auto suspend delay(5s),
@ -96,21 +107,14 @@ static irqreturn_t dwc3_imx8mp_interrupt(int irq, void *_dwc_imx)
* enabled, if device is inserted, xhci host can't
* response the connection.
*/
__pm_runtime_use_autosuspend(dwc->dev, false);
/*
* For xhci host, we need enable xhci auto suspend
* because port change may not happen so quick after
* wakeup irq.
*/
pm_runtime_use_autosuspend(&dwc->xhci->dev);
pm_runtime_set_autosuspend_delay(&dwc->xhci->dev, 500);
pm_runtime_resume(&dwc->xhci->dev);
} else if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_DEVICE) {
pm_runtime_resume(dwc->dev);
pm_runtime_dont_use_autosuspend(dwc->dev);
break;
case DWC3_GCTL_PRTCAP_DEVICE:
pm_runtime_use_autosuspend(dwc->dev);
break;
default:
break;
}
return IRQ_HANDLED;
}
static int dwc3_imx8mp_probe(struct platform_device *pdev)
@ -200,10 +204,17 @@ static int dwc3_imx8mp_probe(struct platform_device *pdev)
goto depopulate;
}
dwc->priv_data = devm_kzalloc(dev, sizeof(struct dwc3_priv_data),
GFP_KERNEL);
if (!dwc->priv_data) {
error = -ENOMEM;
goto depopulate;
}
dwc->priv_data->set_role_post = dwc3_imx8mp_set_role_post;
device_init_wakeup(dev, 1);
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
pm_runtime_forbid(dev);
return 0;
@ -278,17 +289,26 @@ static int __maybe_unused dwc3_imx8mp_pm_suspend(struct device *dev)
static int __maybe_unused dwc3_imx8mp_pm_resume(struct device *dev)
{
struct dwc3_imx8mp *dwc_imx = dev_get_drvdata(dev);
int ret;
if (device_may_wakeup(dwc_imx->dev))
disable_irq_wake(dwc_imx->irq);
return dwc3_imx8mp_resume(dwc_imx, PMSG_RESUME);
ret = dwc3_imx8mp_resume(dwc_imx, PMSG_RESUME);
pm_runtime_disable(dev);
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
return ret;
}
static int __maybe_unused dwc3_imx8mp_runtime_suspend(struct device *dev)
{
struct dwc3_imx8mp *dwc_imx = dev_get_drvdata(dev);
dev_dbg(dev, "dwc3 imx8mp runtime suspend.\n");
return dwc3_imx8mp_suspend(dwc_imx, PMSG_AUTO_SUSPEND);
}
@ -296,6 +316,8 @@ static int __maybe_unused dwc3_imx8mp_runtime_resume(struct device *dev)
{
struct dwc3_imx8mp *dwc_imx = dev_get_drvdata(dev);
dev_dbg(dev, "dwc3 imx8mp runtime resume.\n");
return dwc3_imx8mp_resume(dwc_imx, PMSG_AUTO_RESUME);
}