From nobody Fri Jul 28 12:08:04 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 4RC5xt0Gq4z4pyY0; Fri, 28 Jul 2023 12:08:17 +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 4RC5xd2KN7z42Yc; Fri, 28 Jul 2023 12:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690546085; 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=/VQZUwQagZFfsnizIj1Y3aB/9k8qqJdKzK6mi4CAbmw=; b=o1wmXq6u4AXzas0RSTnX3cfXJIqvCgHR1d7WCLQLpiz6I3cAdx7CadSJaerdarODNzevSw vzpVcKvmEjcCiC9Yc+4As5SfYK4fkfT0lWujaJpzxilJfQ/m8CeZE0QW3cX9J+notsp5b8 Dv5ZZ6EzxQU74jmsuFFjtkdnIBIgxGvCTqIR8MosVLG7Fu5DhqkVownfeh83hqSlUt34IR Ir/30baVRT7Tg4Vr8gyBuXAn0LpplOtv0wSA3tqlJ5tXWOVb1blH67bDT5j3zjbo0iejoo aWQACJMSJ1PtfYyNHCsKDyr3w+fUEBO45CI2b+3UeAqXAX6YGz3EozBuKbrC3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690546085; 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=/VQZUwQagZFfsnizIj1Y3aB/9k8qqJdKzK6mi4CAbmw=; b=QtsacGF3o64h+Q3dKTO3uQpeqPN2LQaBOyXqS/Wqa0i5DajOvhCn32fAs789du7oy3jcnx XurbAPihc0vFktDfeHtdFEA2JH/PX1UcnnZ1kOpa+wrKDlhJQtejrHZXvdZ8zi1Uy8R3cW pmIL7wchXxS+OdSi7WqO16Ns3MjyZw/YchoJWoYhCKkf8QKsWLh3ltxq8aNQ0y6T8Amgel sMGwQEWmavzxoR6adgsyq1uve2j9BqzzoZ4hAfJDR6AosEYR4ojnidq3elcWDO9+zqCfdK Tn8PprKAcdQO+XUljyv86FG9mmSeqyqWk8D8gKecqsbcyiD/EZuW7J0FoiT8SQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690546085; a=rsa-sha256; cv=none; b=mNVP7vEoIsdoknOrt9MX+2ksbfEIpV578qJJdD0xwrZYfnosdZwAyXo+CUjTxh4d9LYNAs MpQoJLSqAWiwJtD2YsM0DKPrQwczRIrLJaMhnkn60rJEO5eLThzstMs1El7KHGCB7mMbOt T72GWeSBlHrKO+Drp9fL8vh1D1dmGBwxzYYqr6tCyLjHpTz8vtLbRg+AVkHNglQrCOVY+O wOOL7mR8qpHv1AMX8SxRzeHg+Ao9M6fRhkbDKUaMYbcMLqY5Nv5cLU5VZZS/vlr0VILKUU bEx8q/ZCnyWFOSUQ7YUAZCY991O0HRTyNSTx/CHBPUDiyWN7ZlV8CQXdZdStsA== 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 4RC5xc6Zyczqr5; Fri, 28 Jul 2023 12:08:04 +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 36SC8419062131; Fri, 28 Jul 2023 12:08:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36SC84eH062130; Fri, 28 Jul 2023 12:08:04 GMT (envelope-from git) Date: Fri, 28 Jul 2023 12:08:04 GMT Message-Id: <202307281208.36SC84eH062130@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: 2134cfe793d6 - main - arm64: Don't use hex for ID_AA64MMFR2_EL1_op/CR* 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: 2134cfe793d67e3bc6ec0713862168452f4ad8f0 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2134cfe793d67e3bc6ec0713862168452f4ad8f0 commit 2134cfe793d67e3bc6ec0713862168452f4ad8f0 Author: Andrew Turner AuthorDate: 2023-07-06 13:15:12 +0000 Commit: Andrew Turner CommitDate: 2023-07-28 11:53:02 +0000 arm64: Don't use hex for ID_AA64MMFR2_EL1_op/CR* It breaks a future macro that creates the alternative register name for old compilers. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D40892 --- sys/arm64/include/armreg.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 3ef6e6a3f5e3..713e7b38a6a0 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -982,11 +982,11 @@ /* ID_AA64MMFR2_EL1 */ #define ID_AA64MMFR2_EL1 MRS_REG(ID_AA64MMFR2_EL1) -#define ID_AA64MMFR2_EL1_op0 0x3 -#define ID_AA64MMFR2_EL1_op1 0x0 -#define ID_AA64MMFR2_EL1_CRn 0x0 -#define ID_AA64MMFR2_EL1_CRm 0x7 -#define ID_AA64MMFR2_EL1_op2 0x2 +#define ID_AA64MMFR2_EL1_op0 3 +#define ID_AA64MMFR2_EL1_op1 0 +#define ID_AA64MMFR2_EL1_CRn 0 +#define ID_AA64MMFR2_EL1_CRm 7 +#define ID_AA64MMFR2_EL1_op2 2 #define ID_AA64MMFR2_CnP_SHIFT 0 #define ID_AA64MMFR2_CnP_MASK (UL(0xf) << ID_AA64MMFR2_CnP_SHIFT) #define ID_AA64MMFR2_CnP_VAL(x) ((x) & ID_AA64MMFR2_CnP_MASK)