From nobody Wed Jan 21 04:37:45 2026 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 4dwryy3TrYz6Pd8T for ; Wed, 21 Jan 2026 04:37:46 +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 4dwryx6kr5z3T59 for ; Wed, 21 Jan 2026 04:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768970266; 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=5pAqhLrFjQaf/eU7EbbQGyRnP8fQCWdcEb5gL4mA6XM=; b=txIY0zPPvhGNFzw5/Xwl9jVD92l4FfwGNika0vKJVRfNUTxEqfOTWa/uROcKSIDqyJ6DzP JuEcFOiYgVZ0DCHmK7xwZ2UrOx/MdH8FNkkLin+u0tQn4ZMHK+JjCUZE4Bq+/yfMLiuHkW R75V6W1ZNWCYJdouMUT2aWaXq7FxTW42zBZwlGGK2HCp1vsIXCgD+L4BStJhQ5O/9ystIq iVrus475uynRKbyGyttOI0qey8KkaHFSriptq0YdPcktCDi0/1EoR+0lSQr9tcTVkAjUrz UhmQgVkiwAAH5Dd2V8TiHdZ4CHHAm10ZvRqEHs78pOaehB8s4Amg/AlTjunTXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768970266; 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=5pAqhLrFjQaf/eU7EbbQGyRnP8fQCWdcEb5gL4mA6XM=; b=G3tjW149tIiWMr/6uULnZhAa6i/7sV2K8ysUrw1y81EpNHxtDh6CaCuYDzL3+GXmqVokhu zGAU9Hg4UvUBdsudc3KcihYbjdATRtr7FBlPl9naLG6sgAkNqi939rFXkPduG1Gfsa0IwI mDZfjnNyPzjKXKte33faPzJ6hc5iSY5ALt9p03O6COPsCkZ2hgz7CSkMNDRew6AXg3+syO +X+trb+fSwDq1T9Ft8S4aUut6fqBxAz2AcHVnBDondRYR/PGn1iRaVllhv802Gef1d1q6C DB5seyrxuJKf1Hn0yNF+jj15pXe03C2/fQTl3eHTDXuJUe0JwS8vrkcTnPy1rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768970266; a=rsa-sha256; cv=none; b=o1pYkKTi+emBzr6ePuq55bTgLRCYwo3OTGi5YOeSdnr4DnKsIJl3proxFJyUkqvtsAzef8 9TghrYCdClltyK0FGYkHgwW9wFhE2E87NARcO2MGfUMbXwGeHrpmqgyfUD9g9+B8Id05pW sQNU2ztouz4HWUemnfvj3Z+mqo6FqjqjSUQhh/nc6X1OMseQLGuf38frniKUyJqgBP5pDg VfAX168AoGoR4GJNFkQ8OBHPgw4312w0ntOJcDEgxp3giZqDlud1jWg7Esq9kKM77z+c1t OVuufBvxIxbJLDrH/b5FhIpELT4REPjsuvr1MaWRA1bSTacFUJsA+5LPIp+nrw== 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 4dwryx5VBCzYvK for ; Wed, 21 Jan 2026 04:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39b20 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 04:37:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 24d048be7aae - main - powerpc/mpc85xx: Set pc_hwref to the primary thread ID 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24d048be7aae10e101596bd0d0f09a901a6f97f0 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 04:37:45 +0000 Message-Id: <69705819.39b20.fe1347d@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=24d048be7aae10e101596bd0d0f09a901a6f97f0 commit 24d048be7aae10e101596bd0d0f09a901a6f97f0 Author: Justin Hibbits AuthorDate: 2026-01-21 04:16:17 +0000 Commit: Justin Hibbits CommitDate: 2026-01-21 04:28:40 +0000 powerpc/mpc85xx: Set pc_hwref to the primary thread ID On multithreaded cores (e6500) the CPU ID in the device tree (reg[0]) is the primary core, which may not match the cpuid, until Book-E threading is added. --- sys/powerpc/mpc85xx/platform_mpc85xx.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/mpc85xx/platform_mpc85xx.c b/sys/powerpc/mpc85xx/platform_mpc85xx.c index 6653c40b01a3..cc2ad829eb05 100644 --- a/sys/powerpc/mpc85xx/platform_mpc85xx.c +++ b/sys/powerpc/mpc85xx/platform_mpc85xx.c @@ -302,14 +302,26 @@ mpc85xx_smp_first_cpu(platform_t plat, struct cpuref *cpuref) static int mpc85xx_smp_next_cpu(platform_t plat, struct cpuref *cpuref) { + phandle_t node; + pcell_t reg; + int i; if (cpu >= maxcpu) return (ENOENT); cpuref->cr_cpuid = cpu++; - cpuref->cr_hwref = cpuref->cr_cpuid; + + node = OF_finddevice("/cpus"); + for (i = 0, node = OF_child(node); i < cpuref->cr_cpuid; + i++, node = OF_peer(node)) + ; + if (OF_getencprop(node, "reg", ®, sizeof(reg)) > 0) + cpuref->cr_hwref = reg; + else + cpuref->cr_hwref = cpuref->cr_cpuid; if (bootverbose) - printf("powerpc_smp_next_cpu: cpuid %d\n", cpuref->cr_cpuid); + printf("powerpc_smp_next_cpu: cpuid %d, hwref %d\n", + cpuref->cr_cpuid, (int)cpuref->cr_hwref); return (0); }