From nobody Tue Jan 13 16:27:40 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 4drF5n5PZGz6NNBZ for ; Tue, 13 Jan 2026 16:27:41 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drF5m6g8Yz3LCJ for ; Tue, 13 Jan 2026 16:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768321661; 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=kIRjqDUK+sS1E0K1M4wwufGIRLNhb4NWLIHoPDLaWuI=; b=ST7kIrIRBs6W2JdNZkE/yTRCguj2UOVu4sPB+H2YkDGvTI5ZJ56DjGVoSCsTTnjDWEtWIg 9Y93ap87YJ6KgqVeGaFmyZKa5/9Kp3n39T1BfNodaNU+euqjjECPLAH2aoMnRc5zKnOkG6 IXCcfLh8n+5P6GDTuNMe911kWxYq6lAJpHzYzUJfG4ABUClphDpw0xDvSel4KRTeDYsNvr edXlJJptcXdns2bsgcRB2UQ9FcHZwrtmj8/qVNRTkNaWNxYh5s5KTWIb3K57KfO6hUqbYC +WRgwG/wGCpG/FMu1FxNJdGvpqC8b/wgBuR/IWuJCAaHetk6x0tl+Ll5HPMwAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768321660; 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=kIRjqDUK+sS1E0K1M4wwufGIRLNhb4NWLIHoPDLaWuI=; b=LsmVhw4S7XbwDLYw2Q7lxJPI/vR5nDdOqGCIH7srCEW5vLE3xu0VftpHW2gOWnOZY7U5DH OxP2z5QHdLMtkX/UcRwgmqiiyV51XU5S2rPB7YzqN3sz0spTw7qOKuHthXBQjcbA5mLS9Y Rws7Mw714KGLxr5J0S+hBbyqlzTNfCfwlhbMOl3d52F7oT/YRSc7trd2RmwyBWffvzU+r8 wY7dQ64on5FIEER2L218++v7Rqwbc8ePaeG8X/yT57GQ434X+/P44uJjMmIqneiqYrxQuB xJFaYng3iPw1ZaSzweuzhT2nfiBpDjvIzSpIoTqizPWXxFQCBwVYTJ2OBTkZhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768321661; a=rsa-sha256; cv=none; b=ZNVX7syCBPppmBeVWboP1oVrqFLcrCt7blCrdefGNjAx89pE1E2397GjMV+InL9hpgxehE 9w2cQLw10W9GXckG9W34kuTB/KARlINxkfb0NqAOsvaYgfi3mzEXZpGiRxteXJ4fFBJGqj 240H+gZTf0hG9d8mJbnxBFbP0isZEbPtBAK5ZYhZbCRfbKka47mnURvudsWKzU63W/75RD SbgnQS6c4XPQvJnSd2dZzMcuW7LQXZzOtmLIzZjlrrP1NF+gtXaj9aRk+H4gvPjyd5m0of 0sK73srKBo5y1YXmcVzP7YE8Z3KEF2I86g5YKDlQ2GnZDtS5jgL9m2gG/fX4kw== 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 4drF5m64sMz3m1 for ; Tue, 13 Jan 2026 16:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3060a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 16:27:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 8dca461b1efe - stable/15 - dev/ofw: Teach ofw_cpu to find the pcpu on arm64 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: 8dca461b1efe91d26141aaa06b9c8de110048d56 Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 16:27:40 +0000 Message-Id: <6966727c.3060a.79b6e1b9@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8dca461b1efe91d26141aaa06b9c8de110048d56 commit 8dca461b1efe91d26141aaa06b9c8de110048d56 Author: Andrew Turner AuthorDate: 2025-11-18 18:00:29 +0000 Commit: Andrew Turner CommitDate: 2026-01-13 14:06:20 +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 (cherry picked from commit 6b12b94c8fd2d5d85060d02620ed807ac6233f71) --- 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) {