From nobody Sun Jun 21 22:07:03 2026 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 4gk56013xNz6ht9p for ; Sun, 21 Jun 2026 22:07:04 +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 4gk56007pZz43Jn for ; Sun, 21 Jun 2026 22:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782079624; 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=v4ICFZ0HLBpbu3akxmv/gMXhay/7kHX8cDvCg4ZnmKMvJ6+YQsX4Y6ruzyyGpHHd+N1Osc V9rDi05qh5FgNviXk+2LjwOzV2uUQXDi8j3Q4DIvEzbnx+jomioRGFj+xkzo0dAwq/s3kO lHW7LqjSuLP8sTqdez20RxGKXfb8CZt2ByNzRK8DzXf1DGVJTme2q6YImBRoUsLt0KO11y 1pzaUydZW4ePF7fCyEuU/xqMUVuiJC1GYXO0srnbzJWnSzZEG504OOTYe6DGG5YJNOe5gi 7uA4Q1WP7Tx/5IH4yShh0b19g8+ppzsVpC7hAMjGfclSExkyas2CxiXukslDKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782079624; a=rsa-sha256; cv=none; b=swD2MmXQWixvgSy5lbMU+A8/RDUL+Am0s/UPOLZzsaxFi0bjejG+Fvg7W2SsbVn1l8ZAvT CpyEJCsKVf5F3ihHpUcg73+OG/U1Y5VhMn7wrpDOrNx7ACcUs887sCdPbThd/iyCGRaIuo G5yhfxUaXOoTSoZ2zHzlNvOcUle0KEgpONsoVUHZtTgbZZyb7REV3ingjI1rZM3Onb1o8z AMwwFsGo+LTGVglsO+DXU2FFryeaDBbs7RV8zPx7ZU+FBYLTQnE71XN8zxl7NZviZmFtzO OboygtDqNBox26BtQrKOjYgrKUM4O3pVgV2OuW40AXnBLFS6N7lRv6B030uvDg== 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=1782079624; 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=wfGq4e/Kslxr5GsH9Wn3POvKXtdoAFF4SXPu+5/tEFH+WIs3QQomlziInwABNsJzBaoYo1 EoY2e6OXoe98CPbqv1YxkltOCJf5qZotpP6edQrCPgl+hzYOi5zRaqhDaVUoes81X2ZbEk McDPlVxSpA+0D+yf1Y3qn1fTvU+mvDJ3dIjVYeXwz2Xi4hqrNxC0KchAf9Ql7O2kXfx5Dl u0bFcIfhvHOCPBFJiqDERBDy8T3iIC2ND3wEqqaiGJFXot/oy61OMSgnfHu6byGWWkccHz sQtnbUVjMAm0/mH7P5Sp6He31OUSp8Lu5K2+jOsI9uE3ezxPXO3ZYO9QSes96g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gk55z674pz4XG for ; Sun, 21 Jun 2026 22:07:03 +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 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 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