narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[xhci] Record device-specific quirks in xHCI device structure 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/36/head
Michael Brown 2015-06-18 15:05:54 +01:00
parent 6b7157c233
commit 323bf186fb
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/drivers/usb/xhci.c
View File

@ -3197,6 +3197,7 @@ static int xhci_probe ( struct pci_device *pci ) {
goto err_alloc; goto err_alloc;
} }
xhci->name = pci->dev.name; xhci->name = pci->dev.name;
xhci->quirks = pci->id->driver_data;
/* Fix up PCI device */ /* Fix up PCI device */
adjust_pci_device ( pci ); adjust_pci_device ( pci );
@ -3218,7 +3219,7 @@ static int xhci_probe ( struct pci_device *pci ) {
xhci_legacy_claim ( xhci ); xhci_legacy_claim ( xhci );
/* Fix Intel PCH-specific quirks, if applicable */ /* Fix Intel PCH-specific quirks, if applicable */
if ( pci->id->driver_data & XHCI_PCH ) if ( xhci->quirks & XHCI_PCH )
xhci_pch_fix ( xhci, pci ); xhci_pch_fix ( xhci, pci );
/* Reset device */ /* Reset device */
@ -3254,7 +3255,7 @@ static int xhci_probe ( struct pci_device *pci ) {
err_alloc_bus: err_alloc_bus:
xhci_reset ( xhci ); xhci_reset ( xhci );
err_reset: err_reset:
if ( pci->id->driver_data & XHCI_PCH ) if ( xhci->quirks & XHCI_PCH )
xhci_pch_undo ( xhci, pci ); xhci_pch_undo ( xhci, pci );
xhci_legacy_release ( xhci ); xhci_legacy_release ( xhci );
iounmap ( xhci->regs ); iounmap ( xhci->regs );
@ -3276,7 +3277,7 @@ static void xhci_remove ( struct pci_device *pci ) {
unregister_usb_bus ( bus ); unregister_usb_bus ( bus );
free_usb_bus ( bus ); free_usb_bus ( bus );
xhci_reset ( xhci ); xhci_reset ( xhci );
if ( pci->id->driver_data & XHCI_PCH ) if ( xhci->quirks & XHCI_PCH )
xhci_pch_undo ( xhci, pci ); xhci_pch_undo ( xhci, pci );
xhci_legacy_release ( xhci ); xhci_legacy_release ( xhci );
iounmap ( xhci->regs ); iounmap ( xhci->regs );

2
src/drivers/usb/xhci.h
View File

@ -1038,6 +1038,8 @@ struct xhci_device {
void *regs; void *regs;
/** Name */ /** Name */
const char *name; const char *name;
/** Quirks */
unsigned int quirks;
/** Capability registers */ /** Capability registers */
void *cap; void *cap;