From nobody Fri Jul 28 12:08:08 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 4RC5xt0H87z4pyY1; Fri, 28 Jul 2023 12:08:18 +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 4RC5xh3HWFz42Yw; Fri, 28 Jul 2023 12:08:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690546088; 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=qn0Dx1bJD6NwomHePW32t654YPVd3sxwJTCtgYMDJ+o=; b=aYZgfjkUKE7PwXuuIVwpOXV7mPRtYeQqE70/7RzRnOqIbsbFt/JMfLAd6dVxMbkz08b1MZ FqFOjWDqMRyP3dUFv/RWZH7NvBlHwGBr78sC01zLLQvNMC51axbLZET9kc7z24HMSxh8i7 TGUG1qtjGr+AGMX18/mYDMqnHONHncZ6oJcuwqG+Ik4AT63YjlkkjGJVvVU7udujooKBRa I26HC+kK2Q8azAfQ/p+lwCXe/9M5nKbBrL9CvnqCnA1vH7OdZ8+iQXzzEepiaUSQ0gZ9Og G5ndavzmRt3NOirtWWIBKFVeFcb5wGYwtJmVuZjYDnB3pMLP/8HN/I/p70l65g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690546088; 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=qn0Dx1bJD6NwomHePW32t654YPVd3sxwJTCtgYMDJ+o=; b=gOEHZ57X33OUXAegZzuKukb6LtRSsWZaPSKFJVZSuBjsFMIT6zgC6MTJYt6HHAYXOIuxMf ZRZWBFrK8vHjfwU+aprBEfzCoyW244ftjBjlwagLK7mOdFttvGfQ9s0lvf8x2YaUnfZc09 O9ElYbkZx3CYCsiGq98zSiNbb6a99nQYtjqW8v7KBVtWxBuD8+EbCKQZXWy7iaMkLyOc6O dVkUnZIRWS84Kilb+WNfrUqaT7VWkxf7vtfax/SL/aKNJC2iIjPy7oi1U3GV24pm969Buf uOkdKjC0CzG6GACdZl+AhXzLF/zTrk58h4brzVqcghUUT5r6MVAjMyObmIWkoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690546088; a=rsa-sha256; cv=none; b=xt9NRAsg56KJA+igv3/L02bu829xjq2/SU+1Av9bmwH7S64ckiCjkfbNVCo65SVeqKKUDA oAo5OVgUtvY0mUzN/jQCF8NF4Jvtou6QUkGSLTPEPZvaFO7r1IBuOwCtPf+CdJFaYJMDGC IA0P1dBMgywqxfGs4Tjt6Pkbk/YvNiv46NmIgW8mKkD6gHxW35dBYtO50iRbA/R0RsuUkY cS++0wZJeHYo7X9+A1kqIXwy4E4eFU3v4Zt7zPxtyDI8jLzXQashF9dQ5IeLjegdtoNJgd tSmGpn0bQRHIxs7Gcqs6aEySnjIkYpyOKgt7zFTZoBtI6HV2Nhiii7ryDwOFnA== 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 4RC5xh26Y8zqZR; Fri, 28 Jul 2023 12:08:08 +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 36SC88eX062193; Fri, 28 Jul 2023 12:08:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36SC88uD062192; Fri, 28 Jul 2023 12:08:08 GMT (envelope-from git) Date: Fri, 28 Jul 2023 12:08:08 GMT Message-Id: <202307281208.36SC88uD062192@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: 0766dde9b558 - main - arm64: Update the ID_AA64PFR0_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/main X-Git-Reftype: branch X-Git-Commit: 0766dde9b5587d04c634eda1ab4666203d32a271 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0766dde9b5587d04c634eda1ab4666203d32a271 commit 0766dde9b5587d04c634eda1ab4666203d32a271 Author: Andrew Turner AuthorDate: 2023-07-06 14:02:35 +0000 Commit: Andrew Turner CommitDate: 2023-07-28 11:53:02 +0000 arm64: Update the ID_AA64PFR0_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/D40895 --- sys/arm64/arm64/identcpu.c | 10 +++++++++- sys/arm64/include/armreg.h | 17 ++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index dabec74f5a19..91ba6beb63a4 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -1314,7 +1314,13 @@ static const struct mrs_field_value id_aa64pfr0_csv3[] = { static const struct mrs_field_value id_aa64pfr0_csv2[] = { MRS_FIELD_VALUE(ID_AA64PFR0_CSV2_NONE, ""), MRS_FIELD_VALUE(ID_AA64PFR0_CSV2_ISOLATED, "CSV2"), - MRS_FIELD_VALUE(ID_AA64PFR0_CSV2_SCXTNUM, "SCXTNUM"), + MRS_FIELD_VALUE(ID_AA64PFR0_CSV2_SCXTNUM, "CSV2_2"), + MRS_FIELD_VALUE(ID_AA64PFR0_CSV2_3, "CSV2_3"), + MRS_FIELD_VALUE_END, +}; + +static const struct mrs_field_value id_aa64pfr0_rme[] = { + MRS_FIELD_VALUE_NONE_IMPL(ID_AA64PFR0, RME, NONE, IMPL), MRS_FIELD_VALUE_END, }; @@ -1332,6 +1338,7 @@ static const struct mrs_field_hwcap id_aa64pfr0_dit_caps[] = { static const struct mrs_field_value id_aa64pfr0_amu[] = { MRS_FIELD_VALUE(ID_AA64PFR0_AMU_NONE, ""), MRS_FIELD_VALUE(ID_AA64PFR0_AMU_V1, "AMUv1"), + MRS_FIELD_VALUE(ID_AA64PFR0_AMU_V1_1, "AMUv1p1"), MRS_FIELD_VALUE_END, }; @@ -1424,6 +1431,7 @@ static const struct mrs_field_value id_aa64pfr0_el0[] = { static const struct mrs_field id_aa64pfr0_fields[] = { MRS_FIELD(ID_AA64PFR0, CSV3, false, MRS_EXACT, id_aa64pfr0_csv3), MRS_FIELD(ID_AA64PFR0, CSV2, false, MRS_EXACT, id_aa64pfr0_csv2), + MRS_FIELD(ID_AA64PFR0, RME, false, MRS_EXACT, id_aa64pfr0_rme), MRS_FIELD_HWCAP(ID_AA64PFR0, DIT, false, MRS_LOWER, id_aa64pfr0_dit, id_aa64pfr0_dit_caps), MRS_FIELD(ID_AA64PFR0, AMU, false, MRS_EXACT, id_aa64pfr0_amu), diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 47499f258534..f39fcfde0eaa 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1104,11 +1104,11 @@ /* ID_AA64PFR0_EL1 */ #define ID_AA64PFR0_EL1 MRS_REG(ID_AA64PFR0_EL1) -#define ID_AA64PFR0_EL1_op0 0x3 -#define ID_AA64PFR0_EL1_op1 0x0 -#define ID_AA64PFR0_EL1_CRn 0x0 -#define ID_AA64PFR0_EL1_CRm 0x4 -#define ID_AA64PFR0_EL1_op2 0x0 +#define ID_AA64PFR0_EL1_op0 3 +#define ID_AA64PFR0_EL1_op1 0 +#define ID_AA64PFR0_EL1_CRn 0 +#define ID_AA64PFR0_EL1_CRm 4 +#define ID_AA64PFR0_EL1_op2 0 #define ID_AA64PFR0_EL0_SHIFT 0 #define ID_AA64PFR0_EL0_MASK (UL(0xf) << ID_AA64PFR0_EL0_SHIFT) #define ID_AA64PFR0_EL0_VAL(x) ((x) & ID_AA64PFR0_EL0_MASK) @@ -1176,17 +1176,24 @@ #define ID_AA64PFR0_AMU_VAL(x) ((x) & ID_AA64PFR0_AMU_MASK) #define ID_AA64PFR0_AMU_NONE (UL(0x0) << ID_AA64PFR0_AMU_SHIFT) #define ID_AA64PFR0_AMU_V1 (UL(0x1) << ID_AA64PFR0_AMU_SHIFT) +#define ID_AA64PFR0_AMU_V1_1 (UL(0x2) << ID_AA64PFR0_AMU_SHIFT) #define ID_AA64PFR0_DIT_SHIFT 48 #define ID_AA64PFR0_DIT_MASK (UL(0xf) << ID_AA64PFR0_DIT_SHIFT) #define ID_AA64PFR0_DIT_VAL(x) ((x) & ID_AA64PFR0_DIT_MASK) #define ID_AA64PFR0_DIT_NONE (UL(0x0) << ID_AA64PFR0_DIT_SHIFT) #define ID_AA64PFR0_DIT_PSTATE (UL(0x1) << ID_AA64PFR0_DIT_SHIFT) +#define ID_AA64PFR0_RME_SHIFT 52 +#define ID_AA64PFR0_RME_MASK (UL(0xf) << ID_AA64PFR0_RME_SHIFT) +#define ID_AA64PFR0_RME_VAL(x) ((x) & ID_AA64PFR0_RME_MASK) +#define ID_AA64PFR0_RME_NONE (UL(0x0) << ID_AA64PFR0_RME_SHIFT) +#define ID_AA64PFR0_RME_IMPL (UL(0x1) << ID_AA64PFR0_RME_SHIFT) #define ID_AA64PFR0_CSV2_SHIFT 56 #define ID_AA64PFR0_CSV2_MASK (UL(0xf) << ID_AA64PFR0_CSV2_SHIFT) #define ID_AA64PFR0_CSV2_VAL(x) ((x) & ID_AA64PFR0_CSV2_MASK) #define ID_AA64PFR0_CSV2_NONE (UL(0x0) << ID_AA64PFR0_CSV2_SHIFT) #define ID_AA64PFR0_CSV2_ISOLATED (UL(0x1) << ID_AA64PFR0_CSV2_SHIFT) #define ID_AA64PFR0_CSV2_SCXTNUM (UL(0x2) << ID_AA64PFR0_CSV2_SHIFT) +#define ID_AA64PFR0_CSV2_3 (UL(0x3) << ID_AA64PFR0_CSV2_SHIFT) #define ID_AA64PFR0_CSV3_SHIFT 60 #define ID_AA64PFR0_CSV3_MASK (UL(0xf) << ID_AA64PFR0_CSV3_SHIFT) #define ID_AA64PFR0_CSV3_VAL(x) ((x) & ID_AA64PFR0_CSV3_MASK)