From nobody Mon May 15 15:45:55 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 4QKkH941GYz4Blp3; Mon, 15 May 2023 15:45:57 +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 4QKkH81PTLz3JBB; Mon, 15 May 2023 15:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684165556; 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=O0agQZQ4wNDfb+itkftCN2QHDc82SN0YvSJOHpfloXw=; b=GTSfM+wnBRloQ9oLFl6mIDWlGW0LMBEojQfT/3GVgPXd/7M7Az9cbIBfPiUJytVjdpOgcq Im2U8WmULRrAxk5h3nSY7m+8SAGB1yvJE1zxf9RnkmauH4UcbDUdBpHXgASva+pNGMhTx8 oD4FdsoTZzck/mkGt2QJZDUoxxvrA+nHiNhS0cBqQ4t/e0T52N8JL2Jpn5PZ1v476w/Xsi YLNVxe37bJcmKT5fQ+pqam0s/5yYZIe6YdMf/a3q4seBiHGLEq4/a8Tz5EZhVUcfZaLFUF htAjGB5V1zMDLIeOg/v8j2QvKtC5lGzycUmId/iHWqYF+F/t/UbRvrXMNuvYXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684165556; 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=O0agQZQ4wNDfb+itkftCN2QHDc82SN0YvSJOHpfloXw=; b=bCgI91s5vYcctpY/Ob4982yup4BmW3/UfDKvMBRKmljsDM8jtdHYixMwvnv5kVasHWBp7F GPWbNm7VuHWWBouZ29Lljnv4c0qb+DoPwEDlfQq8koHJGV7JjyUnk/i8dX3jOlrKIeEWZy +oI1i1vUSsRr39UdSJwhIHbEhKkCfvFjM+s5YN9Cenl7DHkoniXmB/D4Zd0hXYBez2dA+i Uhepqcoqbjb02HuXcpZ8yx5eO1LTqPfb0JtLs7nwceUGzI6gj2H/7TJZZ+G4K0A2z1GqZC Sb/o0yYT125X+qti6uTbkiv9g35tr6gwsv9lUFcpg3uGFiRe+Pe+vw+y+VC55Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684165556; a=rsa-sha256; cv=none; b=pO8g2ACGIMxYcfYkUZY2OGF0OTI4UVUtuwK1A1nIyZ2YkVZniBr5TCG64+LALQk+eSaq6L Qj03O/46l0RM0zaOnnSspx0IzXY5+HmKNl5cCxbSqENon6T/pZEn8c2TytOF8hHMkKmCmo Tjf/bcCKMry7dpgw+4RxJ5CxrBhaz1zfdQL/UJRVSht8SeX8fVhV5PpyCLK34l5jnRm5W2 M7OtBmPL112S7xGiKZRb49/3aCoNYox967d9K7gnVc2KF3RzJOt1OZvhsomcFas+1Celxx 5hiqsY5MrFeHQhC38bVtWeebviPM3T37x8smObvHXuk+Z1GU1J7AoanB24oOug== 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 4QKkH80W1Vzm53; Mon, 15 May 2023 15:45:56 +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 34FFjteA073392; Mon, 15 May 2023 15:45:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34FFjtWI073391; Mon, 15 May 2023 15:45:55 GMT (envelope-from git) Date: Mon, 15 May 2023 15:45:55 GMT Message-Id: <202305151545.34FFjtWI073391@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: 21ef40aea1d3 - stable/13 - Always enable the virtual timer for userspace 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: 21ef40aea1d312910163a25a890c679814936c11 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=21ef40aea1d312910163a25a890c679814936c11 commit 21ef40aea1d312910163a25a890c679814936c11 Author: Andrew Turner AuthorDate: 2023-03-10 12:43:59 +0000 Commit: Andrew Turner CommitDate: 2023-05-15 07:59:43 +0000 Always enable the virtual timer for userspace We always have it, some languages assume it's present, e.g. go before 1.20. Enable it by default on arm and arm64. PR: 269070 Reviewed by: kevans Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D39059 (cherry picked from commit 93d574ea957decec1c95dea9bfa8bc72457cc60d) --- sys/arm/arm/generic_timer.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index cba354909100..e0ec6281e402 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -266,13 +266,12 @@ setup_user_access(void *arg __unused) cntkctl = get_el1(cntkctl); cntkctl &= ~(GT_CNTKCTL_PL0PTEN | GT_CNTKCTL_PL0VTEN | - GT_CNTKCTL_EVNTEN); + GT_CNTKCTL_EVNTEN | GT_CNTKCTL_PL0PCTEN); + /* Always enable the virtual timer */ + cntkctl |= GT_CNTKCTL_PL0VCTEN; + /* Enable the physical timer if supported */ if (arm_tmr_sc->physical) { cntkctl |= GT_CNTKCTL_PL0PCTEN; - cntkctl &= ~GT_CNTKCTL_PL0VCTEN; - } else { - cntkctl |= GT_CNTKCTL_PL0VCTEN; - cntkctl &= ~GT_CNTKCTL_PL0PCTEN; } set_el1(cntkctl, cntkctl); isb();