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

[efi] Provide a single implementation of efipci_root_close() 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/146/head
Michael Brown 2020-09-24 17:00:29 +01:00
parent fe69934191
commit ccfffc797a
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/interface/efi/efi_pci.c
View File

@ -62,15 +62,15 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
*/ */
/** /**
* Locate EFI PCI root bridge I/O protocol * Open EFI PCI root bridge I/O protocol
* *
* @v pci PCI device * @v pci PCI device
* @ret handle EFI PCI root bridge handle * @ret handle EFI PCI root bridge handle
* @ret root EFI PCI root bridge I/O protocol, or NULL if not found * @ret root EFI PCI root bridge I/O protocol, or NULL if not found
* @ret rc Return status code * @ret rc Return status code
*/ */
static int efipci_root ( struct pci_device *pci, EFI_HANDLE *handle, static int efipci_root_open ( struct pci_device *pci, EFI_HANDLE *handle,
EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL **root ) { EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL **root ) {
EFI_BOOT_SERVICES *bs = efi_systab->BootServices; EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
EFI_HANDLE *handles; EFI_HANDLE *handles;
UINTN num_handles; UINTN num_handles;
@ -123,6 +123,19 @@ static int efipci_root ( struct pci_device *pci, EFI_HANDLE *handle,
return rc; return rc;
} }
/**
* Close EFI PCI root bridge I/O protocol
*
* @v handle EFI PCI root bridge handle
*/
static void efipci_root_close ( EFI_HANDLE handle ) {
EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
/* Close protocol */
bs->CloseProtocol ( handle, &efi_pci_root_bridge_io_protocol_guid,
efi_image_handle, handle );
}
/** /**
* Calculate EFI PCI configuration space address * Calculate EFI PCI configuration space address
* *
@ -149,14 +162,13 @@ static unsigned long efipci_address ( struct pci_device *pci,
*/ */
int efipci_read ( struct pci_device *pci, unsigned long location, int efipci_read ( struct pci_device *pci, unsigned long location,
void *value ) { void *value ) {
EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *root; EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *root;
EFI_HANDLE handle; EFI_HANDLE handle;
EFI_STATUS efirc; EFI_STATUS efirc;
int rc; int rc;
/* Identify root bridge */ /* Open root bridge */
if ( ( rc = efipci_root ( pci, &handle, &root ) ) != 0 ) if ( ( rc = efipci_root_open ( pci, &handle, &root ) ) != 0 )
goto err_root; goto err_root;
/* Read from configuration space */ /* Read from configuration space */
@ -171,8 +183,7 @@ int efipci_read ( struct pci_device *pci, unsigned long location,
} }
err_read: err_read:
bs->CloseProtocol ( handle, &efi_pci_root_bridge_io_protocol_guid, efipci_root_close ( handle );
efi_image_handle, handle );
err_root: err_root:
return rc; return rc;
} }
@ -187,14 +198,13 @@ int efipci_read ( struct pci_device *pci, unsigned long location,
*/ */
int efipci_write ( struct pci_device *pci, unsigned long location, int efipci_write ( struct pci_device *pci, unsigned long location,
unsigned long value ) { unsigned long value ) {
EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *root; EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *root;
EFI_HANDLE handle; EFI_HANDLE handle;
EFI_STATUS efirc; EFI_STATUS efirc;
int rc; int rc;
/* Identify root bridge */ /* Open root bridge */
if ( ( rc = efipci_root ( pci, &handle, &root ) ) != 0 ) if ( ( rc = efipci_root_open ( pci, &handle, &root ) ) != 0 )
goto err_root; goto err_root;
/* Read from configuration space */ /* Read from configuration space */
@ -209,8 +219,7 @@ int efipci_write ( struct pci_device *pci, unsigned long location,
} }
err_write: err_write:
bs->CloseProtocol ( handle, &efi_pci_root_bridge_io_protocol_guid, efipci_root_close ( handle );
efi_image_handle, handle );
err_root: err_root:
return rc; return rc;
} }