From nobody Mon Feb 9 16:28:36 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 4f8qrN5r7Pz6Rg5T for ; Mon, 09 Feb 2026 16:28:36 +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 4f8qrN3zLTz3PVR for ; Mon, 09 Feb 2026 16:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770654516; 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=Sbtz6MNTael7QmYHRRojXIG3RWH+mRu1085vbHDvwg4=; b=IPhnh1h6QA/1oCeL8CMACOTqJSTrCPlKRqrFfbd2iXR77zEDgvv/aE6jopEhWPQhSMzisv iG0mjk3eW44lgmqMAz/uW4vw6L85OG8H67HVjYDEH0dKumJ0q/xmb7paA3+bi7BbIhrF6F XZg0E3j/6G45AxQnAAdhJdwPsSiTYHJ/HznlJL5iLLWWTriTAhXWn/J5D2Z6h4xat1jZ7C bFdyzydi60v0ZlzlrRVmD15PfEWyEW1A7HWSSCLrZeucaoQnbWARy2xeJN03kWcDOsUn1p bdbX74KCacxzQ26HH1eFmfDHFdgFHTcIgt2mhRfwiHY4PhI6NOOddBN1FJ9hDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770654516; a=rsa-sha256; cv=none; b=tSEmy6/G2gwJHplkWgVL+IZaiBzmdPc4P5DluZ38PclWe/sK/qoKaeUCnq47pcZlJzrHlN XKrHQcae2JnNdSzMCkuxopsuwCjrJdABIgDustKaODpk3SQGTJr0wUz0rhoLowANVdclLa Xit+DDN+FLbBLDD4/v6jLJc+BKNvvzMfjYq21YZ9gIlVYU6wVLpTRIAI6jC42cwAJEDFg1 L6JCLnS0aS1QfEq+WgamyhsY9FQCGsy7m73hpFNxpzFD7W+2dqEPrB3UaSr0pKXu//05Yc f0ngYzSc5Ous0PV5EIWMzLj5N9qGUKwgP/4YYr2IY+NYQHaekrC7iZ1Bhptx0g== 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=1770654516; 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=Sbtz6MNTael7QmYHRRojXIG3RWH+mRu1085vbHDvwg4=; b=imSEkHdAl/mmK1bgSlnYgoA/Oosr9DTIs/t5KvOkW6r9IozCYQbvsft/YO4856Vr2pfcDq MvFSwhyVbfjkMaHLPvMYvfjgI9jj1W3wFTw2FOSY+m3uO5+uSVFluK2mMcGPecluE/oqcv mKr+/230Y2IjBwwb9S3lomg/cbe27WoXjTmnisP7z7qruPVyYjdBdoRzSEIDW8gm839dii VvnznTj5L3BNYFN60yPAyUZnQRfqGoWtRUu8Okml5XhkvSD5U7EpZ/IWlDoYQyNrVwFCBr ENq71cXEUI+Yahf5Y0RiE7mg0gh1nuyjWEqMyqztEa1/j9UefWuj3lej3kPN2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8qrN3Txvzgyw for ; Mon, 09 Feb 2026 16:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d0ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 16:28:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Harry Moulton From: Andrew Turner Subject: git: 5b818d9f3f4d - stable/15 - arm64: Fix MAIR_ATTR_MASK 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5b818d9f3f4d478f13df8478c1ac209d276ce3f4 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 16:28:36 +0000 Message-Id: <698a0b34.1d0ef.1f800f2b@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5b818d9f3f4d478f13df8478c1ac209d276ce3f4 commit 5b818d9f3f4d478f13df8478c1ac209d276ce3f4 Author: Harry Moulton AuthorDate: 2026-01-07 14:20:19 +0000 Commit: Andrew Turner CommitDate: 2026-02-09 14:51:59 +0000 arm64: Fix MAIR_ATTR_MASK Use the correct value when calculating the mask. (commit message by andrew@) Sponsored by: Arm Ltd (cherry picked from commit bdaa120b30006d7ef841a966414795416ce93eea) --- sys/arm64/include/armreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 28dec3a40b26..138a1eff51ac 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1982,7 +1982,7 @@ #define MAIR_EL1_CRn 10 #define MAIR_EL1_CRm 2 #define MAIR_EL1_op2 0 -#define MAIR_ATTR_MASK(idx) (UL(0xff) << ((n)* 8)) +#define MAIR_ATTR_MASK(idx) (UL(0xff) << ((idx) * 8)) #define MAIR_ATTR(attr, idx) ((attr) << ((idx) * 8)) #define MAIR_DEVICE_nGnRnE UL(0x00) #define MAIR_DEVICE_nGnRE UL(0x04)