[PATCH] imx: usb: get pinctrl if it's not yet initialized

[PATCH] imx: usb: get pinctrl if it's not yet initialized

[Krzysztof Michonski]

In case usb phy mode is other than USBPHY_INTERFACE_MODE_HSIC
the pinctrl for device is not acquired. It is however used later
regardless of the mode, hence leads to requesting access to
uninitialized data.

Signed-off-by: Krzysztof Michonski <michonskikrzysztof@gmail.com>
---
 drivers/usb/chipidea/ci_hdrc_imx.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index a4b482c3dc65..2f02b35c40b6 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -428,6 +428,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
 		pm_runtime_enable(dev);
 	}
 
+	if (!data->pinctrl)
+		data->pinctrl = devm_pinctrl_get(dev);
+
 	if (!IS_ERR(data->pinctrl)) {
 		struct pinctrl_state *state;
 
-- 
2.21.0

RE: [PATCH] imx: usb: get pinctrl if it's not yet initialized

[Peter Chen]

 
> In case usb phy mode is other than USBPHY_INTERFACE_MODE_HSIC the pinctrl
> for device is not acquired. It is however used later regardless of the mode, hence
> leads to requesting access to uninitialized data.
> 
> Signed-off-by: Krzysztof Michonski <michonskikrzysztof@gmail.com>
> ---
>  drivers/usb/chipidea/ci_hdrc_imx.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
> index a4b482c3dc65..2f02b35c40b6 100644
> --- a/drivers/usb/chipidea/ci_hdrc_imx.c
> +++ b/drivers/usb/chipidea/ci_hdrc_imx.c
> @@ -428,6 +428,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
>  		pm_runtime_enable(dev);
>  	}
> 
> +	if (!data->pinctrl)
> +		data->pinctrl = devm_pinctrl_get(dev);
> +
>  	if (!IS_ERR(data->pinctrl)) {
>  		struct pinctrl_state *state;
> 

Sorry, what kernel version you are using? The recent kernel is different with the patch you posted.

Peter

Re: [PATCH] imx: usb: get pinctrl if it's not yet initialized

[Krzysztof Michoński]

Hi Peter,
Yes you are right! This file's been patched previously in my fork.
Sorry about that.

Regards,
Krzysztof Michoński

czw., 27 cze 2019 o 05:22 Peter Chen <peter.chen@nxp.com> napisał(a):
>
>
> > In case usb phy mode is other than USBPHY_INTERFACE_MODE_HSIC the pinctrl
> > for device is not acquired. It is however used later regardless of the mode, hence
> > leads to requesting access to uninitialized data.
> >
> > Signed-off-by: Krzysztof Michonski <michonskikrzysztof@gmail.com>
> > ---
> >  drivers/usb/chipidea/ci_hdrc_imx.c | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
> > index a4b482c3dc65..2f02b35c40b6 100644
> > --- a/drivers/usb/chipidea/ci_hdrc_imx.c
> > +++ b/drivers/usb/chipidea/ci_hdrc_imx.c
> > @@ -428,6 +428,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
> >               pm_runtime_enable(dev);
> >       }
> >
> > +     if (!data->pinctrl)
> > +             data->pinctrl = devm_pinctrl_get(dev);
> > +
> >       if (!IS_ERR(data->pinctrl)) {
> >               struct pinctrl_state *state;
> >
>
> Sorry, what kernel version you are using? The recent kernel is different with the patch you posted.
>
> Peter
>