diff options
author | Michael Brown | 2014-09-30 19:06:13 +0200 |
---|---|---|
committer | Michael Brown | 2014-10-16 15:12:42 +0200 |
commit | b9a5ff2b03b7354c9fafdca7e0e6c9b3da151f1c (patch) | |
tree | d8334055a33b009743b4b28334feb996bc97ade1 /src/drivers/net/efi/snpnet.c | |
parent | [efi] Free transmit ring entry before calling netdev_tx_complete() (diff) | |
download | ipxe-b9a5ff2b03b7354c9fafdca7e0e6c9b3da151f1c.tar.gz ipxe-b9a5ff2b03b7354c9fafdca7e0e6c9b3da151f1c.tar.xz ipxe-b9a5ff2b03b7354c9fafdca7e0e6c9b3da151f1c.zip |
[efi] Generalise snpnet_dev_info() to efi_device_info()
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/net/efi/snpnet.c')
-rw-r--r-- | src/drivers/net/efi/snpnet.c | 61 |
1 files changed, 1 insertions, 60 deletions
diff --git a/src/drivers/net/efi/snpnet.c b/src/drivers/net/efi/snpnet.c index 2c3b552e..96642c4c 100644 --- a/src/drivers/net/efi/snpnet.c +++ b/src/drivers/net/efi/snpnet.c @@ -30,7 +30,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/efi/efi.h> #include <ipxe/efi/Protocol/SimpleNetwork.h> #include <ipxe/efi/efi_driver.h> -#include <ipxe/efi/efi_pci.h> #include <ipxe/efi/efi_utils.h> #include "snpnet.h" @@ -410,64 +409,6 @@ static struct net_device_operations snpnet_operations = { }; /** - * Get underlying PCI device information - * - * @v efidev EFI device - * @v dev Generic device to fill in - * @ret rc Return status code - */ -static int snpnet_pci_info ( struct efi_device *efidev, struct device *dev ) { - EFI_HANDLE device = efidev->device; - EFI_HANDLE pci_device; - struct pci_device pci; - int rc; - - /* Find parent PCI device */ - if ( ( rc = efi_locate_device ( device, &efi_pci_io_protocol_guid, - &pci_device ) ) != 0 ) { - DBGC ( device, "SNP %p %s is not a PCI device: %s\n", - device, efi_handle_name ( device ), strerror ( rc ) ); - return rc; - } - - /* Get PCI device information */ - if ( ( rc = efipci_info ( pci_device, &pci ) ) != 0 ) { - DBGC ( device, "SNP %p %s could not get PCI information: %s\n", - device, efi_handle_name ( device ), strerror ( rc ) ); - return rc; - } - - /* Populate SNP device information */ - memcpy ( &dev->desc, &pci.dev.desc, sizeof ( dev->desc ) ); - snprintf ( dev->name, sizeof ( dev->name ), "SNP-%s", pci.dev.name ); - - return 0; -} - -/** - * Get underlying device information - * - * @v efidev EFI device - * @v dev Generic device to fill in - */ -static void snpnet_dev_info ( struct efi_device *efidev, struct device *dev ) { - EFI_HANDLE device = efidev->device; - int rc; - - /* Try getting underlying PCI device information */ - if ( ( rc = snpnet_pci_info ( efidev, dev ) ) == 0 ) - return; - - /* If we cannot get any underlying device information, fall - * back to providing information about the EFI handle. - */ - DBGC ( device, "SNP %p %s could not get underlying device " - "information\n", device, efi_handle_name ( device ) ); - dev->desc.bus_type = BUS_TYPE_EFI; - snprintf ( dev->name, sizeof ( dev->name ), "SNP-%p", device ); -} - -/** * Attach driver to device * * @v efidev EFI device @@ -511,7 +452,7 @@ int snpnet_start ( struct efi_device *efidev ) { efidev_set_drvdata ( efidev, netdev ); /* Populate underlying device information */ - snpnet_dev_info ( efidev, &snp->dev ); + efi_device_info ( device, "SNP", &snp->dev ); snp->dev.driver_name = "SNP"; snp->dev.parent = &efidev->dev; list_add ( &snp->dev.siblings, &efidev->dev.children ); |