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

Commit 403dbd36 authored by Alek Du's avatar Alek Du Committed by Greg Kroah-Hartman
Browse files

USB: EHCI: add need_io_watchdog flag to ehci_hcd 



Basically the io watchdog is only useful for those quirk HCDs. For most
good ones, it only brings unnecessary wakeups.  At least, I know the
Intel EHCI HCDs should turn off the flag.

Signed-off-by: default avatarAlek Du <alek.du@intel.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4d155eb5

drivers/usb/host/ehci-hcd.c

+6 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ timer_action(struct ehci_hcd *ehci, enum ehci_timer_action action) 


		switch (action) {

		case TIMER_IO_WATCHDOG:

			if (!ehci->need_io_watchdog)

				return;

			t = EHCI_IO_JIFFIES;

			break;

		case TIMER_ASYNC_OFF:
@@ -508,6 +510,10 @@ static int ehci_init(struct usb_hcd *hcd) 


	spin_lock_init(&ehci->lock);



	/*

	 * keep io watchdog by default, those good HCDs could turn off it later

	 */

	ehci->need_io_watchdog = 1;

	init_timer(&ehci->watchdog);

	ehci->watchdog.function = ehci_watchdog;

	ehci->watchdog.data = (unsigned long) ehci;

drivers/usb/host/ehci-pci.c

+3 −0
Original line number Diff line number Diff line
@@ -129,6 +129,9 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
		return retval;



	switch (pdev->vendor) {

	case PCI_VENDOR_ID_INTEL:

		ehci->need_io_watchdog = 0;

		break;

	case PCI_VENDOR_ID_TDI:

		if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) {

			hcd->has_tt = 1;

drivers/usb/host/ehci.h

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ struct ehci_hcd { /* one per controller */ 
	unsigned		big_endian_mmio:1;

	unsigned		big_endian_desc:1;

	unsigned		has_amcc_usb23:1;

	unsigned		need_io_watchdog:1;



	/* required for usb32 quirk */

	#define OHCI_CTRL_HCFS          (3 << 6)