From nobody Wed Nov 04 16:56:44 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 4jKWnG02X7z6yVTX for ; Wed, 04 Nov 2026 16:56:50 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jKWnF6Rdbz4qsv for ; Wed, 04 Nov 2026 16:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793811409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srCrdkduFnVkqg0fdJl0VFYeYOjTmvPFEiF0RR0g+Vs=; b=coMWYA1J/yBBeR4ruALGvSmnPAcCA7gptzsWqB/iRnYdziiSFDlJQ2+3870D1OshTYN8n5 xFqeQ/CNb3cRoclFzFMs12oFiIWqppvB3347rcR9Mkwl5QctmXbamTnIkVEloOGYcuMzTW qXO9ocOpVJdFxACj23ddh12W3EBWQJ6J583RsJGNDK8VVHxJFXkWVYNN/rqgPW3IT9sA+f mw5MHKai8peqK89z+uste+iZJ+g2usgg9feufjBJo9s5Dplphob2Yxj7qV8fZyIx7lm8hZ +gn2eHDJMvvmQpowWEguVbHIBslN5PuWzhtvH5it2RebGZ+9xepBvqQBlrZ8cg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793811409; b=YB5zmBZEBGQlv9zLH7yFAzW+O+VHNoLawDruk7dAG1OVQNGXpe51omBn4JXVvP0wSnwr8x F/lo1NA1pfmuzbl/NM+H1zFUTFLBUEuxdurl6MtGBxomSnXXbE9TdcKWERv5fSRNKOC8DS rfmlw6Bqzs6eoVRkxKfRnVai/yHgz7URncW2ewtrFaJ3d1tNjGYyyNQUuZkIu1EB1JByY1 j7RG83aGrujp9/+IjdtDBOwvUaGm9IR+Eop4mmS+7NPyBRZe/LWFnQEIuc7LLJ6/vRXkOx S2jMDygAgnGqmibcIqGr53b1NzIQX3TI9ecugbimajKWJvfgtKrgT6c5CsYVsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793811409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srCrdkduFnVkqg0fdJl0VFYeYOjTmvPFEiF0RR0g+Vs=; b=AprSu6HksOEfgbTuUuKBCFsx5Qhs4wg4bGFZLNLJqU7Pg8dr6pefbZ8Vyb95bdNPz05txY NdKLNHTSWa3Kv9Hl0vgY9iPVt5Bia7fLv4jmy6rImWsGpHBWAAARNlWHRWqfMYEtZp06dN EdZmS8M1Akx3Dq6lRD7x/B8qGPlK4AUkVQwpN70+WWOnfqsMN82w8btVH2E2qB70EsZVHI TPKnXKuuCBbOphrNaamvv6pxUL6TorInSqS9KUg8L2wHhDFS4dO+xajWGpefyOKM/Tchx0 zNTgGBQRmforPtqpQiDEq9Aus5TVbZiS7anyqaOqaUMYmrqPfO9p4yADC2vFBA== 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 4jKWnF62WCz1BJW for ; Wed, 04 Nov 2026 16:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22c96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 16:56:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Kajetan Puchalski From: Andrew Turner Subject: git: c90253b58cbb - main - arm64: pte.h: Correct S2 MEMATTR definitions List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c90253b58cbbb3346696e6eb49e6021c4d022125 Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 16:56:44 +0000 Message-Id: <6aeb63cc.22c96.2ff7e94a@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c90253b58cbbb3346696e6eb49e6021c4d022125 commit c90253b58cbbb3346696e6eb49e6021c4d022125 Author: Kajetan Puchalski AuthorDate: 2026-10-15 16:30:07 +0000 Commit: Andrew Turner CommitDate: 2026-11-04 14:56:40 +0000 arm64: pte.h: Correct S2 MEMATTR definitions Fix the definition of ATTR_S2_MEMATTR_NC to 0x5, instead of the current 0xf which is the encoding for ATTR_S2_MEMATTR_WB. While at it, add remaining device memory attributes and define missing bitshifts for easier value extraction. Signed-off-by: Kajetan Puchalski Reviewed by: andrew Sponsored by: Arm Ltd Pull Request: https://github.com/freebsd/freebsd-src/pull/2476 --- sys/arm64/include/pte.h | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/sys/arm64/include/pte.h b/sys/arm64/include/pte.h index 464d8c941c56..5b405691ba1e 100644 --- a/sys/arm64/include/pte.h +++ b/sys/arm64/include/pte.h @@ -64,7 +64,8 @@ typedef uint64_t pt_entry_t; /* page table entry */ #define ATTR_S1_PXN (1UL << 53) #define ATTR_S1_XN (ATTR_S1_PXN | ATTR_S1_UXN) -#define ATTR_S2_XN(x) ((x) << 53) +#define ATTR_S2_XN_SHIFT 53 +#define ATTR_S2_XN(x) ((x) << ATTR_S2_XN_SHIFT) #define ATTR_S2_XN_MASK ATTR_S2_XN(3UL) #define ATTR_S2_XN_NONE 0UL /* Allow execution at EL0 & EL1 */ #define ATTR_S2_XN_EL1 1UL /* Allow execution at EL0 */ @@ -95,7 +96,8 @@ typedef uint64_t pt_entry_t; /* page table entry */ #define ATTR_S1_nG (1 << 11) #define ATTR_AF (1 << 10) /* When TCR_EL1.DS == 0 */ -#define ATTR_SH(x) ((x) << 8) +#define ATTR_SH_SHIFT 8 +#define ATTR_SH(x) ((x) << ATTR_SH_SHIFT) #define ATTR_SH_MASK ATTR_SH(3) #define ATTR_SH_NS 0 /* Non-shareable */ #define ATTR_SH_OS 2 /* Outer-shareable */ @@ -106,24 +108,31 @@ typedef uint64_t pt_entry_t; /* page table entry */ #define ATTR_OA_51_50_DELTA (50 - 8) /* Delta from address to pte */ #define ATTR_S1_AP_RW_BIT (1 << 7) -#define ATTR_S1_AP(x) ((x) << 6) +#define ATTR_S1_AP_SHIFT 6 +#define ATTR_S1_AP(x) ((x) << ATTR_S1_AP_SHIFT) #define ATTR_S1_AP_MASK ATTR_S1_AP(3) #define ATTR_S1_AP_RW (0 << 1) #define ATTR_S1_AP_RO (1 << 1) #define ATTR_S1_AP_USER (1 << 0) #define ATTR_S1_NS (1 << 5) -#define ATTR_S1_IDX(x) ((x) << 2) -#define ATTR_S1_IDX_MASK (7 << 2) +#define ATTR_S1_IDX_SHIFT 2 +#define ATTR_S1_IDX(x) ((x) << ATTR_S1_IDX_SHIFT) +#define ATTR_S1_IDX_MASK (7 << ATTR_S1_IDX_SHIFT) -#define ATTR_S2_S2AP(x) ((x) << 6) +#define ATTR_S2_S2AP_SHIFT 6 +#define ATTR_S2_S2AP(x) ((x) << ATTR_S2_S2AP_SHIFT) #define ATTR_S2_S2AP_MASK 3 #define ATTR_S2_S2AP_READ 1 #define ATTR_S2_S2AP_WRITE 2 -#define ATTR_S2_MEMATTR(x) ((x) << 2) +#define ATTR_S2_MEMATTR_SHIFT 2 +#define ATTR_S2_MEMATTR(x) ((x) << ATTR_S2_MEMATTR_SHIFT) #define ATTR_S2_MEMATTR_MASK ATTR_S2_MEMATTR(0xf) #define ATTR_S2_MEMATTR_DEVICE_nGnRnE 0x0 -#define ATTR_S2_MEMATTR_NC 0xf +#define ATTR_S2_MEMATTR_DEVICE_nGnRE 0x1 +#define ATTR_S2_MEMATTR_DEVICE_nGRE 0x2 +#define ATTR_S2_MEMATTR_DEVICE_GRE 0x3 +#define ATTR_S2_MEMATTR_NC 0x5 #define ATTR_S2_MEMATTR_WT 0xa #define ATTR_S2_MEMATTR_WB 0xf