From nobody Mon May 15 15:45:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QKkH51YJ1z4BlrK; Mon, 15 May 2023 15:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QKkH46H99z3JDC; Mon, 15 May 2023 15:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684165552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dpiqbfkqg1GQ7sIZSgeyUOnfdy3GBz2QRyE9HKk9IFM=; b=eRreoseD+4v23glPjRnBT86rNv/14BZncImr/v7WW1i1gi6cexAFFfT2GfAKSI8kdM4nE0 f8Lc7R/1m6WV/KXrmBRBxk7Tz6LqT7UR88OPBUP4uYi6DB3jp96GQF2LLEwciGVw/6BMex L4AvZ1CspbJQQxYZmINlUOGdrglO3BfxrPngU97EYkUrYidJgBRJxT7fkVYwfevNUIS6wZ ZXiM2JIRL7VQPZSq08KPV8c8nAL26Niy/+1iKY/lVigXcj7rJETGjanHH0K2Wwg84Sk4KV N3rIrthnxGrcagyGDWFcxiYcUK+V6u4yHSrWnzky5Qnr3iwE/wDz01nyhQZubg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684165552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dpiqbfkqg1GQ7sIZSgeyUOnfdy3GBz2QRyE9HKk9IFM=; b=jkldF3chozQcSnLaCm5HPEB6apB0oEoBh9ynSj8YjT7/+QEVZsRMtplD9Aa9F+trAtoG+9 hGixuhfqrZ6dMA6PtyBKRm2oNclGz8jUN7DURBjNML8GBGJlG9zbOyR9uapWuNycK5sRHL 15BAnEJhowZYVKx2QHokss+qqDRG2Ns4mt3WTY9xq/o3YHwFQPbZ402QK5WFN3Np1b5jLc oWC61XEjusG6Tdw/r6cFIrQo6r/gdA8Eem/GpOCCVBOEOQXJAYHjfOfK30bEYMKCrBcTbf Ykhn0kwkkX+cjIDrSyF422nsCs2cQnWFSJ6hz9GxfwM7nemw0gLv+LQrIGo2YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684165552; a=rsa-sha256; cv=none; b=SBGoax9iZmy9ReWysdhgu6iraVY3Kb8lsqdH4XekKku1nXaXHAgZCxlPP4w2YXAZCBU8tz T3Hye51mOq4cxUbYr7YsXTjeZqKOY24E15aZcoNPww2xuW0dwaJjnBgRUDclpPnZ+LO1BZ Uczg/B1qwlUfjTEOkH4N0xis4ZxuDRs4UBOr5nmi5qZM+wsQc8/m1RCtqXdIb1Yv1eonri dTbdKsCVDuA737XyhFJSebzyaqud9C3wyCe/mmJfJu8ki7ibdqHkJKxNNJMlqdDi5rRCP8 Btwdhex/esipmchGmk6zB4rX+pHQlO0OTxaeGPhGx8jgE3zjx7nM6wVAGbfUAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QKkH45GVdzmPg; Mon, 15 May 2023 15:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34FFjqrT073325; Mon, 15 May 2023 15:45:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34FFjqG1073324; Mon, 15 May 2023 15:45:52 GMT (envelope-from git) Date: Mon, 15 May 2023 15:45:52 GMT Message-Id: <202305151545.34FFjqG1073324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 6136013a16f5 - stable/13 - Disable the arm physical timer when an irq exists List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6136013a16f55ec21ae32e068bb425eb97fca250 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6136013a16f55ec21ae32e068bb425eb97fca250 commit 6136013a16f55ec21ae32e068bb425eb97fca250 Author: Andrew Turner AuthorDate: 2023-01-28 17:36:24 +0000 Commit: Andrew Turner CommitDate: 2023-05-15 07:59:43 +0000 Disable the arm physical timer when an irq exists Some firmware leaves the timers enabled. Ensure they are disabled if there are any physical timer interrupt resources to ensure we don't receive any unexpected interrupts from them. (cherry picked from commit c57694ce94712ce1fe0341ae51d70446a7dbbfa2) --- sys/arm/arm/generic_timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index 3f5f65439ddc..5b4972017c2d 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -475,7 +475,8 @@ arm_tmr_attach(device_t dev) if (sc->res[GT_VIRT] != NULL) arm_tmr_disable(false); /* And the physical */ - if (sc->physical) + if (sc->res[GT_PHYS_SECURE] != NULL || + sc->res[GT_PHYS_NONSECURE] != NULL) arm_tmr_disable(true); arm_tmr_timecount.tc_frequency = sc->clkfreq;