From b9a5ff2b03b7354c9fafdca7e0e6c9b3da151f1c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 30 Sep 2014 18:06:13 +0100 Subject: [PATCH] [efi] Generalise snpnet_dev_info() to efi_device_info() Signed-off-by: Michael Brown --- src/drivers/net/efi/snpnet.c | 61 +----------------------------- src/include/ipxe/efi/efi_utils.h | 4 ++ src/interface/efi/efi_utils.c | 64 ++++++++++++++++++++++++++++++++ 3 files changed, 69 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 #include #include -#include #include #include "snpnet.h" @@ -409,64 +408,6 @@ static struct net_device_operations snpnet_operations = { .poll = snpnet_poll, }; -/** - * 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 * @@ -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 ); diff --git a/src/include/ipxe/efi/efi_utils.h b/src/include/ipxe/efi/efi_utils.h index 92ca0a9c..9164be19 100644 --- a/src/include/ipxe/efi/efi_utils.h +++ b/src/include/ipxe/efi/efi_utils.h @@ -11,11 +11,15 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include #include +struct device; + extern EFI_DEVICE_PATH_PROTOCOL * efi_devpath_end ( EFI_DEVICE_PATH_PROTOCOL *path ); extern int efi_locate_device ( EFI_HANDLE device, EFI_GUID *protocol, EFI_HANDLE *parent ); extern int efi_child_add ( EFI_HANDLE parent, EFI_HANDLE child ); extern void efi_child_del ( EFI_HANDLE parent, EFI_HANDLE child ); +extern void efi_device_info ( EFI_HANDLE device, const char *prefix, + struct device *dev ); #endif /* _IPXE_EFI_UTILS_H */ diff --git a/src/interface/efi/efi_utils.c b/src/interface/efi/efi_utils.c index b4f07330..936ad48e 100644 --- a/src/interface/efi/efi_utils.c +++ b/src/interface/efi/efi_utils.c @@ -19,9 +19,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); +#include #include #include #include +#include #include /** @file @@ -152,3 +154,65 @@ void efi_child_del ( EFI_HANDLE parent, EFI_HANDLE child ) { DBGC2 ( parent, " %p %s\n", child, efi_handle_name ( child ) ); } + +/** + * Get underlying PCI device information + * + * @v device EFI device handle + * @v prefix Device name prefix + * @v dev Generic device to fill in + * @ret rc Return status code + */ +static int efi_pci_info ( EFI_HANDLE device, const char *prefix, + struct device *dev ) { + 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, "EFIDEV %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, "EFIDEV %p %s could not get PCI information: " + "%s\n", device, efi_handle_name ( device ), + strerror ( rc ) ); + return rc; + } + + /* Populate device information */ + memcpy ( &dev->desc, &pci.dev.desc, sizeof ( dev->desc ) ); + snprintf ( dev->name, sizeof ( dev->name ), "%s-%s", + prefix, pci.dev.name ); + + return 0; +} + +/** + * Get underlying device information + * + * @v device EFI device handle + * @v prefix Device name prefix + * @v dev Generic device to fill in + */ +void efi_device_info ( EFI_HANDLE device, const char *prefix, + struct device *dev ) { + int rc; + + /* Try getting underlying PCI device information */ + if ( ( rc = efi_pci_info ( device, prefix, dev ) ) == 0 ) + return; + + /* If we cannot get any underlying device information, fall + * back to providing information about the EFI handle. + */ + DBGC ( device, "EFIDEV %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 ), "%s-%p", prefix, device ); +}