From nobody Wed Apr 8 14:01:27 2026 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 4frPqr0Gc3z6YB4f for ; Wed, 08 Apr 2026 14:01:28 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPqq6Gtfz3fmN for ; Wed, 08 Apr 2026 14:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656887; 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=4VEbwoSn6fr/hhYB5PzzfYz11bGXVWV1a+8AP0Y/tPE=; b=jC5D3/ZhKwbqWuA33DxZO8ztSN4wahdMrajvz8nzOEps0/Uh81vxeQkSEooDujMPo+V3mK TgvzLOtiEpCbNQp9oQPWhJG2tZLEJ21ELy1wcgAxsaHwkYLGhNMYCuigJAsM3OmbrLYUXp U0Rcw16Rl20O/UbVkb3dwtSzgm3JtdfKD5lHlf318/9uymFNkEqIe8krA2Zv5mdAU06d2n 6ETmcziVt1ULWMbdywLYPhkPB2s67iEH3EZuPmzkPquyqHL/+gZKXIyZtrKex2NiCaZbwk AflAKsPQNqoPhx4inxLnxwn1JKrS0td+pZLuOunjaZp4qaiZTQ4+P5KojJc9eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656887; a=rsa-sha256; cv=none; b=kgzSd3ZvnXkY77cmmgomJM1eqCJzWpCpTTljs1sPo6AxmZHN1nb0zKyldxLVBMtfKgD0/k e3w3pt34EqXD/LSbMesVf/aJzkSv6Mn0FvSg+zNkkcN0WJPYzqZssJ5MuUjvyZmFFLKuer iyGVd5kVMBpSEBcWh+T3rd+latRzrnpipVlgSMn2jGnI1c6MeeFH1BFmVeJ1JDKipULKDZ vLyvwpcWs0MS91AvlBmmfFOo+KAgOFXKUqxhfgBI4cTL9gRA7DC1OyuRUPplBoqIFg8OSX 2fAbrl/mtUBm9Qv824g5y80GUfcypsDHzA4xq2icY2dUe46BgRTg2EzX0sMuBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656887; 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=4VEbwoSn6fr/hhYB5PzzfYz11bGXVWV1a+8AP0Y/tPE=; b=eLo+Xylz/+XDl8AQ97vPxr9EJwby/lwGuIGeRSjiOO4Xdz8mN+P19+zNNAt52DjR9/SJK6 0GC9sUd9ujQ1h+kKjX5HquBgAM4LhWPRN4cgQsafPJIEyOgqwApVUQN2d5JZPQPFDi5dOc U0alyw5hLt6ED/j6tNDv+W4P4e+jJ4L0X/A8ZFEIIS/aG8UBZXjlBYEwQ1UHUmwlz3n9Xc D7l/9fJT/mWNyF5snvBL7fRSkMJupbwzeXrotz20x4dPf8ppAO7MjWUgptp/MlyZIctkvK ECyihG/O9E/LX8Py3bEax8CvI7YpY67cbV1SDFS3L/sJM1T6+mlmgIhvJoPZ3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPqq5YjTzDDq for ; Wed, 08 Apr 2026 14:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b3a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: c91d1de34d26 - stable/15 - arm64: Move creating the ID register views earlier 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: c91d1de34d260e73c7816c69b9b5f48194019100 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:27 +0000 Message-Id: <69d65fb7.3b3a5.5b72016c@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c91d1de34d260e73c7816c69b9b5f48194019100 commit c91d1de34d260e73c7816c69b9b5f48194019100 Author: Andrew Turner AuthorDate: 2026-02-09 17:24:26 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +0000 arm64: Move creating the ID register views earlier These are needed when enabling CPU features so should be processed earlier in the boot. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55103 (cherry picked from commit 0ea31fe851344af022103fa81dcdf00ef0dddc1d) --- sys/arm64/arm64/identcpu.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index e37c9813582b..7f89098cc840 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2826,6 +2826,26 @@ identify_cpu_sysinit(void *dummy __unused) prev_desc = desc; } + if (dic && idc) { + arm64_icache_sync_range = &arm64_dic_idc_icache_sync_range; + if (bootverbose) + printf("Enabling DIC & IDC ICache sync\n"); + } else if (idc) { + arm64_icache_sync_range = &arm64_idc_aliasing_icache_sync_range; + if (bootverbose) + printf("Enabling IDC ICache sync\n"); + } +} +/* + * This needs to run early to ensure the kernel ID registers have been + * updated for all CPUs before they are used by ifunc resolvers, etc. + */ +SYSINIT(identify_cpu, SI_SUB_CPU, SI_ORDER_MIDDLE, + identify_cpu_sysinit, NULL); + +static void +identify_hwcaps_sysinit(void *dummy __unused) +{ #ifdef INVARIANTS /* Check we dont update the special registers after this point */ hwcaps_set = true; @@ -2848,16 +2868,6 @@ identify_cpu_sysinit(void *dummy __unused) elf32_hwcap |= parse_cpu_features_hwcap32(); #endif - if (dic && idc) { - arm64_icache_sync_range = &arm64_dic_idc_icache_sync_range; - if (bootverbose) - printf("Enabling DIC & IDC ICache sync\n"); - } else if (idc) { - arm64_icache_sync_range = &arm64_idc_aliasing_icache_sync_range; - if (bootverbose) - printf("Enabling IDC ICache sync\n"); - } - if ((elf_hwcap & HWCAP_ATOMICS) != 0) { lse_supported = true; if (bootverbose) @@ -2872,11 +2882,14 @@ identify_cpu_sysinit(void *dummy __unused) install_sys_handler(user_idreg_handler); } /* - * This needs to be after the APs have stareted as they may have errata that + * This needs to be after the APs have started as they may have errata that * means we need to mask out ID registers & that could affect hwcaps, etc. + * + * The errata handling runs at SI_SUB_CONFIGURE, SI_ORDER_MIDDLE + 1, so this + * needs to be later than that. */ -SYSINIT(identify_cpu, SI_SUB_CONFIGURE, SI_ORDER_ANY, identify_cpu_sysinit, - NULL); +SYSINIT(identify_hwcaps, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE + 2, + identify_hwcaps_sysinit, NULL); static void cpu_features_sysinit(void *dummy __unused)