usb: ehci: handshake CMD_RUN instead of STS_HALT

commit 7f2d73788d9067fd4f677ac5f60ffd25945af7af upstream.

For Aspeed, HCHalted status depends on not only Run/Stop but also
ASS/PSS status.
Handshake CMD_RUN on startup instead.

Tested-by: Tao Ren <rentao.bupt@gmail.com>
Reviewed-by: Tao Ren <rentao.bupt@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Neal Liu <neal_liu@aspeedtech.com>
Link: https://lore.kernel.org/r/20210910073619.26095-1-neal_liu@aspeedtech.com
Cc: Joel Stanley <joel@jms.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 1776c05d0a4865e5371e378a52fca60f4b6bbb6a..14408032162972d22d169021fdc495b0f94b361d 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -635,7 +635,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.
+        * Check CMD_RUN instead.
+        */
+       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 c70f2d0b4aaf07f69e272f94ac19fc601e54bd2c..c3dc906274d93015ca621417a27a236862acd61e 100644 (file)
--- 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 80bb823aa9fe8fe3fb49c4d6e6ffe5c7fd744e7f..fdd073cc053b89e777701a8e48e04f69be3581ca 100644 (file)
--- 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)