[PATCH] drivers:mfd:omap-usb-host.c: Fix improper mask use.

[PATCH] drivers:mfd:omap-usb-host.c: Fix improper mask use.

[Michael Welling]

single-ulpi-bypass is a flag used for older OMAP3 silicon.

The flag when set, can excite code that improperly uses the
OMAP_UHH_HOSTCONFIG_UPLI_BYPASS define to clear the corresponding bit.
Instead it clears all of the other bits disabling all of the ports in
the process.

Signed-off-by: Michael Welling <mwelling@emacinc.com>
---
 drivers/mfd/omap-usb-host.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index b48d80c..33a9234 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -445,7 +445,7 @@ static unsigned omap_usbhs_rev1_hostconfig(struct usbhs_hcd_omap *omap,
 
 		for (i = 0; i < omap->nports; i++) {
 			if (is_ehci_phy_mode(pdata->port_mode[i])) {
-				reg &= OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
+				reg &= ~OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
 				break;
 			}
 		}
-- 
1.7.10.4

Re: [PATCH] drivers:mfd:omap-usb-host.c: Fix improper mask use.

[Roger Quadros]

Hi Michael,

On 07/29/2014 02:01 AM, Michael Welling wrote:
> single-ulpi-bypass is a flag used for older OMAP3 silicon.
> 
> The flag when set, can excite code that improperly uses the
> OMAP_UHH_HOSTCONFIG_UPLI_BYPASS define to clear the corresponding bit.
> Instead it clears all of the other bits disabling all of the ports in
> the process.
> 
> Signed-off-by: Michael Welling <mwelling@emacinc.com>
> ---
>  drivers/mfd/omap-usb-host.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> index b48d80c..33a9234 100644
> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -445,7 +445,7 @@ static unsigned omap_usbhs_rev1_hostconfig(struct usbhs_hcd_omap *omap,
>  
>  		for (i = 0; i < omap->nports; i++) {
>  			if (is_ehci_phy_mode(pdata->port_mode[i])) {
> -				reg &= OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
> +				reg &= ~OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
>  				break;
>  			}
>  		}
> 

Acked-by: Roger Quadros <rogerq@ti.com>

Good catch!

It seems the regression was introduced by commit c4df00aed9e2 in v3.9.
Could you please cc this patch to stable@vger.kernel.org

cheers,
-roger

[PATCH] mfd: omap-usb-host: Fix improper mask use

[Lee Jones]

single-ulpi-bypass is a flag used for older OMAP3 silicon.

The flag when set, can excite code that improperly uses the
OMAP_UHH_HOSTCONFIG_UPLI_BYPASS define to clear the corresponding bit.
Instead it clears all of the other bits disabling all of the ports in
the process.

Signed-off-by: Michael Welling <mwelling@emacinc.com>
---

--> Applied, thanks. <--

 drivers/mfd/omap-usb-host.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index b48d80c..33a9234 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -445,7 +445,7 @@ static unsigned omap_usbhs_rev1_hostconfig(struct usbhs_hcd_omap *omap,
 
 		for (i = 0; i < omap->nports; i++) {
 			if (is_ehci_phy_mode(pdata->port_mode[i])) {
-				reg &= OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
+				reg &= ~OMAP_UHH_HOSTCONFIG_ULPI_BYPASS;
 				break;
 			}
 		}

Re: [PATCH] mfd: omap-usb-host: Fix improper mask use

[Greg KH]

On Tue, Jul 29, 2014 at 09:33:25AM +0100, Lee Jones wrote:
> single-ulpi-bypass is a flag used for older OMAP3 silicon.
> 
> The flag when set, can excite code that improperly uses the
> OMAP_UHH_HOSTCONFIG_UPLI_BYPASS define to clear the corresponding bit.
> Instead it clears all of the other bits disabling all of the ports in
> the process.
> 
> Signed-off-by: Michael Welling <mwelling@emacinc.com>
> ---
> 
> --> Applied, thanks. <--
> 
>  drivers/mfd/omap-usb-host.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
for how to do this properly.

</formletter>

Re: [PATCH] mfd: omap-usb-host: Fix improper mask use

[Lee Jones]

On Tue, 29 Jul 2014, Greg KH wrote:

> On Tue, Jul 29, 2014 at 09:33:25AM +0100, Lee Jones wrote:
> > single-ulpi-bypass is a flag used for older OMAP3 silicon.
> > 
> > The flag when set, can excite code that improperly uses the
> > OMAP_UHH_HOSTCONFIG_UPLI_BYPASS define to clear the corresponding bit.
> > Instead it clears all of the other bits disabling all of the ports in
> > the process.
> > 
> > Signed-off-by: Michael Welling <mwelling@emacinc.com>
> > ---
> > 
> > --> Applied, thanks. <--
> > 
> >  drivers/mfd/omap-usb-host.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> <formletter>
> 
> This is not the correct way to submit patches for inclusion in the
> stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
> for how to do this properly.
> 
> </formletter>

It was worth a try. ;)

Patch queued for MFD -next and 'Cc: stable@vger.kernel.org' tag added.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog