diff mbox series

[v2] usb: host: xhci-plat: set skip_phy_initialization if software node has XHCI_SKIP_PHY_INIT property

Message ID 20241209104149.4080315-1-xu.yang_2@nxp.com (mailing list archive)
State Superseded
Headers show
Series [v2] usb: host: xhci-plat: set skip_phy_initialization if software node has XHCI_SKIP_PHY_INIT property | expand

Commit Message

Xu Yang Dec. 9, 2024, 10:41 a.m. UTC
The source of quirk XHCI_SKIP_PHY_INIT comes from xhci_plat_priv.quirks or
software node property. This will set skip_phy_initialization if software
node also has XHCI_SKIP_PHY_INIT property.

Fixes: a6cd2b3fa894 ("usb: host: xhci-plat: Parse xhci-missing_cas_quirk and apply quirk")
Cc: stable@vger.kernel.org
Signed-off-by: Xu Yang <xu.yang_2@nxp.com>

---
Changes in v2:
 - fix indentation
 - add fix tag and stable list
---
 drivers/usb/host/xhci-plat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Greg Kroah-Hartman Dec. 9, 2024, 10:46 a.m. UTC | #1
On Mon, Dec 09, 2024 at 06:41:49PM +0800, Xu Yang wrote:
> The source of quirk XHCI_SKIP_PHY_INIT comes from xhci_plat_priv.quirks or
> software node property. This will set skip_phy_initialization if software
> node also has XHCI_SKIP_PHY_INIT property.
> 
> Fixes: a6cd2b3fa894 ("usb: host: xhci-plat: Parse xhci-missing_cas_quirk and apply quirk")
> Cc: stable@vger.kernel.org
> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> 
> ---
> Changes in v2:
>  - fix indentation
>  - add fix tag and stable list
> ---
>  drivers/usb/host/xhci-plat.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index e6c9006bd568..77853b86794a 100644
> --- a/drivers/usb/host/xhci-plat.c
> +++ b/drivers/usb/host/xhci-plat.c
> @@ -290,7 +290,8 @@ int xhci_plat_probe(struct platform_device *pdev, struct device *sysdev, const s
>  
>  	hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
>  
> -	if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT))
> +	if ((priv && (priv->quirks & XHCI_SKIP_PHY_INIT)) ||
> +		(xhci->quirks & XHCI_SKIP_PHY_INIT))

Doesn't checkpatch.pl complain about this?  This is still not correct,
please follow the proper indentation rules here.  If you have questions
about this, please ask your coworkers who understand the style
requirements for Linux.

thanks,

greg k-h
Xu Yang Dec. 9, 2024, 11:10 a.m. UTC | #2
On Mon, Dec 09, 2024 at 11:46:59AM +0100, Greg KH wrote:
> On Mon, Dec 09, 2024 at 06:41:49PM +0800, Xu Yang wrote:
> > The source of quirk XHCI_SKIP_PHY_INIT comes from xhci_plat_priv.quirks or
> > software node property. This will set skip_phy_initialization if software
> > node also has XHCI_SKIP_PHY_INIT property.
> > 
> > Fixes: a6cd2b3fa894 ("usb: host: xhci-plat: Parse xhci-missing_cas_quirk and apply quirk")
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> > 
> > ---
> > Changes in v2:
> >  - fix indentation
> >  - add fix tag and stable list
> > ---
> >  drivers/usb/host/xhci-plat.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> > index e6c9006bd568..77853b86794a 100644
> > --- a/drivers/usb/host/xhci-plat.c
> > +++ b/drivers/usb/host/xhci-plat.c
> > @@ -290,7 +290,8 @@ int xhci_plat_probe(struct platform_device *pdev, struct device *sysdev, const s
> >  
> >  	hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
> >  
> > -	if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT))
> > +	if ((priv && (priv->quirks & XHCI_SKIP_PHY_INIT)) ||
> > +		(xhci->quirks & XHCI_SKIP_PHY_INIT))
> 
> Doesn't checkpatch.pl complain about this?  This is still not correct,
> please follow the proper indentation rules here.  If you have questions
> about this, please ask your coworkers who understand the style
> requirements for Linux.

Sorry for wasting your time. It's a mistake. I made the change but it's not included finally.
BTW, checkpatch.pl doesn't complain the format. Not sure why.

Thanks,
Xu Yang

