From nobody Tue Nov 18 18:02:33 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 4d9ss61s7qz6HWXl for ; Tue, 18 Nov 2025 18:02:34 +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 4d9ss55wfXz3Hsd for ; Tue, 18 Nov 2025 18:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488953; 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=Tc5ZHtWj8neMV3xV3iQ/SYiwXcWRirSqC3V6mfpUhlA=; b=S/2TwacrX3r/w8Udh1kwp/lI87rfDL/kgnB8Gu4Tzhg15JPfP3jK2mQkGoEFXXC+FIRWFD a2sRPxEsfQa0/RgvDBijjXqp+TEhuaqlimgippREDrQcXJLbVv93BnO9c7wHPnvUH33d6O BwzqP58D0GQT3moPLh9khg34UkPFSY66AeqaMbT82YYE4IORqr/lz7yF6PRgNRA6WvuXJM T7BqEWsFGi9Gugjh+FbguiHMnClubPpd6nsvYtQE/X+sjEIftymAOkbBvB4TLEO+C+9fws SOZ54/fELMy70HL06khGSMrS8FIEH7xexNYhJ3vf7l188jUA3k4FcTgEdcu8XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488953; 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=Tc5ZHtWj8neMV3xV3iQ/SYiwXcWRirSqC3V6mfpUhlA=; b=qfdffQEQu9G3WrciFrBxYCPCtKijve50P84gEx7vx9BNO9e8BgX4IIvuVA9Dz1AALbOD3Y aTXwrra5zvIitDTk7zmO6R4yVsZKbZzchkJ6aJe3RmIxQ0A2lEfg9S6EhqAdFKFOA7y38+ ZcD8F4+UNkn5VP+F/DmPRwBDGpjSaEgDhv1PxnxwrY0DpxB5lH4XX54TL4Tlorw1wFy7IM MyyA83LqHmGisy3CUA4UI8rgx+yh1lDc4bUUnXKx1qq70scSbUzDYwb3KptIrgpPyCi1Dz uoNQXOj76H0Uei9M3GE3kqINcayxJg5Qx5CDuYej4TiCc/vQD8UQuz9HP1b9TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488953; a=rsa-sha256; cv=none; b=NihEzEUOeFL9SGfyC2abDTPH09rR1q6PixsAlxNUkK22OOPQzBdIvqGMQJHs1IiZ1HqOlT G4rXEL/biJs6qsewJqhQuzo1P7Sn/hVgw/QVNQaiw+vYZtCqjMfUz9xGrHZ78ZataTxIzN N6/H64tL9La2GUjy+1lmv5HJOwaQOQkr69Z0bqSRadjo+2/NpgWkz7sOOS9SURNphYotot 0N6H3/6PDVLdP0Qji8X1f2Pxy0NM/OUaLZEQ0ULoCb2p7zMFSczMzpw/j0uprMCAaC0BQw E1GZLbheUjSGO6jspFCO4KAblU+7eu5HLKFraWV54ZQCXw27dDIO//0mK3RQ2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9ss55VDgz14r1 for ; Tue, 18 Nov 2025 18:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22cb2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 6b12b94c8fd2 - main - dev/ofw: Teach ofw_cpu to find the pcpu on arm64 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: 6b12b94c8fd2d5d85060d02620ed807ac6233f71 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:33 +0000 Message-Id: <691cb4b9.22cb2.21540d51@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6b12b94c8fd2d5d85060d02620ed807ac6233f71 commit 6b12b94c8fd2d5d85060d02620ed807ac6233f71 Author: Andrew Turner AuthorDate: 2025-11-18 18:00:29 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:29 +0000 dev/ofw: Teach ofw_cpu to find the pcpu on arm64 Use the midr value to ensure we find the correct PCPU pointer on arm64. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53327 --- sys/dev/ofw/ofw_cpu.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c index 4b12f2e994e3..852ce6ea3759 100644 --- a/sys/dev/ofw/ofw_cpu.c +++ b/sys/dev/ofw/ofw_cpu.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -280,6 +281,28 @@ ofw_cpu_attach(device_t dev) } else sc->sc_reg_valid = true; +#ifdef __aarch64__ + if (sc->sc_reg_valid) { + uint64_t target_mpidr; + + target_mpidr = sc->sc_reg[0]; + if (psc->sc_addr_cells > 1) { + MPASS(psc->sc_addr_cells == 2); + target_mpidr <<= 32; + target_mpidr |= sc->sc_reg[1]; + } + target_mpidr &= CPU_AFF_MASK; + for (int cpu = 0; cpu <= mp_maxid; cpu++) { + if (cpuid_to_pcpu[cpu] == NULL) + continue; + + if (cpuid_to_pcpu[cpu]->pc_mpidr == target_mpidr) { + sc->sc_cpu_pcpu = cpuid_to_pcpu[cpu]; + break; + } + } + } +#endif #ifdef __powerpc__ /* * On powerpc, "interrupt-servers" denotes a SMT CPU. Look for any @@ -315,9 +338,10 @@ ofw_cpu_attach(device_t dev) device_printf(dev, "No CPU found for this device.\n"); return (ENXIO); } - } else + } #endif - sc->sc_cpu_pcpu = pcpu_find(device_get_unit(dev)); + if (sc->sc_cpu_pcpu == NULL) + sc->sc_cpu_pcpu = pcpu_find(device_get_unit(dev)); if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) < 0) { if (get_freq_from_clk(dev, sc) != 0) {