From owner-svn-src-all@FreeBSD.ORG Sun Oct 18 17:11:16 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B79C1065672; Sun, 18 Oct 2009 17:11:16 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7C06D8FC1A; Sun, 18 Oct 2009 17:11:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9IHBGHk074473; Sun, 18 Oct 2009 17:11:16 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9IHBG6W074471; Sun, 18 Oct 2009 17:11:16 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200910181711.n9IHBG6W074471@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 18 Oct 2009 17:11:16 +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: r198211 - head/sys/dev/gem X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Oct 2009 17:11:16 -0000 Author: nwhitehorn Date: Sun Oct 18 17:11:16 2009 New Revision: 198211 URL: http://svn.freebsd.org/changeset/base/198211 Log: Work around a quirk with the G5 Xserve, which has a fake GMAC controller with an all-zero MAC address. In this case, don't attach. Discussed with: marius Modified: head/sys/dev/gem/if_gem_pci.c Modified: head/sys/dev/gem/if_gem_pci.c ============================================================================== --- head/sys/dev/gem/if_gem_pci.c Sun Oct 18 17:10:39 2009 (r198210) +++ head/sys/dev/gem/if_gem_pci.c Sun Oct 18 17:11:16 2009 (r198211) @@ -295,6 +295,16 @@ gem_pci_attach(device_t dev) GEM_PCI_ROM_OFFSET + j + PCI_VPDRES_LARGE_SIZE + PCI_VPD_SIZE, sc->sc_enaddr, ETHER_ADDR_LEN); #endif + /* + * The Xserve G5 has a fake GMAC with an all-zero MAC address. + * Check for this, and don't attach in this case. + */ + + for (i = 0; i < ETHER_ADDR_LEN && sc->sc_enaddr[i] == 0; i++) {} + if (i == ETHER_ADDR_LEN) { + device_printf(dev, "invalid MAC address\n"); + goto fail; + } if (gem_attach(sc) != 0) { device_printf(dev, "could not be attached\n");