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

[ehci] Allow UHCI/OHCI controllers to locate the EHCI companion controller 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/36/head
Michael Brown 2015-05-08 16:51:12 +01:00
parent a66fd8920d
commit 9ea8a2daa7
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/drivers/usb/ehci.c
View File

@ -337,6 +337,32 @@ static void ehci_poll_companions ( struct ehci_device *ehci ) {
}
}
/**
* Locate EHCI companion controller
*
* @v pci PCI device
* @ret busdevfn EHCI companion controller bus:dev.fn (if any)
*/
unsigned int ehci_companion ( struct pci_device *pci ) {
struct pci_device tmp;
unsigned int busdevfn;
int rc;
/* Look for an EHCI function on the same PCI device */
busdevfn = pci->busdevfn;
while ( ++busdevfn <= PCI_LAST_FUNC ( pci->busdevfn ) ) {
pci_init ( &tmp, busdevfn );
if ( ( rc = pci_read_config ( &tmp ) ) != 0 )
continue;
if ( tmp.class == PCI_CLASS ( PCI_CLASS_SERIAL,
PCI_CLASS_SERIAL_USB,
PCI_CLASS_SERIAL_USB_EHCI ) )
return busdevfn;
}
return 0;
}
/******************************************************************************
*
* Run / stop / reset

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

@ -537,4 +537,6 @@ struct ehci_endpoint {
struct ehci_ring ring;
};
extern unsigned int ehci_companion ( struct pci_device *pci );
#endif /* _IPXE_EHCI_H */

1
src/include/ipxe/pci.h
View File

@ -239,6 +239,7 @@ struct pci_driver {
#define PCI_BUSDEVFN( bus, slot, func ) \
( ( (bus) << 8 ) | ( (slot) << 3 ) | ( (func) << 0 ) )
#define PCI_FIRST_FUNC( busdevfn ) ( (busdevfn) & ~0x07 )
#define PCI_LAST_FUNC( busdevfn ) ( (busdevfn) | 0x07 )
#define PCI_BASE_CLASS( class ) ( (class) >> 16 )
#define PCI_SUB_CLASS( class ) ( ( (class) >> 8 ) & 0xff )