[autoboot] Match against parent devices when matching by bus type and location

When using iPXE as an option ROM for a PCI USB controller (e.g. via
qemu's "-device nec-usb-xhci,romfile=..." syntax), the ROM prefix will
set the PCI bus:dev.fn address of the USB controller as the PCI
autoboot device.  This will cause iPXE to fail to boot from any
detected USB network devices, since they will not match the autoboot
bus type (or location).

Fix by allowing the autoboot bus type and location to match against
the network device or any of its parent devices.  This allows the
match to succeed for USB network devices attached to the selected PCI
USB controller.

Reported-by: Dan Ellis <Dan.Ellis@displaylink.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index 72b8350cffffc45a22d5bb0cc505c90acc33a058..ccafeae7c744a4969664acc6a8d38b66e13d6789 100644 (file)
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -439,9 +439,14 @@ int netboot ( struct net_device *netdev ) {
  * @ret is_autoboot    Network device matches the autoboot device
  */
 static int is_autoboot_busloc ( struct net_device *netdev ) {
+       struct device *dev;
 
-       return ( ( netdev->dev->desc.bus_type == autoboot_desc.bus_type ) &&
-                ( netdev->dev->desc.location == autoboot_desc.location ) );
+       for ( dev = netdev->dev ; dev ; dev = dev->parent ) {
+               if ( ( dev->desc.bus_type == autoboot_desc.bus_type ) &&
+                    ( dev->desc.location == autoboot_desc.location ) )
+                       return 1;
+       }
+       return 0;
 }
 
 /**