From nobody Mon Sep 25 11:01:09 2023 X-Original-To: dev-commits-src-branches@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 4RvKgB1C4mz4vNh0; Mon, 25 Sep 2023 11:01:10 +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 4RvKgB0Kz0z3NBm; Mon, 25 Sep 2023 11:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639670; 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=jBppG5loPkFk8cJoV5cMl/wXMhX79b+hlq0lvtG2GoI=; b=ZBXUNfSt53Sp4fLbT7CXf3tWEXXEhaYkJ6nQldodMw7bG09AP2uM0Omfy0K71YFPPON+s+ FJj0DNP4g/IlOXMPkXNY+bljQG4xvzSQeVRA3xjpn6HbbptxGFtwWEP88wqjZh4vSEWgo+ VCXUqW2esErMjhaYdTWFnQWY1h/+8MmQh+OVPBW3p6lChED1/f8hfhsm5qpnarY4fqGH9W EJ2qbp9TKobZkgR5ZWFlnG0FSKMRFMWUUsZpSuuvhexyB5Nvx/AfyAkKsgTkFxNn78gGSO mANeziTPQPjlmStYBrQiVlJRZWrjuXVeOebbID0SW59zZsywns1lIJ29XR8B/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695639670; a=rsa-sha256; cv=none; b=eUITSPW08WLXEHG2wQDao6gNQue1X1XfH4udAXMwb6xdH10JAr5916RzofZnyoeCUq4lVL fqH0h0ZGW7MdkD+h7PGKyrrV6lew6xA6o3jr+BpKBgduvuB5+iWINYFxCoW0o3uTj0XbKg zAeFhGkv1xgUan0ysOo9cwyBpoemUi8OhCPAls5ZoWiIjPBJ2Uvg4t+05mYalhUQjrveef HAw0G3fO0y5/t7NLrF0p73k4ezW+g9z9pcmmkYFxASCnWO1Nen+BQ7nE+zJQZFd1vU0Cyr DHOXhK/wbu3ZM2HjnuCLc5hXh3CWcHAIjzfjWv6GH8C4/uAa6XBB/iNiuYpZKg== 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=1695639670; 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=jBppG5loPkFk8cJoV5cMl/wXMhX79b+hlq0lvtG2GoI=; b=vG8p4fyzYvWapRCVy0gzYrc7uZR193LGCnG73XGnQX9iv9/Qfg59kAvbaydh38OWEH2zm9 YsrBkpVJRLyj+ksG9yVguuQyChJR4qOGnpXkFW8DufK1kGkuC4Qjozi14eDbkGmUWqnY+e bJZchyq8wJkId6+VoDYGIrJ5FmXXDSnSaQ+KAv7ar3vktGDd8wuM+r938e0hJmKI3Om11+ 0iMC62g7rABFq2DnfQ8fRQE4pVyy5Jfl51zLkaW0+l5kVJww2ksrdcpJtbsKD0gDN2L+mV LqYf5rtwBbsY50zWtVYD+ys1/JltX3ekRdFV/uO2uHWLoHiWggpWhv3RMmuWBg== 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 4RvKg96PNvz1Q8H; Mon, 25 Sep 2023 11:01:09 +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 38PB19mA053439; Mon, 25 Sep 2023 11:01:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PB19s4053436; Mon, 25 Sep 2023 11:01:09 GMT (envelope-from git) Date: Mon, 25 Sep 2023 11:01:09 GMT Message-Id: <202309251101.38PB19s4053436@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: e887138417fd - stable/13 - arm64: Don't use hex for ID_AA64MMFR2_EL1_op/CR* List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e887138417fd73837b3b6f242a8e765046e1517a Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e887138417fd73837b3b6f242a8e765046e1517a commit e887138417fd73837b3b6f242a8e765046e1517a Author: Andrew Turner AuthorDate: 2023-07-06 13:15:12 +0000 Commit: Andrew Turner CommitDate: 2023-09-25 08:41:33 +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 (cherry picked from commit 2134cfe793d67e3bc6ec0713862168452f4ad8f0) --- 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 afaf9407217b..80828259f23a 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1003,11 +1003,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)