From owner-svn-src-projects@FreeBSD.ORG Sun Sep 21 03:00:30 2014 Return-Path: Delivered-To: svn-src-projects@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 D4AE9DAB; Sun, 21 Sep 2014 03:00:30 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BF4F9C32; Sun, 21 Sep 2014 03:00:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8L30Ufc088724; Sun, 21 Sep 2014 03:00:30 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8L30UYp088723; Sun, 21 Sep 2014 03:00:30 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201409210300.s8L30UYp088723@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 21 Sep 2014 03:00:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r271915 - projects/arm_intrng/sys/arm/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Sep 2014 03:00:30 -0000 Author: ian Date: Sun Sep 21 03:00:30 2014 New Revision: 271915 URL: http://svnweb.freebsd.org/changeset/base/271915 Log: Don't register as an interrupt controller until after resource allocation and all the other up-front things that could fail. Modified: projects/arm_intrng/sys/arm/arm/gic.c Modified: projects/arm_intrng/sys/arm/arm/gic.c ============================================================================== --- projects/arm_intrng/sys/arm/arm/gic.c Sun Sep 21 00:20:41 2014 (r271914) +++ projects/arm_intrng/sys/arm/arm/gic.c Sun Sep 21 03:00:30 2014 (r271915) @@ -210,8 +210,6 @@ arm_gic_attach(device_t dev) sc->gic_c_bst = rman_get_bustag(sc->gic_res[1]); sc->gic_c_bsh = rman_get_bushandle(sc->gic_res[1]); - arm_register_pic(dev, PIC_FEATURE_IPI); - if (bus_setup_intr(dev, sc->gic_res[2], INTR_TYPE_MISC | INTR_CONTROLLER, arm_gic_intr, NULL, sc, &sc->gic_intrhand)) { device_printf(dev, "could not setup interrupt handler\n"); @@ -219,6 +217,8 @@ arm_gic_attach(device_t dev) return (ENXIO); } + arm_register_pic(dev, PIC_FEATURE_IPI); + /* Disable interrupt forwarding to the CPU interface */ gic_d_write_4(sc, GICD_CTLR, 0x00);