From nobody Mon Sep 25 11:00:44 2023 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 4RvKfj1c75z4vNGd; Mon, 25 Sep 2023 11:00:45 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RvKfj0vz1z3LX0; Mon, 25 Sep 2023 11:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639645; 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=X21NIbzR1R0ZnUPKCuUKePA86hGPiUHkMg/6HG4Bg1E=; b=ZnJ5DNONrzYkmkLS9gkNz+2VLQUmlAJnacRXldLP960VYBNFIPHbO+y6Aba/e8kAKCU9KO uvfrMmXipwVjfGtqUvR712ag6aA88nfht62rtsqdp9TUxwTokprEydjg6YyeTBvq918Gyv 1cEfx7ZbIEhQMsdR38WeMYrONZhabu32Tn+CQK0R0EAaAQWt5olC8J4RGWhGDE5sIRvjGy nDVfZ8gXF7P/rXa7cq9SrnhlEtXlWh38y15P7BzVwc9cC5H11F6zrFTiw0BWeZnDsoPZUQ dDA4RvLYXc6AlK9DOaCAp9CuAhiTT2cfF+A6/f7LoxmjiEqwcxbOSEw+Z9uSog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695639645; a=rsa-sha256; cv=none; b=yW/Lur4OdUvC1KEou40iRf3pLbSryhh6+j4YQWke3XcqQTZknotfZ9hKwpkuwitE4lDEQR /lJpIslhWnlud6Y2FWMoJYSkoiIIgLEAHL6ZVtVuEL8CyuzTmk+G5KCgEzVAJBqruvvokp Xsu9ZZinZzBeYVR+sWmzq1f8GmF1q9dlj2pgxJjDX5gZ0qHN/dw6jjslEcSc4MLKV7Acqm ggFyb3ZnjI3hy0RpcY9sNHt3yVJWcCVt2wB7NpxMWyykOgDIHy1bnX0AJzvvJEeiPjAp0Q LcdUGsND/I50K156VL58wdUVoCa8mvVKoK9Y5k3sXdUo0QLS48ELL/DsQl2P6g== 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=1695639645; 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=X21NIbzR1R0ZnUPKCuUKePA86hGPiUHkMg/6HG4Bg1E=; b=W1HNG4fhcA1NmrngRm8L/ZSZLm+BDr8O/hsRFgv9R90KiNtH0/mZn5xsUS2/NpBx6ySM12 XqdKwkRzf54UALsTioIRiRBaKs1f6e4Z5DD2dP44SXJcnALuALbw0Ixa/i+nr/pB5b9OH5 vA8/Jtmq7XVWqt0rXL3ifO+93Q+9FlvO+pl8JPMDc/Vi57JaK/+2egKG07T2T1NittWkjs S+45kpr8N4ThhZ9w2JTQeuuS2YegRMghyzg87F4hMZXiBuEUZUqVq4ZdhK2A03GcBEElGI RXoFF/OaIh8uBiXaNniInMC+UMInD4C4HEJf+UrLYyrDmwhO9L9QWRjLaglpww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RvKfj019cz1QMd; Mon, 25 Sep 2023 11:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38PB0ijk052411; Mon, 25 Sep 2023 11:00:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PB0iBC052408; Mon, 25 Sep 2023 11:00:44 GMT (envelope-from git) Date: Mon, 25 Sep 2023 11:00:44 GMT Message-Id: <202309251100.38PB0iBC052408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: c1a1e8368b53 - stable/13 - Mark arm64 mair_el1 fields as unsigned long 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: c1a1e8368b53009efe11fd31990182de2d9f5962 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c1a1e8368b53009efe11fd31990182de2d9f5962 commit c1a1e8368b53009efe11fd31990182de2d9f5962 Author: Andrew Turner AuthorDate: 2023-03-16 16:19:21 +0000 Commit: Andrew Turner CommitDate: 2023-09-25 08:41:15 +0000 Mark arm64 mair_el1 fields as unsigned long The register is 64-bit so the upper bits could be shifted past the signed 32-bit size of an int the values were before. Sponsored by: Arm Ltd (cherry picked from commit a671f96d9319d63e4a634f88ae277c4d682bba69) --- sys/arm64/include/armreg.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 6ca4454a3806..6996ea4556ae 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1173,13 +1173,13 @@ #define ID_ISAR5_VCMA_IMPL (UL(0x1) << ID_ISAR5_VCMA_SHIFT) /* MAIR_EL1 - Memory Attribute Indirection Register */ -#define MAIR_ATTR_MASK(idx) (0xff << ((n)* 8)) +#define MAIR_ATTR_MASK(idx) (UL(0xff) << ((n)* 8)) #define MAIR_ATTR(attr, idx) ((attr) << ((idx) * 8)) -#define MAIR_DEVICE_nGnRnE 0x00 -#define MAIR_DEVICE_nGnRE 0x04 -#define MAIR_NORMAL_NC 0x44 -#define MAIR_NORMAL_WT 0xbb -#define MAIR_NORMAL_WB 0xff +#define MAIR_DEVICE_nGnRnE UL(0x00) +#define MAIR_DEVICE_nGnRE UL(0x04) +#define MAIR_NORMAL_NC UL(0x44) +#define MAIR_NORMAL_WT UL(0xbb) +#define MAIR_NORMAL_WB UL(0xff) /* MDCCINT_EL1 */ #define MDCCINT_EL1 MRS_REG(MDCCINT_EL1)