Skip to content

Commit

Permalink
xHCI: reset-on-resume quirk for NEC uPD720200
Browse files Browse the repository at this point in the history
Julian Sikorski reports NEC uPD720200 does not work stable after suspend
and resume. Re-initialize the host in xhci_resume().

This should be backported to stable kernels as old as 2.6.37.  The
kernel will need to include
commit c877b3b
"xhci: Add reset on resume quirk for asrock p67 host"
for this patch to work.

Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Reported-by: Julian Sikorski <belegdol@gmail.com>
Tested-by: Julian Sikorski <belegdol@gmail.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
  • Loading branch information
Andiry Xu authored and Sarah Sharp committed Nov 28, 2011
1 parent 8746c83 commit df711fc
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/usb/host/xhci-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#define PCI_VENDOR_ID_ETRON 0x1b6f
#define PCI_DEVICE_ID_ASROCK_P67 0x7023

#define PCI_DEVICE_ID_NEC_uPD720200 0x0194

static const char hcd_name[] = "xhci_hcd";

/* called after powerup, by probe or system-pm "wakeup" */
Expand Down Expand Up @@ -74,8 +76,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
pdev->revision);
}

if (pdev->vendor == PCI_VENDOR_ID_NEC)
if (pdev->vendor == PCI_VENDOR_ID_NEC) {
xhci->quirks |= XHCI_NEC_HOST;
if (pdev->device == PCI_DEVICE_ID_NEC_uPD720200)
xhci->quirks |= XHCI_RESET_ON_RESUME;
}

if (pdev->vendor == PCI_VENDOR_ID_AMD && xhci->hci_version == 0x96)
xhci->quirks |= XHCI_AMD_0x96_HOST;
Expand Down

0 comments on commit df711fc

Please sign in to comment.