From nobody Sun Jun 21 22:07:03 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 4gk5664gYTz6htJD for ; Sun, 21 Jun 2026 22:07:10 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gk5654y2bz43Bn for ; Sun, 21 Jun 2026 22:07:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782079629; 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=D57ApTjrCJiGHh9ZdF6PBlfBzhwrKylSM6AaZvWvt70=; b=abUgc1Nav0KRjvukVrAbVqLNOdQ6+m6lLDIA4Z2o+BUQ6HTgUVvO5sL3moUkfe/QtxOLvt EY/gzI83Unbp4x6HHUt/47lc8hZJPgLDmCyY47L0lse2QABNjdgXyzkqC/MOFo7bpvGJY8 lYyzJkKMzszsZJsTQqS7uZPdZc00PD66pcpEy/uP8A8OZbqM16fTFx31JklVMceL0kqzf3 4Faq1+YJDS6Fa/q462g4xKwv5lM4JoNqKr0iPg+rjHYFVKi9J/VyveQd78u69Yc2zI0dcS 6mCBEdkD2wvshiSZZyWOq70Nkqr77ZjzhRT7Hw4pZDuiizwk8R8v7mEe/aMCvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782079629; a=rsa-sha256; cv=none; b=l2BoJ8Kd4gjyUbadvM8x3UVbZyvxI5l/Jeg1hF/E2XuEUQhL+UpJwOGR5nfEgQShR2a6ug i9r7JT8t9ivVEhGyYJICXKpgDne5hthpS533mXDS8/Trq0NZJ89PTPIl9aqzJ0zOu/j2ZK lMAsvtN4Zf41TBXqm0ABirxjGl+GblHRmy1UTHSFTZmCsSkV/Sct+0hAuP/TiFnPz5Kjte 7jkQZe6zM0KDD+Ho1E/wPQh0SUlMka4+tX0owLVVEN1gqGC6xpcBP4alH0m0IRj6vDfDuf g5IafW04qcFRgN09rgXTml/SbfKEDDJj17oOzw90z3MDXYZxgcajDPH4vhWLQw== 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=1782079629; 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=D57ApTjrCJiGHh9ZdF6PBlfBzhwrKylSM6AaZvWvt70=; b=sdQtp7YPnyCmZHa8hUOJTId7NlgBRtaZhVc97o5n7QaoWj85cz/KvjilxLQK94xTy+vLpH kVaEadxcvIFyv8zpgxJFV5LX8hJY2Fbyy7qBsO903RY1NMcZDjJTwIsh5QuAGIyqxURaNV e7oMuWF6tt2falRAny/uIgUpr5Sy5UfkZHuzz9nQV0EqHW6B2SqZntqsN2lVDnIRWFdFyC peSmHcdOpwcbZ9+CCGdTETXwuyAyA1OW74eqFwDRlc/Xum45G3tqXkK/JivRXyS8GOYrca HvUK6QGO5itn/OJ2b0LIV7UKmixb5+pNDKaBVNUbX/XSetABQ4BfH17gb3AZ8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gk5646gWHz4kv for ; Sun, 21 Jun 2026 22:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f663 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 21 Jun 2026 22:07:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 9006774e46df - main - powerpc/booke: Extend TID register bits to the max 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 9006774e46dfe0859500ce18e1691c75846a884d Auto-Submitted: auto-generated Date: Sun, 21 Jun 2026 22:07:03 +0000 Message-Id: <6a386087.1f663.78ed0d0c@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=9006774e46dfe0859500ce18e1691c75846a884d commit 9006774e46dfe0859500ce18e1691c75846a884d Author: Justin Hibbits AuthorDate: 2026-06-21 20:28:55 +0000 Commit: Justin Hibbits CommitDate: 2026-06-21 21:23:57 +0000 powerpc/booke: Extend TID register bits to the max Some Book-E cores (at least e6500) can have much larger PID fields, up to 14 bits. Extend the PID mask space to the full space, and future changes may take advantage of this extended space. --- sys/powerpc/booke/trap_subr.S | 2 +- sys/powerpc/include/tlb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/booke/trap_subr.S b/sys/powerpc/booke/trap_subr.S index 789e746dba3e..cb4d99e6fffb 100644 --- a/sys/powerpc/booke/trap_subr.S +++ b/sys/powerpc/booke/trap_subr.S @@ -712,7 +712,7 @@ search_kernel_pmap: /* Force kernel tid, set TID to 0 in MAS1. */ li %r21, 0 - rlwimi %r28, %r21, 0, 8, 15 /* clear TID bits */ + rlwimi %r28, %r21, 0, 2, 15 /* clear TID bits */ tlb_miss_handle: /* This may result in nested tlb miss. */ diff --git a/sys/powerpc/include/tlb.h b/sys/powerpc/include/tlb.h index 33d31efab604..2a460251e292 100644 --- a/sys/powerpc/include/tlb.h +++ b/sys/powerpc/include/tlb.h @@ -46,7 +46,7 @@ #define MAS1_VALID 0x80000000 #define MAS1_IPROT 0x40000000 -#define MAS1_TID_MASK 0x00FF0000 +#define MAS1_TID_MASK 0x3FFF0000 #define MAS1_TID_SHIFT 16 #define MAS1_TS_MASK 0x00001000 #define MAS1_TS_SHIFT 12