From owner-svn-src-head@FreeBSD.ORG  Mon Dec 15 21:54:23 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B866A106564A;
	Mon, 15 Dec 2008 21:54:23 +0000 (UTC)
	(envelope-from wilko@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A6E5D8FC18;
	Mon, 15 Dec 2008 21:54:23 +0000 (UTC)
	(envelope-from wilko@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBFLsNuJ017883;
	Mon, 15 Dec 2008 21:54:23 GMT (envelope-from wilko@svn.freebsd.org)
Received: (from wilko@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBFLsNJ2017882;
	Mon, 15 Dec 2008 21:54:23 GMT (envelope-from wilko@svn.freebsd.org)
Message-Id: <200812152154.mBFLsNJ2017882@svn.freebsd.org>
From: Wilko Bulte <wilko@FreeBSD.org>
Date: Mon, 15 Dec 2008 21:54:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186142 - head/sys/pci
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Dec 2008 21:54:23 -0000

Author: wilko
Date: Mon Dec 15 21:54:23 2008
New Revision: 186142
URL: http://svn.freebsd.org/changeset/base/186142

Log:
  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
  
  MFC after:	2 weeks

Modified:
  head/sys/pci/if_rl.c

Modified: head/sys/pci/if_rl.c
==============================================================================
--- head/sys/pci/if_rl.c	Mon Dec 15 21:50:54 2008	(r186141)
+++ head/sys/pci/if_rl.c	Mon Dec 15 21:54:23 2008	(r186142)
@@ -901,9 +901,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);
 	}
 
 	if ((error = rl_dma_alloc(sc)) != 0)