From nobody Tue Sep 23 17:09:37 2025 X-Original-To: dev-commits-src-main@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 4cWRKs5ZvCz68tSy; Tue, 23 Sep 2025 17:09:37 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cWRKs1xpWz471c; Tue, 23 Sep 2025 17:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758647377; 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=SNFLxf8hdmpQIfUmW8jiMWP2DwCz/Baoyr1zuJ3ML98=; b=oJQFrzNttNY6GKyt46phHdiGM5G7Z4LZI8e78FZA/b6DOtAJnyFymbwm17X/4/Vcv0ZbJu 52s6SnXlDhvsQtoFDEefeMaB1xZwHFQIaT3/6StEDEO5FG6bMw071cIMmkBxYf3v8tAE38 5mCTepxml+5+8UHG081hNR9X9E16nz50suK4PZ0jLzsRafL9p+HBCaH+AC9QxIRxVDfUkg VNci1bbQnYqzQUrc/+FgrG9p7mOmSzBwRcrcPX0KTl4gs+tVmCqQC5hdkO1TBR2vagjNE4 pZt5xJcJaH+kWbcN+FmcM48ac4HhonLr8L4k+Xhe0E8zoBWxNrk1bk1U6fvGHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758647377; 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=SNFLxf8hdmpQIfUmW8jiMWP2DwCz/Baoyr1zuJ3ML98=; b=MC1EteEGH3RNtt2zMqX9OD9u/mgvoXUbPFdYs0K17Pr6IB654kAYBrfmqQoa3C3vziYv20 mxPa/x4bOV8cej0nFSA28f1ZULqqzcf/VcsMmnJt/8QA7s3Rg2GgBynmGEebtc/phHSGEf DI9z96RYQvwGQubha8h4ZlxhF5R21qgbYTcMyHVXbaCZYX7rziSeMpJxvxnnR5bpIvgE26 rUG9wzDPzrTlySAuiNSPHcWmB+6wOzrbciohxFgFZuOy4LQr6RrEb4Eq2wvvZ1QKMzLx9D X10nFf3h0gP8d7YqFQZvvr9zuvgaDSkEMO1I4GhPtE1wUnNoXITPyjVcJiS6eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758647377; a=rsa-sha256; cv=none; b=CCiAvfKBS+3RTLIhy1sHJ89eL0vHQgQwm7UzYECIKNZ3fx1PLKoVj+Ow4u1PzRHNZmlhjs 3X2iOuuyNygQBHDuO/Ch93OUfO8z3Pe89G46WewsBBQ/1E7lN8jrDAQhqHqyTcyB83FW5b NQ/ZnLxmW9AN9gXevvWYCZat+thsqg3fQrEwX9OgiMLxzpG0vPSOjsHtMOCOStKyZwijdG O84m10fS4l5lubNmVWra4L795hkWfixfa9uAQe4rXElO3kXukZh5QyzwYos9y56HDHs+EG hOjeF3z7znEBekAUFQWxj9YTaITRKwvACw7qhfJFxlDcC04kk8Rt7zjhBQW1XQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cWRKs1X8MzvgN; Tue, 23 Sep 2025 17:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58NH9b6F077360; Tue, 23 Sep 2025 17:09:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NH9b26077357; Tue, 23 Sep 2025 17:09:37 GMT (envelope-from git) Date: Tue, 23 Sep 2025 17:09:37 GMT Message-Id: <202509231709.58NH9b26077357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 0efa0fe26b9d - main - arm: Use the Self-Synchronized counter registers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0efa0fe26b9d980b2862bb58f8484f0123cff19f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0efa0fe26b9d980b2862bb58f8484f0123cff19f commit 0efa0fe26b9d980b2862bb58f8484f0123cff19f Author: Andrew Turner AuthorDate: 2025-09-22 17:08:47 +0000 Commit: Andrew Turner CommitDate: 2025-09-23 17:08:37 +0000 arm: Use the Self-Synchronized counter registers When FEAT_ECV is implemented on arm64 a Self-Synchronized view of the counter registers are available. These don't need an isb before reading the count as they are not able to be speculatively executed. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51820 --- sys/arm/arm/generic_timer.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index c4a1f44a0079..e3ba56a6f6ac 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -231,6 +231,25 @@ get_cntxct(bool physical) return (val); } +#ifdef __aarch64__ +/* + * Read the self-syncronized counter. These cannot be read speculatively so + * don't need an isb before them. + */ +static uint64_t +get_cntxctss(bool physical) +{ + uint64_t val; + + if (physical) + val = READ_SPECIALREG(CNTPCTSS_EL0_REG); + else + val = READ_SPECIALREG(CNTVCTSS_EL0_REG); + + return (val); +} +#endif + static int set_ctrl(uint32_t val, bool physical) { @@ -631,6 +650,7 @@ arm_tmr_attach(device_t dev) pcell_t clock; #endif #ifdef __aarch64__ + uint64_t id_aa64mmfr0_el1; int user_phys; #endif int error; @@ -641,6 +661,11 @@ arm_tmr_attach(device_t dev) return (ENXIO); sc->get_cntxct = &get_cntxct; +#ifdef __aarch64__ + if (get_kernel_reg(ID_AA64MMFR0_EL1, &id_aa64mmfr0_el1) && + ID_AA64MMFR0_ECV_VAL(id_aa64mmfr0_el1) >= ID_AA64MMFR0_ECV_IMPL) + sc->get_cntxct = &get_cntxctss; +#endif #ifdef FDT /* Get the base clock frequency */ node = ofw_bus_get_node(dev);