[realtek] Do not attempt to access EEPROM on RTL8169 chips

On some RTL8169 onboard NICs (observed with a Lenovo ThinkPad 11e),
the EEPROM is not merely not present: any attempt to read from the
non-existent EEPROM will crash and reboot the system.

The equivalent code to read from the EEPROM was removed from the Linux
r8169 driver in 2009 with a comment suggesting that it was similarly
found to be unreliable on some systems.

Fix by accessing the EEPROM only on RTL8139 NICs, and assuming that
the MAC address will always be correctly preset on RTL8169 NICs.

Reported-by: Evan Prohaska <eprohaska@edkey.org>
Tested-by: Evan Prohaska <eprohaska@edkey.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/drivers/net/realtek.c b/src/drivers/net/realtek.c
index dafac5c26ecd056958ed943b99681a71e90cec27..022b59324c1421e97a9d0fec5ba10d999ba21d01 100644 (file)
--- a/src/drivers/net/realtek.c
+++ b/src/drivers/net/realtek.c
@@ -198,7 +198,6 @@ static int realtek_init_eeprom ( struct net_device *netdev ) {
                DBGC ( rtl, "REALTEK %p EEPROM is a 93C46\n", rtl );
                init_at93c46 ( &rtl->eeprom, 16 );
        }
-       rtl->eeprom.bus = &rtl->spibit.bus;
 
        /* Check for EEPROM presence.  Some onboard NICs will have no
         * EEPROM connected, with the BIOS being responsible for
@@ -1089,6 +1088,7 @@ static void realtek_detect ( struct realtek_nic *rtl ) {
                               rtl );
                        rtl->legacy = 1;
                }
+               rtl->eeprom.bus = &rtl->spibit.bus;
        }
 }
 
@@ -1136,7 +1136,8 @@ static int realtek_probe ( struct pci_device *pci ) {
        realtek_detect ( rtl );
 
        /* Initialise EEPROM */
-       if ( ( rc = realtek_init_eeprom ( netdev ) ) == 0 ) {
+       if ( rtl->eeprom.bus &&
+            ( ( rc = realtek_init_eeprom ( netdev ) ) == 0 ) ) {
 
                /* Read MAC address from EEPROM */
                if ( ( rc = nvs_read ( &rtl->eeprom.nvs, RTL_EEPROM_MAC,