From nobody Mon Sep 22 15:20:17 2025 X-Original-To: dev-commits-src-all@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 4cVmyB24PYz682ZD; Mon, 22 Sep 2025 15:20:18 +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 4cVmy96qcYz3WZT; Mon, 22 Sep 2025 15:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758554418; 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=AjRDo0u5ptpr64XLYQJUQRHhvLTuKn9USzvxMoEFk6Q=; b=YwgZsNTuPMzsK6dAloTRZnn85nVKOkzCf8Sxk1rC2zmQnRwG2GOCzSVCyP3FZijsroFKlC XuMU0nwYWRammDglSu25YmVTgCAW8M1DN3WMT0hcRWO4iq6qtuc+/Gt0KChlNAhp8FhIBn FqZPLeXJcWbIJ9owRGu4ZBRLVw3OCGzE2vWug2t6BBE+jdBlJNa4Jr7FXozDuDbLonwTCF +OOXXToi/X+MYG+iV8i8G2b3RJD7YGRkJ04kbA4OrhDgixXMzoFzCmj+f8eLTSwuJvHPNG d3tMukfs45sjTpzgtf5Vv6NMze9nc4jwX/iAMq23yQ2MZyI87srXjMjkoXL31w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758554418; 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=AjRDo0u5ptpr64XLYQJUQRHhvLTuKn9USzvxMoEFk6Q=; b=rSWF+UG/qWbDTaFd/dNYEVu2gCXVvkFht0dYAeybdsdNKXbDG2g6s00UeYvC+p3fycgS/y hTsYFEuNIn4+ygmL22v6eZFH43el9b8EmNRKiLr9Q7mYa/opMwBxDJcQaxA6Zqmz3JGJCh xMoLuzQqYYMo5vgvcmhdXB3ynBcWAQlUH1k9eTB6F6Xjk6v3lTGzGPr22Uwj4dZ9CoqM62 TBg/9FWQgx14ts8G4F7CeAcR5jI7KCMBfJ6XOVAH3/RQV5SyK3KS2tAVmRqngyB5InXWyH DBeuQc+r/0tkRRfH/0xr1Tfc3LWy3Cw/83o2e6FyYFYeHG68ARvJxs5YaHRc3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758554418; a=rsa-sha256; cv=none; b=v2a98wa17SUSrKWtrNkoI4txFejqVgfKII1dG9NIAMSdarx9R44z5cJlzYH1vGUbq64JzY 4jEnTyXcZFFwfF1MMMEBi6mE3rejLjWvMFNv9sMCDZRkQ+MFCabvY7XuKRFbtiv47m6AXX Po4N3vbQsLYqAbvpuABxDDM3KI/b+p4/3+BOt4QcxMsXLeVIkRkIAb2jV8Ui+M5RfuPL2C xDvZnG5UfDfZaoWDghV8WPTTzfSkNdnGUXO5NQ8XrYUPvZzL0k5ZPPSb7N+eYr2dq+yZjR uAJK9druk4vIlXecvAqeV3gfoL3H14fpvPlwWD18OBX05eKjBoc2XWY0CZC5/A== 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 4cVmy96QgWz1537; Mon, 22 Sep 2025 15:20:17 +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 58MFKHHr068772; Mon, 22 Sep 2025 15:20:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58MFKHdS068768; Mon, 22 Sep 2025 15:20:17 GMT (envelope-from git) Date: Mon, 22 Sep 2025 15:20:17 GMT Message-Id: <202509221520.58MFKHdS068768@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: e52a47446e50 - stable/15 - arm64: Fix the FEAT_WFxT check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/15 X-Git-Reftype: branch X-Git-Commit: e52a47446e5068513ffb93929a896cab76b5bb26 Auto-Submitted: auto-generated The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e52a47446e5068513ffb93929a896cab76b5bb26 commit e52a47446e5068513ffb93929a896cab76b5bb26 Author: Andrew Turner AuthorDate: 2025-09-15 12:08:04 +0000 Commit: Andrew Turner CommitDate: 2025-09-20 01:00:52 +0000 arm64: Fix the FEAT_WFxT check The check was always true so would incorrectly enable the feature when it wasn't supported. Due to another bug this was harmless. Sponsored by: Arm Ltd (cherry picked from commit 226375a1f6e3a71ca250c717e8d6d2c2e4b0b2e7) --- sys/arm/arm/generic_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index 97976408c943..dacef8de2257 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -889,7 +889,7 @@ wfxt_check(const struct cpu_feat *feat __unused, u_int midr __unused) if (!get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2)) return (FEAT_ALWAYS_DISABLE); - if (ID_AA64ISAR2_WFxT_VAL(id_aa64isar2) >= ID_AA64ISAR2_WFxT_NONE) + if (ID_AA64ISAR2_WFxT_VAL(id_aa64isar2) >= ID_AA64ISAR2_WFxT_IMPL) return (FEAT_DEFAULT_ENABLE); return (FEAT_ALWAYS_DISABLE);