From nobody Fri Jul 28 12:08:00 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 4RC5xX6FlCz4pyPt; Fri, 28 Jul 2023 12:08:00 +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 4RC5xX5q68z42X5; Fri, 28 Jul 2023 12:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690546080; 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=XpXtftRSANknJ4UK9y4HrUDZ+vON4SuMFJm4oowoCQs=; b=pILrDj1ONvWGXu83BCd2PrnDzf0CXyzB1sbgzKPCZ63rwnWS9FLDfEttHfWr3tayrbgtzQ 2IWkzmprqug/18UVmgPSRcmp4xiU8UBbWKl8uS4YZUG3k/uyDwSm0RNZrquZdExspOYR+B dusP1TqTxhCdgsPOYBL44Ch4Zz2Y5gRoYV+HJFcUbkUClcqKmP/3ImhTDB413SnINFgJnF 5RaU/QB1idoRbVKs8B1c3V7hl4LMMSIk4K2fF0cmC8ygkRCWwUI1URZa3M8szefGyMWCTV 0/MsL2Z0DVAnKnsSPOp1g+bSYQrpQev8ecS1HunJ8lKncxw2euqExPsZhuozFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690546080; 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=XpXtftRSANknJ4UK9y4HrUDZ+vON4SuMFJm4oowoCQs=; b=Aixm2qDPqFq9Af7RWVOKFIJIrgbLIpzyubnQjNxNFnlrO2HUSMhrl/AZIeVV/iGyXx6Xqr qgp5+sWQxhqZ0c53Of7huE2VKwQXqrNobNxXgGvmYrimiy8y0d50tvY5tg0XMnnnz6KoLB 1F58j+fJwPptMil6EJL8Jt06GNTQF9A3tSiYJ4/2apGA7WW8SbtWLD0qBsIFxWY8NSsuIR 4liV3ne86ZMbMF23oELGmdWyt/kIJpUP/QlGt4Cl6inanN0EzNcKDOb66R0pf4gm+cCsEp Wj2xKNSUR+KXHj57KWDBJIPZKf/i209yzBRB9ztXX2qO5UVWOTTQPZbdzKaG/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690546080; a=rsa-sha256; cv=none; b=gdEV1D1LomX54GOboHuabZBHMKep7/wXt+mdcZtfX9W3f3VJRzbkKAeDMnmWvvk5qK86hS i5wNdc6VUGXooZHNV+XyDsntBWoOaKv6iyXioburh8ibslPwd0xlb33dCZOQf1+qX7On7I YUVIBiZJ4FDBX2zx16vq28jy5j+ifvnx6G5MFQv8SPeYYlrFIjbP7g5PDKqSSALHCEwUVC +n/BC2f7YvJ8uBRAdBl38bDp+AbC/RIuPah+2Bt7BI0TYJlXUXSkn9xQ6hfZrJJvAz/Pk3 u6uVGKyIxVBAsxnryZwWaoIJ9SpLJqvmnkLf9shsQbp9z83wOyi4D/OxZEpZcg== 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 4RC5xX33Svzqcs; Fri, 28 Jul 2023 12:08:00 +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 36SC80Sp062046; Fri, 28 Jul 2023 12:08:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36SC801n062043; Fri, 28 Jul 2023 12:08:00 GMT (envelope-from git) Date: Fri, 28 Jul 2023 12:08:00 GMT Message-Id: <202307281208.36SC801n062043@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: 4182f58172b5 - main - arm64: Update the ID_AA64ISAR0_EL1 fields 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: 4182f58172b56f71bfaf2450a0e9cb8b4397bf0a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4182f58172b56f71bfaf2450a0e9cb8b4397bf0a commit 4182f58172b56f71bfaf2450a0e9cb8b4397bf0a Author: Andrew Turner AuthorDate: 2023-07-06 09:19:21 +0000 Commit: Andrew Turner CommitDate: 2023-07-28 11:53:01 +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 --- 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 fc75eec05129..af5914034db4 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -572,6 +572,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, @@ -644,6 +649,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 15346bcce8ab..3610a59834b1 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -570,11 +570,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) @@ -602,6 +602,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)