Commit 314b41b1 authored by Wu Liang feng's avatar Wu Liang feng Committed by Greg Kroah-Hartman
Browse files

USB: ehci-platform: Support ehci reset after resume quirk 



The Rockchip rk3288 EHCI controller doesn't properly detect
the case when a device is removed during suspend. Specifically,
when usb resume from suspend, the EHCI controller maintaining
the USB state (FLAG_CF is 1, Current Connect Status is 1),
but a USB device (like a USB camera on rk3288) may have been
disconnected actually.

Let's add a quirk to force ehci to go into the
usb_root_hub_lost_power() path and reset after resume.
This should generally reset the whole controller and all
ports and initialize everything cleanly again, and bring
the devices back up.

As part of this, rename the "hibernation" paramter of
ehci_resume() to force_reset since hibernation is simply
another case where we can't trust the autodetected status
and need to force a reset of devices.

Signed-off-by: default avatarWu Liang feng <wulf@rock-chips.com>
Reviewed-by: default avatarJulius Werner <jwerner@google.com>
Reviewed-by: default avatarDoug Anderson <dianders@google.com>
Reviewed-by: default avatarTomasz Figa <tfiga@google.com>
Reviewed-by: default avatarPawel Osciak <posciak@google.com>
Reviewed-by: default avatarSonny Rao <sonnyrao@google.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Tested-by: default avatarDoug Anderson <dianders@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96e41854

drivers/usb/host/ehci-hcd.c

+3 −3
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ int ehci_suspend(struct usb_hcd *hcd, bool do_wakeup) 
EXPORT_SYMBOL_GPL(ehci_suspend);



/* Returns 0 if power was preserved, 1 if power was lost */

int ehci_resume(struct usb_hcd *hcd, bool hibernated)

int ehci_resume(struct usb_hcd *hcd, bool force_reset)

{

	struct ehci_hcd		*ehci = hcd_to_ehci(hcd);
@@ -1124,12 +1124,12 @@ int ehci_resume(struct usb_hcd *hcd, bool hibernated) 
		return 0;		/* Controller is dead */



	/*

	 * If CF is still set and we aren't resuming from hibernation

	 * If CF is still set and reset isn't forced

	 * then we maintained suspend power.

	 * Just undo the effect of ehci_suspend().

	 */

	if (ehci_readl(ehci, &ehci->regs->configured_flag) == FLAG_CF &&

			!hibernated) {

			!force_reset) {

		int	mask = INTR_MASK;



		ehci_prepare_ports_for_controller_resume(ehci);

drivers/usb/host/ehci-platform.c

+5 −1
Original line number Diff line number Diff line
@@ -185,6 +185,10 @@ static int ehci_platform_probe(struct platform_device *dev) 
		if (of_property_read_bool(dev->dev.of_node, "big-endian"))

			ehci->big_endian_mmio = ehci->big_endian_desc = 1;



		if (of_property_read_bool(dev->dev.of_node,

					  "needs-reset-on-resume"))

			pdata->reset_on_resume = 1;



		priv->phy = devm_phy_get(&dev->dev, "usb");

		if (IS_ERR(priv->phy)) {

			err = PTR_ERR(priv->phy);
@@ -340,7 +344,7 @@ static int ehci_platform_resume(struct device *dev) 
			return err;

	}



	ehci_resume(hcd, false);

	ehci_resume(hcd, pdata->reset_on_resume);

	return 0;

}

#endif /* CONFIG_PM_SLEEP */

drivers/usb/host/ehci.h

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ extern int ehci_handshake(struct ehci_hcd *ehci, void __iomem *ptr, 


#ifdef CONFIG_PM

extern int	ehci_suspend(struct usb_hcd *hcd, bool do_wakeup);

extern int	ehci_resume(struct usb_hcd *hcd, bool hibernated);

extern int	ehci_resume(struct usb_hcd *hcd, bool force_reset);

#endif	/* CONFIG_PM */



extern int	ehci_hub_control(struct usb_hcd	*hcd, u16 typeReq, u16 wValue,

include/linux/usb/ehci_pdriver.h

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ struct usb_hcd; 
 *			after initialization.

 * @no_io_watchdog:	set to 1 if the controller does not need the I/O

 *			watchdog to run.

 * @reset_on_resume:	set to 1 if the controller needs to be reset after

 * 			a suspend / resume cycle (but can't detect that itself).

 *

 * These are general configuration options for the EHCI controller. All of

 * these options are activating more or less workarounds for some hardware.
@@ -45,6 +47,7 @@ struct usb_ehci_pdata { 
	unsigned	big_endian_desc:1;

	unsigned	big_endian_mmio:1;

	unsigned	no_io_watchdog:1;

	unsigned	reset_on_resume:1;



	/* Turn on all power and clocks */

	int (*power_on)(struct platform_device *pdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE