From nobody Mon Sep 25 11:01:05 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 4RvKg5541Yz4vNSM; Mon, 25 Sep 2023 11:01:05 +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 4RvKg53lYNz3N4k; Mon, 25 Sep 2023 11:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639665; 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=t3c4PvcZJjG+7yrjzpTgWxdlerXMbrRW0fUG+wL8QN8=; b=ITb0mHkH4NvYdG5dXYJBMBOb7EF/pvSygyrWBEBnPEpKaVkBxjz3ww01Rhuyp9lrUK31Q+ 8u60pgloY6k6RUTetlg463ijFOfXjdE5n2Ihj3mxPECXVifDQ599BuA0zQIFPXUCMeiQLn VnHPhTn0pWDaLJBjSTJCPOUwqjxoBZ1X/m2mfmKBtkQkCBFzKO9PoXL72iHCkRm52JgVZL u2R1dBqeQveU6cq6seI99OgbmH9ePPUGUXbM9Xl8Uhc4l7o1+Fy9vQy3VHueHeE+soyQL/ zVgxKdUa32CFibfkivmkXuZUHsmdR2sNUSdsb6GRW3+AUoS/j2WD4cDF5zGPHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695639665; a=rsa-sha256; cv=none; b=qXysxaqD2Jv45QJJvMH5W5BUT7QvdDVnUKYELZXKl41cEyiLm3AEgNi1IrMYD9iV0NyO7x WCSDFzYtEWvpXjCtXOqAvd7HNc8Js8win0qQv66C24F1T26nLqvKj0DunSxoEYQMgvMLlB Jri9nwC/cReFd9lj9kvTPlC/OBwlTgOMfPw27HrUbtcvHY05F/nRse5r9qNYMqpFoS4r81 LsLoLyAW2Vy3ZHhSiMGcI3ipSC99y3RoHZsmQ+4XYz4M+fwC8XfDIf8O78a7v3AxcVHHFD 9kP2gcWxzu7wA217UvTE2hbAOFOvTVZsIbg+/DsYtp2jENcxkjo3S7/Hhin0Hg== 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=1695639665; 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=t3c4PvcZJjG+7yrjzpTgWxdlerXMbrRW0fUG+wL8QN8=; b=myptHZayAkygUYvnBshtC5sGxdFjE6ozCwszNSpoQgrtmfeXE+5YxXaKDpSkQOj640GnbC ogQifXKAV73H5dQr0OMH9jrpxfU+zyDG64Ry8Wg5RHLk8/7JReFhcmGggh76B3TUyVZdAy wxuRrLBuefXYoN4PrA06+cJD19rrxudlIhBR0YfhwGI7CSlNq2rVTAcgs5t+/3IuwLTTN1 4AzyS2ZAm9eNv2jegtrpKBCdtYWGR2JbntNW/kZxCtR39VuBWwtM3L69PW1xz5pvkFTq6O KBpflf77cA4FBPDSMIwjv9//Udzzhh44OeZXt54MyAUIAH2TOB7pKLCyv9EJCA== 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 4RvKg52qLqz1QHC; Mon, 25 Sep 2023 11:01:05 +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 38PB15k6053261; Mon, 25 Sep 2023 11:01:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PB15H8053258; Mon, 25 Sep 2023 11:01:05 GMT (envelope-from git) Date: Mon, 25 Sep 2023 11:01:05 GMT Message-Id: <202309251101.38PB15H8053258@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: 2573723a5178 - stable/13 - arm64: Update the ID_AA64ISAR0_EL1 fields 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: 2573723a51786736882ccfe704af92117e30223b Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2573723a51786736882ccfe704af92117e30223b commit 2573723a51786736882ccfe704af92117e30223b Author: Andrew Turner AuthorDate: 2023-07-06 09:19:21 +0000 Commit: Andrew Turner CommitDate: 2023-09-25 08:41:33 +0000 arm64: Update the ID_AA64ISAR0_EL1 fields While here move to decimal for the _op and _CR definitions to be used by a future macro to define the register when the assembler doesn't know about it. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D40888 (cherry picked from commit 4182f58172b56f71bfaf2450a0e9cb8b4397bf0a) --- sys/arm64/arm64/identcpu.c | 6 ++++++ sys/arm64/include/armreg.h | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 1d14ff026be8..8851cd952b7b 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -542,6 +542,11 @@ static const struct mrs_field_hwcap id_aa64isar0_rdm_caps[] = { MRS_HWCAP_END }; +static const struct mrs_field_value id_aa64isar0_tme[] = { + MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ISAR0, TME, NONE, IMPL), + MRS_FIELD_VALUE_END, +}; + static const struct mrs_field_value id_aa64isar0_atomic[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ISAR0, Atomic, NONE, IMPL), MRS_FIELD_VALUE_END, @@ -614,6 +619,7 @@ static const struct mrs_field id_aa64isar0_fields[] = { id_aa64isar0_sha3_caps), MRS_FIELD_HWCAP(ID_AA64ISAR0, RDM, false, MRS_LOWER, id_aa64isar0_rdm, id_aa64isar0_rdm_caps), + MRS_FIELD(ID_AA64ISAR0, TME, false, MRS_EXACT, id_aa64isar0_tme), MRS_FIELD_HWCAP(ID_AA64ISAR0, Atomic, false, MRS_LOWER, id_aa64isar0_atomic, id_aa64isar0_atomic_caps), MRS_FIELD_HWCAP(ID_AA64ISAR0, CRC32, false, MRS_LOWER, diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index b357e77d7e75..1c9ea3b630f4 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -591,11 +591,11 @@ /* ID_AA64ISAR0_EL1 */ #define ID_AA64ISAR0_EL1 MRS_REG(ID_AA64ISAR0_EL1) -#define ID_AA64ISAR0_EL1_op0 0x3 -#define ID_AA64ISAR0_EL1_op1 0x0 -#define ID_AA64ISAR0_EL1_CRn 0x0 -#define ID_AA64ISAR0_EL1_CRm 0x6 -#define ID_AA64ISAR0_EL1_op2 0x0 +#define ID_AA64ISAR0_EL1_op0 3 +#define ID_AA64ISAR0_EL1_op1 0 +#define ID_AA64ISAR0_EL1_CRn 0 +#define ID_AA64ISAR0_EL1_CRm 6 +#define ID_AA64ISAR0_EL1_op2 0 #define ID_AA64ISAR0_AES_SHIFT 4 #define ID_AA64ISAR0_AES_MASK (UL(0xf) << ID_AA64ISAR0_AES_SHIFT) #define ID_AA64ISAR0_AES_VAL(x) ((x) & ID_AA64ISAR0_AES_MASK) @@ -623,6 +623,10 @@ #define ID_AA64ISAR0_Atomic_VAL(x) ((x) & ID_AA64ISAR0_Atomic_MASK) #define ID_AA64ISAR0_Atomic_NONE (UL(0x0) << ID_AA64ISAR0_Atomic_SHIFT) #define ID_AA64ISAR0_Atomic_IMPL (UL(0x2) << ID_AA64ISAR0_Atomic_SHIFT) +#define ID_AA64ISAR0_TME_SHIFT 24 +#define ID_AA64ISAR0_TME_MASK (UL(0xf) << ID_AA64ISAR0_TME_SHIFT) +#define ID_AA64ISAR0_TME_NONE (UL(0x0) << ID_AA64ISAR0_TME_SHIFT) +#define ID_AA64ISAR0_TME_IMPL (UL(0x1) << ID_AA64ISAR0_TME_SHIFT) #define ID_AA64ISAR0_RDM_SHIFT 28 #define ID_AA64ISAR0_RDM_MASK (UL(0xf) << ID_AA64ISAR0_RDM_SHIFT) #define ID_AA64ISAR0_RDM_VAL(x) ((x) & ID_AA64ISAR0_RDM_MASK)