Re: [PATCH v2] usb: ehci: handshake CMD_RUN instead of STS_HALT
From: Greg Kroah-Hartman
Date: Thu Sep 09 2021 - 03:38:20 EST
On Thu, Sep 09, 2021 at 06:23:10AM +0000, Neal Liu wrote:
>
> > Hi Neal,
> >
> > On Wed, Sep 01, 2021 at 08:07:53AM +0200, Greg Kroah-Hartman wrote:
> > > On Wed, Sep 01, 2021 at 11:50:41AM +0800, neal_liu wrote:
> > > > Retitle.
> > > >
> > > > For Aspeed, HCHalted status depends on not only Run/Stop but also
> > > > ASS/PSS status.
> > > > Handshake CMD_RUN on startup instead.
> > > >
> > > > Signed-off-by: neal_liu <neal_liu@xxxxxxxxxxxxxx>
> > > > ---
> > > > drivers/usb/host/ehci-hcd.c | 11 ++++++++++-
> > > > drivers/usb/host/ehci-platform.c | 6 ++++++
> > > > drivers/usb/host/ehci.h | 1 +
> > > > 3 files changed, 17 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/usb/host/ehci-hcd.c
> > > > b/drivers/usb/host/ehci-hcd.c index 10b0365f3439..01c022e46aa2
> > > > 100644
> > > > --- a/drivers/usb/host/ehci-hcd.c
> > > > +++ b/drivers/usb/host/ehci-hcd.c
> > > > @@ -634,7 +634,16 @@ static int ehci_run (struct usb_hcd *hcd)
> > > > /* Wait until HC become operational */
> > > > ehci_readl(ehci, &ehci->regs->command); /* unblock posted writes
> > */
> > > > msleep(5);
> > > > - rc = ehci_handshake(ehci, &ehci->regs->status, STS_HALT, 0, 100 * 1000);
> > > > +
> > > > + /* For Aspeed, STS_HALT also depends on ASS/PSS status.
> > > > + * Skip this check on startup.
> > > > + */
> > > > + if (ehci->is_aspeed)
> > > > + rc = ehci_handshake(ehci, &ehci->regs->command, CMD_RUN,
> > > > + 1, 100 * 1000);
> > > > + else
> > > > + rc = ehci_handshake(ehci, &ehci->regs->status, STS_HALT,
> > > > + 0, 100 * 1000);
> > > >
> > > > up_write(&ehci_cf_port_reset_rwsem);
> > > >
> > > > diff --git a/drivers/usb/host/ehci-platform.c
> > > > b/drivers/usb/host/ehci-platform.c
> > > > index c70f2d0b4aaf..c3dc906274d9 100644
> > > > --- a/drivers/usb/host/ehci-platform.c
> > > > +++ b/drivers/usb/host/ehci-platform.c
> > > > @@ -297,6 +297,12 @@ static int ehci_platform_probe(struct
> > platform_device *dev)
> > > > "has-transaction-translator"))
> > > > hcd->has_tt = 1;
> > > >
> > > > + if (of_device_is_compatible(dev->dev.of_node,
> > > > + "aspeed,ast2500-ehci") ||
> > > > + of_device_is_compatible(dev->dev.of_node,
> > > > + "aspeed,ast2600-ehci"))
> > > > + ehci->is_aspeed = 1;
> > > > +
> > > > if (soc_device_match(quirk_poll_match))
> > > > priv->quirk_poll = true;
> > > >
> > > > diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index
> > > > 80bb823aa9fe..fdd073cc053b 100644
> > > > --- a/drivers/usb/host/ehci.h
> > > > +++ b/drivers/usb/host/ehci.h
> > > > @@ -219,6 +219,7 @@ struct ehci_hcd { /* one per
> > controller */
> > > > unsigned need_oc_pp_cycle:1; /* MPC834X port power */
> > > > unsigned imx28_write_fix:1; /* For Freescale i.MX28 */
> > > > unsigned spurious_oc:1;
> > > > + unsigned is_aspeed:1;
> > > >
> > > > /* required for usb32 quirk */
> > > > #define OHCI_CTRL_HCFS (3 << 6)
> > > > --
> > > > 2.17.1
> > > >
> > >
> > > Hi,
> > >
> > > This is the friendly patch-bot of Greg Kroah-Hartman. You have sent
> > > him a patch that has triggered this response. He used to manually
> > > respond to these common problems, but in order to save his sanity (he
> > > kept writing the same thing over and over, yet to different people), I
> > > was created. Hopefully you will not take offence and will fix the
> > > problem in your patch and resubmit it so that it can be accepted into
> > > the Linux kernel tree.
> > >
> > > You are receiving this message because of the following common
> > > error(s) as indicated below:
> > >
> > > - It looks like you did not use your "real" name for the patch on either
> > > the Signed-off-by: line, or the From: line (both of which have to
> > > match). Please read the kernel file, Documentation/SubmittingPatches
> > > for how to do this correctly.
> > >
> > > - This looks like a new version of a previously submitted patch, but you
> > > did not list below the --- line any changes from the previous version.
> > > Please read the section entitled "The canonical patch format" in the
> > > kernel file, Documentation/SubmittingPatches for what needs to be done
> > > here to properly describe this.
> > >
> > > If you wish to discuss this problem further, or you have questions
> > > about how to resolve this issue, please feel free to respond to this
> > > email and Greg will reply once he has dug out from the pending patches
> > > received from other developers.
> > >
> > > thanks,
> > >
> > > greg k-h's patch email bot
> >
> > Thank you Neal for the patch. I tried the fix on my CMM (AST2500) and Fuji
> > (AST2600) BMC and it works on both platforms.
> >
> > Can you please address Greg's comments above and send out a new version?
> > BTW, please don't forget to include Alan's Acked-by in the new version.
> >
> > Reviewed-by: Tao Ren <rentao.bupt@xxxxxxxxx>
> > Tested-by: Tao Ren <rentao.bupt@xxxxxxxxx>
> >
> >
> > Cheers,
> >
> > Tao
>
> Sure! I'll try to fix Greg's comments on next patch. I think the problem is the first one.
> And thanks for your review & test.
Both problems are real, please fix them.