From nobody Mon Sep 22 15:20:22 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 4cVmyH71Fsz682fx; Mon, 22 Sep 2025 15:20:23 +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 4cVmyH1dQgz3Wjp; Mon, 22 Sep 2025 15:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758554423; 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=KQGT7yUMSIqK9w+irMnno2J7BA/BOZKXEoNcNaWv+UI=; b=xBxQ1oYl9wV+QRuTW+70G1ofirYALG2uZICvTxdFkCHlbEjUXGqLcyq6OU4zk57NyzGnFA qYuEFXZ2yt/AmmUCHzN54zsmCBfgKlNd/phrEDJ4IhaiwrWEujU7jybLGEFPpF0sNHZp96 jlpVAFIXeMtvlkmxJPPhWn6JulWOBfhucdzAdpIDFfmVAxyRi0w0QUWalS6DunzS2megiD pGi3bD1QvFvDeSsj8yctWCD/KYYQKQKZ2zBONEAZCYmpghtOpMOAr5dMwj8IPsTx1Srwk1 +CYUeRav2qlNG7BIXLrvqPZgdfhxIfn2wnv7sZIRrhi0BrI2CN+MhXLjaoTpAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758554423; 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=KQGT7yUMSIqK9w+irMnno2J7BA/BOZKXEoNcNaWv+UI=; b=gAFCEU/uxbJwmbapTZvxilTp22n7INcnLulI7lX0ZWwdcvkQKpufdJyrmKvFOiG8B1sy/a H0sHXF/oJpUp8X+ZppWSF5B+MRHakhMUFU65KXt8tUZ7UDoN4GHyF61eS0S4yT6kiI1nFU vjPht8GA37n8hv1ApF9borOVTaVaCDVLSbliGk7/0PJYDWqD9jO/5UcsKhoB1mmC5ZYqZm 1ZLWgmnY33baYbrbKjWojTHcmCTNHplMeLwqzq8xdCUmmykXEGtfHiJ863LhlTMzztPPkd fYYi8OEu8Vt5odEqooV9+HYEIJGKPArLLYad4afJNc+9mQsplCmVyM6Ehr3Zhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758554423; a=rsa-sha256; cv=none; b=fMRr6e4A3s6IXLb7h5I3IIqClrP8xQra9Arcd5gNFwTBDDoP6PUNlY04MpB3mrJn0KselK U6Q6/ROfovCD57J/7Mgd6xAIHw0ABiftyqYiir74gQYGWAIm40a/6IcQXeWVdVSIOTxH5n HpiQZyZ22ipUTx24eFGH8ZC1svfTEYaKTe7kl2L2lULT1Ugl0UqL/odIUE87RvgEW9dBuc toTGF1UwDt3EelDk+nrivHoQWdLsZu8Jx6+LpmRDNdljky7eEeJJs+bKCJeBktYiooaMS+ CJUtS66iwhNJiAPh606d6UNrPEJrOXxXA5wTIMPgSz7qAJc796m3qnn0eMLRyQ== 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 4cVmyG2gwlz1502; Mon, 22 Sep 2025 15:20:22 +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 58MFKM2W069297; Mon, 22 Sep 2025 15:20:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58MFKMCj069295; Mon, 22 Sep 2025 15:20:22 GMT (envelope-from git) Date: Mon, 22 Sep 2025 15:20:22 GMT Message-Id: <202509221520.58MFKMCj069295@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: 88489d90afa5 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 88489d90afa5306b1dbbecca19efdb1cc4fd133f Auto-Submitted: auto-generated The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=88489d90afa5306b1dbbecca19efdb1cc4fd133f commit 88489d90afa5306b1dbbecca19efdb1cc4fd133f Author: Andrew Turner AuthorDate: 2025-09-19 10:05:47 +0000 Commit: Andrew Turner CommitDate: 2025-09-20 01:00:54 +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 (cherry picked from commit 5e690f1e12ce8699f16019854dfffd1857a801d8) --- 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;