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

Commit c877b3b2 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Sarah Sharp
Browse files

xhci: Add reset on resume quirk for asrock p67 host 



The asrock p67 xhci controller completely dies on resume, add a
quirk for this, to bring the host back online after a suspend.

This should be backported to stable kernels as old as 2.6.37.

Signed-off-by: default avatarMaarten Lankhorst <m.b.lankhorst@gmail.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@kernel.org
parent f6ba6fe2

drivers/usb/host/xhci-pci.c

+8 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
#define PCI_VENDOR_ID_FRESCO_LOGIC	0x1b73

#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK	0x1000



#define PCI_VENDOR_ID_ETRON		0x1b6f

#define PCI_DEVICE_ID_ASROCK_P67	0x7023



static const char hcd_name[] = "xhci_hcd";



/* called after powerup, by probe or system-pm "wakeup" */
@@ -134,6 +137,11 @@ static int xhci_pci_setup(struct usb_hcd *hcd) 
		xhci->quirks |= XHCI_EP_LIMIT_QUIRK;

		xhci->limit_active_eps = 64;

	}

	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&

			pdev->device == PCI_DEVICE_ID_ASROCK_P67) {

		xhci->quirks |= XHCI_RESET_ON_RESUME;

		xhci_dbg(xhci, "QUIRK: Resetting on resume\n");

	}



	/* Make sure the HC is halted. */

	retval = xhci_halt(xhci);

drivers/usb/host/xhci.c

+2 −0
Original line number Diff line number Diff line
@@ -759,6 +759,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) 
		msleep(100);



	spin_lock_irq(&xhci->lock);

	if (xhci->quirks & XHCI_RESET_ON_RESUME)

		hibernated = true;



	if (!hibernated) {

		/* step 1: restore register */

drivers/usb/host/xhci.h

+1 −0
Original line number Diff line number Diff line
@@ -1310,6 +1310,7 @@ struct xhci_hcd { 
 */

#define XHCI_EP_LIMIT_QUIRK	(1 << 5)

#define XHCI_BROKEN_MSI		(1 << 6)

#define XHCI_RESET_ON_RESUME	(1 << 7)

	unsigned int		num_active_eps;

	unsigned int		limit_active_eps;

	/* There are two roothubs to keep track of bus suspend info for */