| Message ID | 20200707074941.28078-8-peter.chen@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | usb: some PM changes for cdns3 and xhci-plat | expand |
On Tue, Jul 7, 2020 at 3:52 PM Peter Chen <peter.chen@nxp.com> wrote: > > Some DRD controllers (eg, dwc3 & cdns3) have PHY management at > their own driver to cover both device and host mode, so add one > priv quirk for such users to skip PHY management from HCD core. > > Signed-off-by: Peter Chen <peter.chen@nxp.com> Hi Mathias, Ping... Other xhci patches in this series are acked by you. Peter > --- > drivers/usb/host/xhci-plat.c | 8 ++++++-- > drivers/usb/host/xhci.h | 1 + > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index 03d6bbe51919..cebe24ec80a5 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -183,6 +183,8 @@ static int xhci_plat_probe(struct platform_device *pdev) > struct usb_hcd *hcd; > int ret; > int irq; > + struct xhci_plat_priv *priv = NULL; > + > > if (usb_disabled()) > return -ENODEV; > @@ -280,8 +282,7 @@ static int xhci_plat_probe(struct platform_device *pdev) > priv_match = dev_get_platdata(&pdev->dev); > > if (priv_match) { > - struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd); > - > + priv = hcd_to_xhci_priv(hcd); > /* Just copy data for now */ > *priv = *priv_match; > } > @@ -329,6 +330,9 @@ static int xhci_plat_probe(struct platform_device *pdev) > > hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node); > xhci->shared_hcd->tpl_support = hcd->tpl_support; > + if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT)) > + hcd->skip_phy_initialization = 1; > + > ret = usb_add_hcd(hcd, irq, IRQF_SHARED); > if (ret) > goto disable_usb_phy; > diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h > index c295e8a7f5ae..07d71fec18d5 100644 > --- a/drivers/usb/host/xhci.h > +++ b/drivers/usb/host/xhci.h > @@ -1874,6 +1874,7 @@ struct xhci_hcd { > #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) > #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) > #define XHCI_RENESAS_FW_QUIRK BIT_ULL(36) > +#define XHCI_SKIP_PHY_INIT BIT_ULL(37) > > unsigned int num_active_eps; > unsigned int limit_active_eps; > -- > 2.17.1 >
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 03d6bbe51919..cebe24ec80a5 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -183,6 +183,8 @@ static int xhci_plat_probe(struct platform_device *pdev) struct usb_hcd *hcd; int ret; int irq; + struct xhci_plat_priv *priv = NULL; + if (usb_disabled()) return -ENODEV; @@ -280,8 +282,7 @@ static int xhci_plat_probe(struct platform_device *pdev) priv_match = dev_get_platdata(&pdev->dev); if (priv_match) { - struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd); - + priv = hcd_to_xhci_priv(hcd); /* Just copy data for now */ *priv = *priv_match; } @@ -329,6 +330,9 @@ static int xhci_plat_probe(struct platform_device *pdev) hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node); xhci->shared_hcd->tpl_support = hcd->tpl_support; + if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT)) + hcd->skip_phy_initialization = 1; + ret = usb_add_hcd(hcd, irq, IRQF_SHARED); if (ret) goto disable_usb_phy; diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index c295e8a7f5ae..07d71fec18d5 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1874,6 +1874,7 @@ struct xhci_hcd { #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) #define XHCI_RENESAS_FW_QUIRK BIT_ULL(36) +#define XHCI_SKIP_PHY_INIT BIT_ULL(37) unsigned int num_active_eps; unsigned int limit_active_eps;
Some DRD controllers (eg, dwc3 & cdns3) have PHY management at their own driver to cover both device and host mode, so add one priv quirk for such users to skip PHY management from HCD core. Signed-off-by: Peter Chen <peter.chen@nxp.com> --- drivers/usb/host/xhci-plat.c | 8 ++++++-- drivers/usb/host/xhci.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-)