From owner-svn-src-head@FreeBSD.ORG Fri Jul 15 02:29:11 2011 Return-Path: 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 5D896106566B; Fri, 15 Jul 2011 02:29:11 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 34DC68FC14; Fri, 15 Jul 2011 02:29:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6F2TB96056293; Fri, 15 Jul 2011 02:29:11 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6F2TBV9056290; Fri, 15 Jul 2011 02:29:11 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201107150229.p6F2TBV9056290@svn.freebsd.org> From: Marcel Moolenaar Date: Fri, 15 Jul 2011 02:29:11 +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: r224051 - head/sys/arm/mv 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2011 02:29:11 -0000 Author: marcel Date: Fri Jul 15 02:29:10 2011 New Revision: 224051 URL: http://svn.freebsd.org/changeset/base/224051 Log: Do not call platform_gpio_init() early. It doesn't work because we do not have enough information to reliably setup GPIO pins. Do it when we attach the gpio driver. This prevents hangs and the need to fake up a softc. Modified: head/sys/arm/mv/gpio.c head/sys/arm/mv/mv_machdep.c Modified: head/sys/arm/mv/gpio.c ============================================================================== --- head/sys/arm/mv/gpio.c Fri Jul 15 02:16:13 2011 (r224050) +++ head/sys/arm/mv/gpio.c Fri Jul 15 02:29:10 2011 (r224051) @@ -197,10 +197,7 @@ mv_gpio_attach(device_t dev) } } - /* - * GPIO lines setup is already done at this stage (see mv_machdep.c). - */ - return (0); + return (platform_gpio_init()); } static int @@ -565,20 +562,6 @@ mv_handle_gpios_prop(phandle_t ctrl, pce if (fdt_regsize(ctrl, &gpio_ctrl, &size)) return (ENXIO); - /* - * Since to set up GPIO we use the same functions as GPIO driver, and - * mv_gpio_softc is NULL at this early stage, we need to create a fake - * softc and set mv_gpio_softc pointer to that newly created object. - * After successful GPIO setup, the [shared] pointer will be set back - * to NULL. - */ - mv_gpio_softc = ≻ - - sc.bst = fdtbus_bs_tag; - gpio_ctrl += fdt_immr_va; - - if (bus_space_map(sc.bst, gpio_ctrl, size, 0, &sc.bsh) != 0) - return (ENXIO); if (OF_getprop(ctrl, "pin-count", &pincnt, sizeof(pcell_t)) < 0) return (ENXIO); @@ -612,8 +595,6 @@ mv_handle_gpios_prop(phandle_t ctrl, pce gpios += gpio_cells + inc; } - /* Reset pointer. */ - mv_gpio_softc = NULL; return (0); } Modified: head/sys/arm/mv/mv_machdep.c ============================================================================== --- head/sys/arm/mv/mv_machdep.c Fri Jul 15 02:16:13 2011 (r224050) +++ head/sys/arm/mv/mv_machdep.c Fri Jul 15 02:29:10 2011 (r224051) @@ -512,13 +512,8 @@ initarm(void *mdp, void *unused __unused if (platform_mpp_init() != 0) while (1); - /* - * Initialize GPIO as early as possible. - */ - if (platform_gpio_init() != 0) - while (1); - cninit(); + physmem = memsize / PAGE_SIZE; debugf("initarm: console initialized\n");