> 
> thanks,
> 
> greg k-h
Frank Li Dec. 9, 2024, 4:41 p.m. UTC | #3
On Mon, Dec 09, 2024 at 07:10:14PM +0800, Xu Yang wrote:
> On Mon, Dec 09, 2024 at 11:46:59AM +0100, Greg KH wrote:
> > On Mon, Dec 09, 2024 at 06:41:49PM +0800, Xu Yang wrote:
> > > The source of quirk XHCI_SKIP_PHY_INIT comes from xhci_plat_priv.quirks or
> > > software node property. This will set skip_phy_initialization if software
> > > node also has XHCI_SKIP_PHY_INIT property.
> > >
> > > Fixes: a6cd2b3fa894 ("usb: host: xhci-plat: Parse xhci-missing_cas_quirk and apply quirk")
> > > Cc: stable@vger.kernel.org
> > > Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> > >
> > > ---
> > > Changes in v2:
> > >  - fix indentation
> > >  - add fix tag and stable list
> > > ---
> > >  drivers/usb/host/xhci-plat.c | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> > > index e6c9006bd568..77853b86794a 100644
> > > --- a/drivers/usb/host/xhci-plat.c
> > > +++ b/drivers/usb/host/xhci-plat.c
> > > @@ -290,7 +290,8 @@ int xhci_plat_probe(struct platform_device *pdev, struct device *sysdev, const s
> > >
> > >  	hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
> > >
> > > -	if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT))
> > > +	if ((priv && (priv->quirks & XHCI_SKIP_PHY_INIT)) ||
> > > +		(xhci->quirks & XHCI_SKIP_PHY_INIT))
> >
> > Doesn't checkpatch.pl complain about this?  This is still not correct,
> > please follow the proper indentation rules here.  If you have questions
> > about this, please ask your coworkers who understand the style
> > requirements for Linux.
>
> Sorry for wasting your time. It's a mistake. I made the change but it's not included finally.
> BTW, checkpatch.pl doesn't complain the format. Not sure why.

try --strict option.

Frank

>
> Thanks,
> Xu Yang
>
> >
> > thanks,
> >
> > greg k-h
Xu Yang Dec. 10, 2024, 2:47 a.m. UTC | #4
On Mon, Dec 09, 2024 at 11:41:11AM -0500, Frank Li wrote:
> On Mon, Dec 09, 2024 at 07:10:14PM +0800, Xu Yang wrote:
> > On Mon, Dec 09, 2024 at 11:46:59AM +0100, Greg KH wrote:
> > > On Mon, Dec 09, 2024 at 06:41:49PM +0800, Xu Yang wrote:
> > > > The source of quirk XHCI_SKIP_PHY_INIT comes from xhci_plat_priv.quirks or
> > > > software node property. This will set skip_phy_initialization if software
> > > > node also has XHCI_SKIP_PHY_INIT property.
> > > >
> > > > Fixes: a6cd2b3fa894 ("usb: host: xhci-plat: Parse xhci-missing_cas_quirk and apply quirk")
> > > > Cc: stable@vger.kernel.org
> > > > Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> > > >
> > > > ---
> > > > Changes in v2:
> > > >  - fix indentation
> > > >  - add fix tag and stable list
> > > > ---
> > > >  drivers/usb/host/xhci-plat.c | 3 ++-
> > > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> > > > index e6c9006bd568..77853b86794a 100644
> > > > --- a/drivers/usb/host/xhci-plat.c
> > > > +++ b/drivers/usb/host/xhci-plat.c
> > > > @@ -290,7 +290,8 @@ int xhci_plat_probe(struct platform_device *pdev, struct device *sysdev, const s
> > > >
> > > >  	hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
> > > >
> > > > -	if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT))
> > > > +	if ((priv && (priv->quirks & XHCI_SKIP_PHY_INIT)) ||
> > > > +		(xhci->quirks & XHCI_SKIP_PHY_INIT))
> > >
> > > Doesn't checkpatch.pl complain about this?  This is still not correct,
> > > please follow the proper indentation rules here.  If you have questions
> > > about this, please ask your coworkers who understand the style
> > > requirements for Linux.
> >
> > Sorry for wasting your time. It's a mistake. I made the change but it's not included finally.
> > BTW, checkpatch.pl doesn't complain the format. Not sure why.
> 
> try --strict option.

It works.
Thank you Frank!
diff mbox series

Patch

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index e6c9006bd568..77853b86794a 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -290,7 +290,8 @@  int xhci_plat_probe(struct platform_device *pdev, struct device *sysdev, const s
 
 	hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
 
-	if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT))
+	if ((priv && (priv->quirks & XHCI_SKIP_PHY_INIT)) ||
+		(xhci->quirks & XHCI_SKIP_PHY_INIT))
 		hcd->skip_phy_initialization = 1;
 
 	if (priv && (priv->quirks & XHCI_SG_TRB_CACHE_SIZE_QUIRK))