From nobody Tue Jan 13 17:00:55 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 4drFr73KQkz6NQbH for ; Tue, 13 Jan 2026 17:00:55 +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 4drFr71PBvz3cTR for ; Tue, 13 Jan 2026 17:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768323655; 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=GRq60NUUHelTkTQX5y707HoZLN3QnCP0C9LPhAJyZ/s=; b=ip8dZD7IzWdcwex4zfbHYh3vuLzXQRH3VOa+Anl4u86d7EV28toukdZl6Am5hS465FTiRe rZ/jR+jjnNEshmZWtP+QvqLkXyXAT0CIqVDaOKcUcIEmOssYb9Q81+EYELIG+Mduw40CPS YyptKAxVeSQsW7cJ2eInxY/yY86pDiVzh0Kty3BK1klOHTRAbOCXWk3ubOiD0VdlD0A3IZ 0H1W7USbmJ6kY3V/CNcBYhNqeAgtk2D0HDQ5GbgsSY+odoqy+ssnu0uYYMm9lltX/BQcUQ YfmQGTWdsusuhW/fWNSCd3F6k+RjRmSeb4NtZ8C6OD2PPvKwYF8N/QWV2/r1Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768323655; 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=GRq60NUUHelTkTQX5y707HoZLN3QnCP0C9LPhAJyZ/s=; b=FacaKRm+zeCtKsEWpKofjlkyuq/ZTCovwsSA48yTZMhZagCxO6uRzNrsz8oNs2JMfKAa70 u4UZ6aXnTL1BuR+xzFTyjDYiCIMnCkZ3TrNA5Sx3CY3hb5poVSVHZRevyTHR1ZIAWkutYQ Ls4VkiLqK+5O69dCuifzog+hgbKvcFgxQ+Ek596bWYhldREFwIubLKjHKFTTKk4TIo9Nfy ZRbEGrdSsHvEHzVMPlIcGqchvE4szjomVSToLjfF/zORL3OxAvbu/7nY5At41gNcGGsfoq EEA4hOozgKr+bJQCSNRk68QOl166h6sm94hPdWvWE0pmDiUzyphRgmxgYxu3gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768323655; a=rsa-sha256; cv=none; b=tetFLyCelXvQgx2AcGSA9D+QkS5jys2pSYQZu1w4rdZKn5DlcabBHpF7AZQw/yDyfoddA6 5lM8rnpNhB/2H0eVJCRzQBOgH7EGWRLpBH3+fCOqjtCMbneTyZqJ8CAtY67W/uenYWOfw6 9V0/fq3yUjevPNg9HMSJIsKzOdf876l6kEWEiij4D6JhgxDxkFZTjXyRB2UWw/LtNK3Tnc QqfSV72WXRuld7y2rEs6q1/1fCUg1Rpbq5BZ9J8gsajBjyIfsyoqHZbC3AHDfDnGGSTc7b CtRM7rzffZpV1zSQ343zrLet5uu1Dcn8OyexC2jDhzTgob5lQPgCwnT2dcLfbg== 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 4drFr70Cskz5TB for ; Tue, 13 Jan 2026 17:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34c01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 17:00:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Harry Moulton From: Andrew Turner Subject: git: bdaa120b3000 - main - 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/main X-Git-Reftype: branch X-Git-Commit: bdaa120b30006d7ef841a966414795416ce93eea Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 17:00:55 +0000 Message-Id: <69667a47.34c01.3757c1ed@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=bdaa120b30006d7ef841a966414795416ce93eea commit bdaa120b30006d7ef841a966414795416ce93eea Author: Harry Moulton AuthorDate: 2026-01-07 14:20:19 +0000 Commit: Andrew Turner CommitDate: 2026-01-13 15:28:04 +0000 arm64: Fix MAIR_ATTR_MASK Use the correct value when calculating the mask. (commit message by andrew@) Sponsored by: Arm Ltd --- 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)