From owner-svn-src-all@FreeBSD.ORG Sun Feb 16 14:35:20 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1A799751; Sun, 16 Feb 2014 14:35:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 066EA1297; Sun, 16 Feb 2014 14:35:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1GEZJIm069149; Sun, 16 Feb 2014 14:35:19 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1GEZJuA069148; Sun, 16 Feb 2014 14:35:19 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201402161435.s1GEZJuA069148@svn.freebsd.org> From: Christian Brueffer Date: Sun, 16 Feb 2014 14:35:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261980 - head/sys/i386/xbox X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 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, 16 Feb 2014 14:35:20 -0000 Author: brueffer Date: Sun Feb 16 14:35:19 2014 New Revision: 261980 URL: http://svnweb.freebsd.org/changeset/base/261980 Log: Remove an nve(4)-specific workaround from the xbox port. nfe(4) doesn't need it. Reviewed by: ed Modified: head/sys/i386/xbox/xbox.c Modified: head/sys/i386/xbox/xbox.c ============================================================================== --- head/sys/i386/xbox/xbox.c Sun Feb 16 13:42:49 2014 (r261979) +++ head/sys/i386/xbox/xbox.c Sun Feb 16 14:35:19 2014 (r261980) @@ -59,27 +59,6 @@ xbox_init(void) /* register our poweroff function */ EVENTHANDLER_REGISTER (shutdown_final, xbox_poweroff, NULL, SHUTDOWN_PRI_LAST); - - /* - * Some XBOX loaders, such as Cromwell, have a flaw which cause the - * nve(4) driver to fail attaching to the NIC. - * - * This is because they leave the NIC running; this will cause the - * Nvidia driver to fail as the NIC does not return any sensible - * values and thus fails attaching (using an error 0x5, this means - * it cannot find a valid PHY) - * - * We bluntly tell the NIC to stop whatever it's doing; this makes - * nve(4) attach correctly. As the NIC always resides at - * 0xfef00000-0xfef003ff on an XBOX, we simply hardcode this address. - */ - ptr = pmap_mapdev (0xfef00000, 0x400); - *(uint32_t*)(ptr + 0x188) = 0; /* clear adapter control field */ - pmap_unmapdev ((vm_offset_t)ptr, 0x400); } -/* - * This must be called before the drivers, as the if_nve(4) driver will fail - * if we do not do this in advance. - */ SYSINIT(xbox, SI_SUB_DRIVERS, SI_ORDER_FIRST, xbox_init, NULL);