From nobody Tue Feb 3 15:20:40 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 4f56cm6Tzkz6PhnV for ; Tue, 03 Feb 2026 15:20:40 +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 4f56cm4Cxsz41tW for ; Tue, 03 Feb 2026 15:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770132040; 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=kD0UBSH+ZTOhaK3BpxNOpQwdo+oOzKY6DH3AU6214w4=; b=gm/rVTxzSq+cJ++5iuaJcDOITgv9gueiwQa8SdEFKLlr+lm2RXYVWBOB+8ftHCuGRUZlo1 sL/7xr1YHkOOOVXckqak4ph1cXN1kF+YgEriEjj+vBt6qDaiXZmtdHGQdCOSPBXsDhG8ZP j70Rd9BF6lDSprgEPfaLmRifdU6g62jv7Mk2v/Xx8pk29RzeC1li+UYsSUCiayzAXma8eq g/c1hDpbhdwpywaLMkk2D5GKaELWzEjSD1ZJn4RVdY/q2ITlppK1aqmT3sYLQhkquzMbMc MvNFWaPpOXTV0k6Rxi73L2n2w1D+K45jxXyO4qUSAeZj+QjBZcKuWYtVfrcBNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770132040; a=rsa-sha256; cv=none; b=TWW2l6zeTu31Fm3dfNk0EpMoNHRir51OtffYuzXumQ5Qk1CPj6nCr3IA4FpjuFlVMjzKAr M6HQO4nnqi4rxIDZ5PkUfW7GsDCwzaJdfcNrrgITs9kfyWQCztH+1ULUZE/zDAUIBMFOKG /X9YlMO3/XFLpQScoYnR8biX1cZo7SCXET3NCi0NKiQszKXgdThuLRtm8XiR4wmm5kpWrW bVX/h8fHOixB/gzF8dBGDRZWpCrzbt/iCGsNqkq6OwmN0jGBfcGN4G8lJ6/N41pmojv2fC uj6Uq0k/orWK3Ga16F8v3bmSCtrZy+xCawMHO/ptFQxu1cNA/0/OKeO83WJ4yQ== 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=1770132040; 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=kD0UBSH+ZTOhaK3BpxNOpQwdo+oOzKY6DH3AU6214w4=; b=cHUupzXMGgSDf6c7mBSbIIuts12YrRPRf/CHtXVQg0hdomsNXZRPQEVf1Kx+3O1smPCT8z kKIQCgjFOE/udAkphlgJ2IhzXKi5TczoUGvxNA/INl3ITI3FWdJ/Z6yrKoE1hSP+hZDxQF P9bkoYBLYLyaJ09Q93/L2tcJ61k3JLGmblTdNdyMTStiAUaFiknSPqUOi+h7k/h9cC9CkW 12f0EytoAfyd48GJ/tQJoWkk30GzpEZaMA4kSWfSDjqTZy0JSPA5EXdFcbUusj26AI7pie t++DBWtaC8wBtAquCauS9EGD0fKD7+ZgbIAcc0RP+0TZmHFiU3hABeEmXLOA6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f56cm3mXmz3PZ for ; Tue, 03 Feb 2026 15:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41c3f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 15:20:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 93450913086e - main - powerpc/pmap: Use a constant for HPT superpage shift 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: 93450913086e7f0478b609367d5f1d4c740cb941 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 15:20:40 +0000 Message-Id: <69821248.41c3f.2a63f774@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=93450913086e7f0478b609367d5f1d4c740cb941 commit 93450913086e7f0478b609367d5f1d4c740cb941 Author: Justin Hibbits AuthorDate: 2026-02-03 15:11:19 +0000 Commit: Justin Hibbits CommitDate: 2026-02-03 15:15:24 +0000 powerpc/pmap: Use a constant for HPT superpage shift There are no plans to allow multiple sizes of HPT superpages, so just use a constant for it. MFC after: 3 weeks Fixes: 1bc75d77e9 ("powerpc/pmap/oea64: Make PV_LOCK superpage sized") --- sys/powerpc/aim/mmu_oea64.c | 4 ++-- sys/powerpc/include/pte.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index 4757e469b5d7..c82c5c539de2 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -125,7 +125,7 @@ uintptr_t moea64_get_unique_vsid(void); #define PV_LOCK_COUNT MAXCPU static struct mtx_padalign pv_lock[PV_LOCK_COUNT]; -#define PV_LOCK_SHIFT HPT_SP_SIZE +#define PV_LOCK_SHIFT HPT_SP_SHIFT #define pa_index(pa) ((pa) >> PV_LOCK_SHIFT) /* @@ -890,7 +890,7 @@ moea64_early_bootstrap(vm_offset_t kernelstart, vm_offset_t kernelend) int rm_pavail; /* Level 0 reservations consist of 4096 pages (16MB superpage). */ - vm_level_0_order = 12; + vm_level_0_order = VM_LEVEL_0_ORDER_HPT; #ifndef __powerpc64__ /* We don't have a direct map since there is no BAT */ diff --git a/sys/powerpc/include/pte.h b/sys/powerpc/include/pte.h index ed926f80c879..2e8cdacbe165 100644 --- a/sys/powerpc/include/pte.h +++ b/sys/powerpc/include/pte.h @@ -145,10 +145,11 @@ typedef struct lpte lpte_t; #define LPTE_RO LPTE_BR /* HPT superpage definitions */ -#define HPT_SP_SHIFT (VM_LEVEL_0_ORDER + PAGE_SHIFT) +#define VM_LEVEL_0_ORDER_HPT 12 +#define HPT_SP_SHIFT (VM_LEVEL_0_ORDER_HPT + PAGE_SHIFT) #define HPT_SP_SIZE (1 << HPT_SP_SHIFT) #define HPT_SP_MASK (HPT_SP_SIZE - 1) -#define HPT_SP_PAGES (1 << VM_LEVEL_0_ORDER) +#define HPT_SP_PAGES (1 << VM_LEVEL_0_ORDER_HPT) /* POWER ISA 3.0 Radix Table Definitions */ #define RPTE_VALID 0x8000000000000000ULL