[intel] Use autoloaded MAC address instead of EEPROM MAC address

The i350 (and possibly other Intel NICs) have a non-trivial
correspondence between the PCI function number and the external
physical port number.  For example, the i350 has a "LAN Function Sel"
bit within the EEPROM which can invert the mapping so that function 0
becomes port 3, function 1 becomes port 2, etc.

Unfortunately the MAC addresses within the EEPROM are indexed by
physical port number rather than PCI function number.  The end result
is that when anything other than the default mapping is used, iPXE
will use the wrong address as the base MAC address.

Fix by using the autoloaded MAC address if it is valid, and falling
back to reading the MAC address directly from the EEPROM only if no
autoloaded address is available.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/drivers/net/intel.c b/src/drivers/net/intel.c
index 8cc0e7f9c8237814a249903cd8da9cdd5bf9a868..a89f947b2d50a6af592e2b9107fee24a98d1ea91 100644 (file)
--- a/src/drivers/net/intel.c
+++ b/src/drivers/net/intel.c
@@ -232,16 +232,16 @@ static int intel_fetch_mac ( struct intel_nic *intel, uint8_t *hw_addr ) {
        DBGC ( intel, "INTEL %p has autoloaded MAC address %s\n",
               intel, eth_ntoa ( mac.raw ) );
 
-       /* Try to read address from EEPROM */
-       if ( ( rc = intel_fetch_mac_eeprom ( intel, hw_addr ) ) == 0 )
-               return 0;
-
        /* Use current address if valid */
        if ( is_valid_ether_addr ( mac.raw ) ) {
                memcpy ( hw_addr, mac.raw, ETH_ALEN );
                return 0;
        }
 
+       /* Otherwise, try to read address from EEPROM */
+       if ( ( rc = intel_fetch_mac_eeprom ( intel, hw_addr ) ) == 0 )
+               return 0;
+
        DBGC ( intel, "INTEL %p has no MAC address to use\n", intel );
        return -ENOENT;
 }