From owner-svn-src-all@freebsd.org Sun Sep 3 09:41:41 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B18F0E028BE; Sun, 3 Sep 2017 09:41:41 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 8173065299; Sun, 3 Sep 2017 09:41:41 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v839fekK010841; Sun, 3 Sep 2017 09:41:40 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v839feew010840; Sun, 3 Sep 2017 09:41:40 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201709030941.v839feew010840@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sun, 3 Sep 2017 09:41:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323147 - head/sys/arm/arm X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm/arm X-SVN-Commit-Revision: 323147 X-SVN-Commit-Repository: base 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.23 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, 03 Sep 2017 09:41:41 -0000 Author: andrew Date: Sun Sep 3 09:41:40 2017 New Revision: 323147 URL: https://svnweb.freebsd.org/changeset/base/323147 Log: Disable the ARM generic timers before interrupts are enabled. Some Raspberry Pi firmware images leave them enabled causing an interrupt storm. Sponsored by: ABT Systems Ltd Modified: head/sys/arm/arm/generic_timer.c Modified: head/sys/arm/arm/generic_timer.c ============================================================================== --- head/sys/arm/arm/generic_timer.c Sun Sep 3 09:18:39 2017 (r323146) +++ head/sys/arm/arm/generic_timer.c Sun Sep 3 09:41:40 2017 (r323147) @@ -249,18 +249,24 @@ arm_tmr_start(struct eventtimer *et, sbintime_t first, } +static void +arm_tmr_disable(bool physical) +{ + int ctrl; + + ctrl = get_ctrl(physical); + ctrl &= ~GT_CTRL_ENABLE; + set_ctrl(ctrl, physical); +} + static int arm_tmr_stop(struct eventtimer *et) { struct arm_tmr_softc *sc; - int ctrl; sc = (struct arm_tmr_softc *)et->et_priv; + arm_tmr_disable(sc->physical); - ctrl = get_ctrl(sc->physical); - ctrl &= ~GT_CTRL_ENABLE; - set_ctrl(ctrl, sc->physical); - return (0); } @@ -411,6 +417,13 @@ arm_tmr_attach(device_t dev) return (ENXIO); } } + + /* Disable the virtual timer until we are ready */ + if (sc->res[2] != NULL) + arm_tmr_disable(false); + /* And the physical */ + if (sc->physical) + arm_tmr_disable(true); arm_tmr_timecount.tc_frequency = sc->clkfreq; tc_init(&arm_tmr_timecount);