From owner-p4-projects@FreeBSD.ORG  Wed Feb  6 17:58:46 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 8FE77C66; Wed,  6 Feb 2013 17:58:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 53E3DC64
 for <perforce@freebsd.org>; Wed,  6 Feb 2013 17:58:46 +0000 (UTC)
 (envelope-from bz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 39C93E17
 for <perforce@freebsd.org>; Wed,  6 Feb 2013 17:58:46 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r16HwkMO073717
 for <perforce@freebsd.org>; Wed, 6 Feb 2013 17:58:46 GMT
 (envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r16HwkOI073714
 for perforce@freebsd.org; Wed, 6 Feb 2013 17:58:46 GMT
 (envelope-from bz@freebsd.org)
Date: Wed, 6 Feb 2013 17:58:46 GMT
Message-Id: <201302061758.r16HwkOI073714@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bz@freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: PERFORCE change 221804 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Feb 2013 17:58:47 -0000

http://p4web.freebsd.org/@@221804?ac=10

Change 221804 by bz@bz_zenith on 2013/02/06 17:58:31

	Add the hard coded blackist for the one-for-all factory
	Ethernet address in flash.  Later we might want to pass a
	blacklist by other means I guess.
	
	X-Note: untested as my unflashed board will not currently boot.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#9 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#9 (text+ko) ====

@@ -45,6 +45,7 @@
  * - blacklist the one special factory programmed ethernet address (for now
  *   hardcoded, later from loader?)
  * - resolve all XXX, left as reminders to shake out details later
+ * - Jumbo frame support
  */
 
 #include <sys/cdefs.h>
@@ -687,6 +688,18 @@
 	    sc->atse_eth_addr[2] != 0x00)
 		return (0);
 
+	/* Handle factory default ethernet addresss: 00:07:ed:ff:ed:15 */
+	if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x07 &&
+	    sc->atse_eth_addr[2] == 0xed && sc->atse_eth_addr[3] == 0xff &&
+	    sc->atse_eth_addr[4] == 0xed && sc->atse_eth_addr[5] == 0x15) {
+
+		device_printf(sc->atse_dev, "Factory programmed Ethernet "
+		    "hardware address blacklisted.  Falling back to random "
+		    "address to avoid collisions.\n");
+		device_printf(sc->atse_dev, "Please re-program your flash.\n");
+		goto get_random;
+	}
+
 	if ((atse_ethernet_option_bits_flag &
 	    ATSE_ETHERNET_OPTION_BITS_READ) == 0)
 		goto get_random;