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

Commit 0bcfeb3e authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

USB: ehci: fix some ehci hangs and crashes 



I noticed that the "Refactor "if (handshake()) state = HC_STATE_HALT"
patch from earlier this year perpetuated a potential problem:  it can
mark the controller as halted when it's still running (but not acting
as, perhaps wrongly, expected).

That caused some hangs and crashes, rather than more polite failure
modes of a truly halted controller.  This patch forces a true halt,
and emits a (previously missing) diagnostic.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 73b2c205

drivers/usb/host/ehci-hcd.c

+16 −10
Original line number Diff line number Diff line
@@ -145,16 +145,6 @@ static int handshake (struct ehci_hcd *ehci, void __iomem *ptr, 
	return -ETIMEDOUT;

}



static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,

				       u32 mask, u32 done, int usec)

{

	int error = handshake(ehci, ptr, mask, done, usec);

	if (error)

		ehci_to_hcd(ehci)->state = HC_STATE_HALT;



	return error;

}



/* force HC to halt state from unknown (EHCI spec section 2.3) */

static int ehci_halt (struct ehci_hcd *ehci)

{
@@ -173,6 +163,22 @@ static int ehci_halt (struct ehci_hcd *ehci) 
			  STS_HALT, STS_HALT, 16 * 125);

}



static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,

				       u32 mask, u32 done, int usec)

{

	int error;



	error = handshake(ehci, ptr, mask, done, usec);

	if (error) {

		ehci_halt(ehci);

		ehci_to_hcd(ehci)->state = HC_STATE_HALT;

		ehci_err(ehci, "force halt; handhake %p %08x %08x -> %d\n",

			ptr, mask, done, error);

	}



	return error;

}



/* put TDI/ARC silicon into EHCI mode */

static void tdi_reset (struct ehci_hcd *ehci)

{