From nobody Thu Mar 16 16:46:12 2023 X-Original-To: dev-commits-src-main@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 4PctSP1YJwz3yKZ6; Thu, 16 Mar 2023 16:46:13 +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 4PctSP08KJz3n4X; Thu, 16 Mar 2023 16:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678985173; 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=TYo4Hf7my/rkQ3c2KqikJ2WN7C9GPRtwLcA6aTnCPMc=; b=doN+23sFXPOHe1TP7CeUzyLDk4Px4kq9mZxnoHC0p7CK6nIpBDBWeDrdVF6YSvETAu2tN8 akju/UYlamoJOkiBbPSs2k8weJj0XgztlGWU7WTyLVCBW92zp87sIsRa/phCcSP/ggul5M mBjPIqEX2HmUrDxCp1PxfX3c/wxDHBTrEnRC0uV+A9T4umSHyxVvlzZZkydFtVgliD6ZZ8 /eIEqCoLT2N6riYKaysAlU1dNAvXIg3xkQdkml0B+U81/ewLQXlzryBqQ7PjrMllQ5tqiv aKDF/Yk4wDw/imxSOHEyC82gKJDfdE+0rqwaFwzWw6+UlmKEEijrCTcEAvJV1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678985173; 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=TYo4Hf7my/rkQ3c2KqikJ2WN7C9GPRtwLcA6aTnCPMc=; b=ay3tzYKUZAmvpLtaAAhOcsdEQ2Y2+jcQ07csyJn/BTgOF+hzrtlkvclOL7kNTmxs4GyJcl QoYoWKxjmWn+kkal56hdev4yuL8GeB/mg/vhkiB2xlr/HbJPkXcwh9Q8SSdwD+9nUPmV4t FuCNftWOgR1UO07O8J6d/f4ill1tn7EvruprDeowJinJNj2zcJXjDJZCTJV/QqcfV/8iFl bb15GehQ8ixtcookKW0R8uehU/vARAcTS3141BJPchbRxNtWFKe5z5Sfda409PNoDR2T32 mTQFv2P0EpuP7qigCKyfJHuUm48lYaJl+wuYPeobrDU55E01lkSq3Pj3uYqdRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678985173; a=rsa-sha256; cv=none; b=xrsS2Toh5CUoCuvgPH/vK8+W54289gdKalljtU90UrP8pdcyVlyW64vm9y4dyEYgzNWl/g jjZChyIlHXlf1gUaZMbHW1yj4oAnWYafiaQxcAxg5Wndelb+Z4BiBMHAUdn2ktE81IpMA1 LDiBgQYtQ7vmQp/wcudI7x8B0i4y7z3e/oZVB0HsMiFyGi5QhmRoDJbUpWkiSt4/fG7hMC FAlrEvWwhKDKybGYDQyxinWSGwhJjWmFWy0HiHf/h7puATs/2l+Cz/G+t8y8F2PbzQ+hfA Yt7HE0LfoNV7ICLf8DNwIM0iiWvh9rfkHuqyNuKwqteVTS0SRyMHZPhbBFW2DA== 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 4PctSN65nDzqjd; Thu, 16 Mar 2023 16:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32GGkC9V022293; Thu, 16 Mar 2023 16:46:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32GGkCv3022292; Thu, 16 Mar 2023 16:46:12 GMT (envelope-from git) Date: Thu, 16 Mar 2023 16:46:12 GMT Message-Id: <202303161646.32GGkCv3022292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a671f96d9319 - main - Mark arm64 mair_el1 fields as unsigned long List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: a671f96d9319d63e4a634f88ae277c4d682bba69 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a671f96d9319d63e4a634f88ae277c4d682bba69 commit a671f96d9319d63e4a634f88ae277c4d682bba69 Author: Andrew Turner AuthorDate: 2023-03-16 16:19:21 +0000 Commit: Andrew Turner CommitDate: 2023-03-16 16:45:42 +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 --- 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 b24c6ec94c65..6ecd791fd87b 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1155,13 +1155,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)