From nobody Fri Sep 19 10:30:09 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 4cSpfp1LPSz67ncf; Fri, 19 Sep 2025 10:30:10 +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 4cSpfn5XQmz3LbY; Fri, 19 Sep 2025 10:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758277809; 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=TeugHrrr6fkjowocJcTxUobIhWVcYf8SjcrPxSSQN6I=; b=NwqPaFjyeeDAI2/kBd9L3BhoywvwIl9L0+wzL1x4NyTDSB3bRoQKkC8LquCykxRxcgBiQ1 XuG3DEVWnT+VC+gB4PyJ7omt+bkHkdMc5y5e2/95X9zEOp3lyi6NpEEKv/x/oTNnfnM7jF sLuICsLj7JvcjiQ6rVNdhRLNuOoPbRa8NgNCUeRyZt7pcN+jhQ61atZc/y6KhtSRn2VqCl rhP8t53ztZUp32juKNI7IzYMEKJR6+Edr1jjtGheiavIQi2z+1mgFGC1UrU8A/xP66QWWI yTN5K4VgrGvbril9WAo5Cle4mej5U8aiMdeJmZjj6o4tSa9U1yL/6nr1GV8/Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758277809; 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=TeugHrrr6fkjowocJcTxUobIhWVcYf8SjcrPxSSQN6I=; b=LoSwbaZ8jK+Nz3u5gMSs84QE5NLJ04ykDSTfrsLon0s//83Ypyf1xZiBqtfnMWejCw1I89 IwZswzXREGrgm36jqnoFLGfqkmcUZDvaaqy2kOHn9p0Fuy4r1YFoPjVf8ZCCqOKmClTEox f+typ8/tkLPRuQ8LXxebl/dKyxsOOTGXPiFY/PbGEGhE/C2aIUMXR05hF/a1ZpEuvDQpE1 Co2SD9koNo33vrIVRSW7M2XbR0bnDDWFZeop3ZdftArkx2/x5GI7Em3Qakjuqo1RoZe1OX jOQPO1hFgYE5i2Ju4Rvusaj/T8nGB5vEyB73wpjvU3I8upc6m20DeQ2eab9T8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758277809; a=rsa-sha256; cv=none; b=rV26RhAYeLARuHpM/2kKX1IQuD9drFNzTS9rUFWfSmfz+LJU5j/Y1FoixhqBU/Ca+VtVGU YMHa6SXA+dmnVG0N5IYZwZD1cAOZ8ZufOqxyBseEpug40RMqHU867nPaufSk1wGi/dYa3x vdIRj5c2CLmcNjJIOl3igH46K+9x+1Uy8VIZ1DNXmnMOfcs1kcFKB54EjNwF0zETIpHoB7 h8lZIj6On9Pf+80Ew58IOUOQO31w0S1xz5W4P70laE7s7+9lKjayt4Q6w+6CmeO0YDrc8H kuHcMTiTCPYL2t1vFfVy/UX4PQu3p/6j6ijDOANUg+JNwlgvQq2jTIbW9YifjA== 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 4cSpfn57jmztMS; Fri, 19 Sep 2025 10:30:09 +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 58JAU9DZ004945; Fri, 19 Sep 2025 10:30:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58JAU9tR004942; Fri, 19 Sep 2025 10:30:09 GMT (envelope-from git) Date: Fri, 19 Sep 2025 10:30:09 GMT Message-Id: <202509191030.58JAU9tR004942@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: 5e690f1e12ce - main - arm64: Fix enabling CPU features 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/main X-Git-Reftype: branch X-Git-Commit: 5e690f1e12ce8699f16019854dfffd1857a801d8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5e690f1e12ce8699f16019854dfffd1857a801d8 commit 5e690f1e12ce8699f16019854dfffd1857a801d8 Author: Andrew Turner AuthorDate: 2025-09-19 10:05:47 +0000 Commit: Andrew Turner CommitDate: 2025-09-19 10:05:47 +0000 arm64: Fix enabling CPU features Previously when enabling CPU feature we assumed the no check function means the feature was unconditionally enabled. When adding support to disable features on boot this check was incorrectly partially left in place. As all current features have a check function this meant all features were disabled. Fix this by restoring the previous behaviour while also allowing the user to disable the feature. Reviewed by: emaste Fixes: 4bc68fa98f68 ("arm64: Support managing features from loader") Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52579 --- sys/arm64/arm64/cpu_feat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/cpu_feat.c b/sys/arm64/arm64/cpu_feat.c index fb065ea463cf..94114d47f846 100644 --- a/sys/arm64/arm64/cpu_feat.c +++ b/sys/arm64/arm64/cpu_feat.c @@ -78,10 +78,11 @@ enable_cpu_feat(uint32_t stage) PCPU_GET(cpuid) != 0) continue; - if (feat->feat_check != NULL) - continue; - - check_status = feat->feat_check(feat, midr); + if (feat->feat_check != NULL) { + check_status = feat->feat_check(feat, midr); + } else { + check_status = FEAT_DEFAULT_ENABLE; + } /* Ignore features that are not present */ if (check_status == FEAT_ALWAYS_DISABLE) goto next;