Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36acc24d authored by Neal Liu's avatar Neal Liu Committed by Greg Kroah-Hartman
Browse files

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: default avatarTao Ren <rentao.bupt@gmail.com>
Reviewed-by: default avatarTao Ren <rentao.bupt@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarNeal 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9057a484

drivers/usb/host/ehci-hcd.c

+10 −1
Original line number Diff line number Diff line
@@ -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.

	 * 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);

drivers/usb/host/ehci-platform.c

+6 −0
Original line number Diff line number Diff line
@@ -288,6 +288,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;

drivers/usb/host/ehci.h

+1 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ struct ehci_hcd { /* one per controller */ 
	unsigned		frame_index_bug:1; /* MosChip (AKA NetMos) */

	unsigned		need_oc_pp_cycle:1; /* MPC834X port power */

	unsigned		imx28_write_fix:1; /* For Freescale i.MX28 */

	unsigned		is_aspeed:1;



	/* required for usb32 quirk */

	#define OHCI_CTRL_HCFS          (3 << 6)