From b9326c365520806978b6ab9b8532cbc983f36da1 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 15 Mar 2011 16:55:04 +0000 Subject: [efi] Mark SNP devices as children of EFI PCI device Re-open the EFI_PCI_IO_PROTOCOL specifying an Attributes value of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER. This causes the SNP devices to be marked as children of the EFI PCI device (as shown in the "devtree" command). On at least one IBM blade system, this is required in order to have the relevant drivers automatically attach to the SNP controller at device creation time. Signed-off-by: Michael Brown --- src/interface/efi/efi_pci.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'src/interface/efi/efi_pci.c') diff --git a/src/interface/efi/efi_pci.c b/src/interface/efi/efi_pci.c index d866e30e7..3b393fcbe 100644 --- a/src/interface/efi/efi_pci.c +++ b/src/interface/efi/efi_pci.c @@ -139,6 +139,7 @@ struct efi_pci_device * efipci_create ( struct efi_driver *efidrv, if ( ! efipci ) goto err_zalloc; efipci->device = device; + efipci->efidrv = efidrv; /* See if device is a PCI device */ if ( ( efirc = bs->OpenProtocol ( device, @@ -262,6 +263,54 @@ struct efi_pci_device * efipci_find ( struct device *dev ) { return NULL; } +/** + * Add EFI device as child of EFI PCI device + * + * @v efipci EFI PCI device + * @v device EFI child device + * @ret efirc EFI status code + */ +EFI_STATUS efipci_child_add ( struct efi_pci_device *efipci, + EFI_HANDLE device ) { + EFI_BOOT_SERVICES *bs = efi_systab->BootServices; + struct efi_driver *efidrv = efipci->efidrv; + union { + EFI_PCI_IO_PROTOCOL *pci_io; + void *interface; + } pci_io; + EFI_STATUS efirc; + + /* Re-open the PCI_IO_PROTOCOL */ + if ( ( efirc = bs->OpenProtocol ( efipci->device, + &efi_pci_io_protocol_guid, + &pci_io.interface, + efidrv->driver.DriverBindingHandle, + device, + EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER + ) ) != 0 ) { + DBGC ( efipci, "EFIPCI " PCI_FMT " could not add child: %s\n", + PCI_ARGS ( &efipci->pci ), efi_strerror ( efirc ) ); + return efirc; + } + + return 0; +} + +/** + * Remove EFI device as child of PCI device + * + * @v efipci EFI PCI device + * @v device EFI child device + * @ret efirc EFI status code + */ +void efipci_child_del ( struct efi_pci_device *efipci, EFI_HANDLE device ) { + EFI_BOOT_SERVICES *bs = efi_systab->BootServices; + struct efi_driver *efidrv = efipci->efidrv; + + bs->CloseProtocol ( efipci->device, &efi_pci_io_protocol_guid, + efidrv->driver.DriverBindingHandle, device ); +} + /** * Destroy EFI PCI device * -- cgit v1.2.3-55-g7522