USB: xhci: fix OS want to own HC

Software should set XHCI_HC_OS_OWNED bit to request ownership of xHC

Signed-off-by JiSheng Zhang <[email protected]>

---
 drivers/usb/host/pci-quirks.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/usb/host/pci-quirks.c +1 -1

index fd93061..1a73004 100644
@@ -775,7 +775,7 @@ static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)
 
 	/* If the BIOS owns the HC, signal that the OS wants it, and wait */
 	if (val & XHCI_HC_BIOS_OWNED) {
-		writel(val & XHCI_HC_OS_OWNED, base + ext_cap_offset);
+		writel(val | XHCI_HC_OS_OWNED, base + ext_cap_offset);
 
 		/* Wait for 5 seconds with 10 microsecond polling interval */
 		timeout = handshake(base + ext_cap_offset, XHCI_HC_BIOS_OWNED,

Signature · 1 line

1.7.5.4

Quoted 1 line · JiSheng Zhang

Software should set XHCI_HC_OS_OWNED bit to request ownership of xHC

Good catch! I'll queue this up to my for-usb-linus branch and send it out to Greg later today.

Greg, do you think it's too late to get this into 3.0?

Shall I just add it to usb-next and mark it for stable?