svn commit: r187057 - stable/7/sys/pci

[Wilko Bulte]

Author: wilko
Date: Sun Jan 11 16:21:33 2009
New Revision: 187057
URL: http://svn.freebsd.org/changeset/base/187057

Log:
  MFC: r186142
  
  By default assume a 8139 chip if the EEPROM contents prove inconclusive.
  The same LOM hardware with goofed-up EEPROM programming also needed reading
  the Ethernet address from the chips registers as the EEPROM did not have a
  sensible address programmed.
  
  Patch developed by: pyun@
  Funky hardware on loan:  www.id-it.nl

Modified:
  stable/7/sys/pci/if_rl.c

Modified: stable/7/sys/pci/if_rl.c
==============================================================================
--- stable/7/sys/pci/if_rl.c	Sun Jan 11 13:56:55 2009	(r187056)
+++ stable/7/sys/pci/if_rl.c	Sun Jan 11 16:21:33 2009	(r187057)
@@ -857,9 +857,15 @@ rl_attach(device_t dev)
 	}
 
 	if (sc->rl_type == 0) {
-		device_printf(dev, "unknown device ID: %x\n", rl_did);
-		error = ENXIO;
-		goto fail;
+		device_printf(dev, "unknown device ID: %x assuming 8139\n",
+		    rl_did);
+		sc->rl_type = RL_8139;
+		/*
+		 * Read RL_IDR register to get ethernet address as accessing
+		 * EEPROM may not extract correct address.
+		 */
+		for (i = 0; i < ETHER_ADDR_LEN; i++)
+			eaddr[i] = CSR_READ_1(sc, RL_IDR0 + i);
 	}
 
 	/*