MSM8974: USB (gadget mode) broken in v4.11-rc1

MSM8974: USB (gadget mode) broken in v4.11-rc1

[Jonathan Neuschäfer]

[-- Attachment #1: Type: text/plain, Size: 1738 bytes --]

Hi,

In Andy Gross' for-next branch (commit a844f941617c929b29, "Merge tag
'qcom-arm64-for-4.11-2' into final-for-4.11"), USB support on my MSM8974
phone worked, but since the following merge by Linus (195849ea13549dc), it
does not work anymore. (I've only tested gadget mode so far. I don't know if
host mode works.)

I ran git bisect with the devicetree from Bjorn Andersson's commit
769907ae6e6c28 ("ARM: dts: qcom: msm8974: Add USB gadget nodes"), and got
this result:

e9f15a71f17b328be44767cb893576c7c838f996 is the first bad commit
commit e9f15a71f17b328be44767cb893576c7c838f996
Author: Stephen Boyd <stephen.boyd@linaro.org>
Date:   Wed Dec 28 14:57:01 2016 -0800

    usb: chipidea: msm: Add proper clk and reset support

    The msm chipidea controller uses two main clks, an AHB clk to
    read/write the MMIO registers and a core clk called the system
    clk that drives the controller itself. Add support for these clks
    as they're required in all designs.

    Also add support for an optional third clk that we need to turn
    on to reset the controller and wrapper logic and other
    "housekeeping" things. This clk was removed in later revisions of
    the hardware because the reset methodology no longer required
    clks to be enabled to propagate resets.

    Acked-by: Peter Chen <peter.chen@nxp.com>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
    Signed-off-by: Peter Chen <peter.chen@nxp.com>

I can't see any potential error messages because the serial gadget driver is
the only console I have on this system.

Is there something missing in qcom-msm8974.dtsi?


Regards,
Jonathan Neuschäfer

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: MSM8974: USB (gadget mode) broken in v4.11-rc1

[Stephen Boyd]

Quoting Jonathan Neuschäfer (2017-03-06 21:04:23)
> Hi,
> 
> In Andy Gross' for-next branch (commit a844f941617c929b29, "Merge tag
> 'qcom-arm64-for-4.11-2' into final-for-4.11"), USB support on my MSM8974
> phone worked, but since the following merge by Linus (195849ea13549dc), it
> does not work anymore. (I've only tested gadget mode so far. I don't know if
> host mode works.)
> 
> I ran git bisect with the devicetree from Bjorn Andersson's commit
> 769907ae6e6c28 ("ARM: dts: qcom: msm8974: Add USB gadget nodes"), and got

I have no idea why this was merged into v4.11-rc1. Andy?

> this result:
> 
> e9f15a71f17b328be44767cb893576c7c838f996 is the first bad commit
> commit e9f15a71f17b328be44767cb893576c7c838f996
> Author: Stephen Boyd <stephen.boyd@linaro.org>
> Date:   Wed Dec 28 14:57:01 2016 -0800
> 
>     usb: chipidea: msm: Add proper clk and reset support
> 
>     The msm chipidea controller uses two main clks, an AHB clk to
>     read/write the MMIO registers and a core clk called the system
>     clk that drives the controller itself. Add support for these clks
>     as they're required in all designs.
> 
>     Also add support for an optional third clk that we need to turn
>     on to reset the controller and wrapper logic and other
>     "housekeeping" things. This clk was removed in later revisions of
>     the hardware because the reset methodology no longer required
>     clks to be enabled to propagate resets.
> 
>     Acked-by: Peter Chen <peter.chen@nxp.com>
>     Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>     Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
>     Signed-off-by: Peter Chen <peter.chen@nxp.com>
> 
> I can't see any potential error messages because the serial gadget driver is
> the only console I have on this system.

Oh that's unfortunate.

> 
> Is there something missing in qcom-msm8974.dtsi?

Yes. The DT side of the patches never merged into arm-soc, so you'll
need this patch[1] to get things going. I thought the plan was to wait
for the usb driver rewrite and never merge that dts patch you mentioned.

[1] http://lkml.kernel.org/r/20170127004728.22490-4-stephen.boyd@linaro.org

Re: MSM8974: USB (gadget mode) broken in v4.11-rc1

[Andy Gross]

On Tue, Mar 07, 2017 at 07:54:21AM -0800, Stephen Boyd wrote:
> Quoting Jonathan Neuschäfer (2017-03-06 21:04:23)
> > Hi,
> > 
> > In Andy Gross' for-next branch (commit a844f941617c929b29, "Merge tag
> > 'qcom-arm64-for-4.11-2' into final-for-4.11"), USB support on my MSM8974
> > phone worked, but since the following merge by Linus (195849ea13549dc), it
> > does not work anymore. (I've only tested gadget mode so far. I don't know if
> > host mode works.)
> > 
> > I ran git bisect with the devicetree from Bjorn Andersson's commit
> > 769907ae6e6c28 ("ARM: dts: qcom: msm8974: Add USB gadget nodes"), and got
> 
> I have no idea why this was merged into v4.11-rc1. Andy?

This was one of the outstanding patches that I thought needed to be merged.

> 
> > this result:
> > 
> > e9f15a71f17b328be44767cb893576c7c838f996 is the first bad commit
> > commit e9f15a71f17b328be44767cb893576c7c838f996
> > Author: Stephen Boyd <stephen.boyd@linaro.org>
> > Date:   Wed Dec 28 14:57:01 2016 -0800
> > 
> >     usb: chipidea: msm: Add proper clk and reset support
> > 
> >     The msm chipidea controller uses two main clks, an AHB clk to
> >     read/write the MMIO registers and a core clk called the system
> >     clk that drives the controller itself. Add support for these clks
> >     as they're required in all designs.
> > 
> >     Also add support for an optional third clk that we need to turn
> >     on to reset the controller and wrapper logic and other
> >     "housekeeping" things. This clk was removed in later revisions of
> >     the hardware because the reset methodology no longer required
> >     clks to be enabled to propagate resets.
> > 
> >     Acked-by: Peter Chen <peter.chen@nxp.com>
> >     Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> >     Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
> >     Signed-off-by: Peter Chen <peter.chen@nxp.com>
> > 
> > I can't see any potential error messages because the serial gadget driver is
> > the only console I have on this system.
> 
> Oh that's unfortunate.
> 
> > 
> > Is there something missing in qcom-msm8974.dtsi?
> 
> Yes. The DT side of the patches never merged into arm-soc, so you'll
> need this patch[1] to get things going. I thought the plan was to wait
> for the usb driver rewrite and never merge that dts patch you mentioned.

When I queued that into my set of patches I thought that it was safe.  I thought
wrong.  I can send a fixes pull request to fix the current mainline.


> [1] http://lkml.kernel.org/r/20170127004728.22490-4-stephen.boyd@linaro.org
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: MSM8974: USB (gadget mode) broken in v4.11-rc1

[Bjorn Andersson]

On Wed 08 Mar 09:40 CET 2017, Andy Gross wrote:

> On Tue, Mar 07, 2017 at 07:54:21AM -0800, Stephen Boyd wrote:
> > Quoting Jonathan Neuschäfer (2017-03-06 21:04:23)
[..]
> > > 
> > > Is there something missing in qcom-msm8974.dtsi?
> > 
> > Yes. The DT side of the patches never merged into arm-soc, so you'll
> > need this patch[1] to get things going. I thought the plan was to wait
> > for the usb driver rewrite and never merge that dts patch you mentioned.
> 
> When I queued that into my set of patches I thought that it was safe.  I thought
> wrong.  I can send a fixes pull request to fix the current mainline.
> 

Technically there's no regression in mainline, as both parts landed in
v4.11-rc1.  The "fix" for the problem should be to bring in Stephen's
dts patches - which would be nice to have - but might not be -rc
material.

Regards,
Bjorn

Re: MSM8974: USB (gadget mode) broken in v4.11-rc1

[Jonathan Neuschäfer]

[-- Attachment #1: Type: text/plain, Size: 620 bytes --]

On Tue, Mar 07, 2017 at 07:54:21AM -0800, Stephen Boyd wrote:
> Quoting Jonathan Neuschäfer (2017-03-06 21:04:23)
[...]
> > Is there something missing in qcom-msm8974.dtsi?
> 
> Yes. The DT side of the patches never merged into arm-soc, so you'll
> need this patch[1] to get things going. I thought the plan was to wait
> for the usb driver rewrite and never merge that dts patch you mentioned.

Thanks for explaining this.

> [1] http://lkml.kernel.org/r/20170127004728.22490-4-stephen.boyd@linaro.org

Are you going to rebase/resend this patch series for v4.12?


Best regards,
Jonathan Neuschäfer

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]