From nobody Fri Jul 28 12:08:10 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 4RC5xt1Zntz4pyKq; 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 4RC5xk5Sf7z42qX; Fri, 28 Jul 2023 12:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690546090; 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=LPcDOgaV5QmY03q9qfTBI0k15zQUujwP3GsGiAbbQYs=; b=K239YY2oAlJFfjzSwB5WYt+bMu/kDZ86EWCFmhvYoHQ0DQNd/FWPx71e4maUj894Ienk2F AkW6n+3ovn/PbECshHxcxoWoN6Gn6eHJ5/2VUYbApzASkapE+fv5nQGUHcbj4faxYsUqwn +ZZeJsb295b1RxT+sMg5BFv0wCuyVyVqRn8ylJ+9bOuKHSfupQwDQPr5PavnDopLPUYyVs i/Tr86QNwUbitTyVd2vhD/lqeHkNIFOOZk7AsYzESrgZSG2x63ih+3tUedJ75zTuXel2WI yFcaaHV1bt/WE8429jSPu1ynnkm8roivUB8aC8kkzZlLgCljuZIabfFQ5lAO9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690546090; 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=LPcDOgaV5QmY03q9qfTBI0k15zQUujwP3GsGiAbbQYs=; b=GCLWj1fXa54RdGT/MqyXtwOfSdO+yEZQ/Bwxiah07jXOaL7XjfoMNNK0RagD2tfo71qpyo jO2tY4xSi8uh6CItRTqjZ8yYbkML6tiUGs9EL0a0LN6TR+Lh8Bi8m4TTkXouh187pOpRKe Do8BcqsjreQfX3CaI0nTk6OlS6h4mh3zkg42/M7P7Uv65dntUl8wTHcj2RpNbmH0dlTfWP 1JPtK1PA6zwCbiacfaakjvrRu9vdxpXI9ks+UU5pmm9kJtnhkCwYLs+e1K/F1cvsY69/gn bSEgsX/H/Yna23YrJUG1uqyXZxTje4JV1u7/7UV8VV9A12V/0dNAx2tBOqscEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690546090; a=rsa-sha256; cv=none; b=eAse0QdpX47+77PR4YRf8aA6gAGvSl+Hmgih5tYLSHe8+PKawHMkuC8pGW9ZSIW57zjD2G 1BYX2rTdESunHc/C0iA/8xrsI5AWuQyHjC8Ro03radK9CWzY5WbCkTh/IPYez4NVUTnxjN EaiBEtjJA8JBo0KAr8X3KverFjl9EE3TBCy+thScq+/sbec7LrgYZOCErxMEUosraP3Zoi ffRHxR4TBzNmb8B9zjRJ7ohCbc8FrfFMqktaujZadfKK1vQjXndrG26Vb1nnFIzVSGftJU KJtlSWFq/Y7zQP31ju8yJWgqcE9gCsgfvRRxmCMiWT3tBzwhDf9R/Y0L0h6x4w== 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 4RC5xk3zbHzqWS; Fri, 28 Jul 2023 12:08:10 +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 36SC8A7i062241; Fri, 28 Jul 2023 12:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36SC8Aww062240; Fri, 28 Jul 2023 12:08:10 GMT (envelope-from git) Date: Fri, 28 Jul 2023 12:08:10 GMT Message-Id: <202307281208.36SC8Aww062240@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: 53e1af5a1094 - main - arm64: Decode the ID_AA64PFR2_EL1 register 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: 53e1af5a1094ec37412bc33b739de72ed723c428 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=53e1af5a1094ec37412bc33b739de72ed723c428 commit 53e1af5a1094ec37412bc33b739de72ed723c428 Author: Andrew Turner AuthorDate: 2023-07-06 14:48:42 +0000 Commit: Andrew Turner CommitDate: 2023-07-28 11:53:02 +0000 arm64: Decode the ID_AA64PFR2_EL1 register No fields have been defined, but it has been documented in the Architecture Reference Manual. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D40897 --- sys/arm64/arm64/identcpu.c | 14 ++++++++++++++ sys/arm64/include/armreg.h | 8 ++++++++ 2 files changed, 22 insertions(+) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 578c2b629397..2347d27c69e1 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -143,6 +143,7 @@ struct cpu_desc { uint64_t id_aa64mmfr4; uint64_t id_aa64pfr0; uint64_t id_aa64pfr1; + uint64_t id_aa64pfr2; uint64_t id_aa64zfr0; uint64_t ctr; #ifdef COMPAT_FREEBSD32 @@ -1542,6 +1543,12 @@ static const struct mrs_field id_aa64pfr1_fields[] = { }; +/* ID_AA64PFR2_EL1 */ +static const struct mrs_field id_aa64pfr2_fields[] = { + MRS_FIELD_END, +}; + + /* ID_AA64ZFR0_EL1 */ static const struct mrs_field_value id_aa64zfr0_f64mm[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ZFR0, F64MM, NONE, IMPL), @@ -1844,6 +1851,7 @@ static const struct mrs_user_reg user_regs[] = { USER_REG(ID_AA64PFR0_EL1, id_aa64pfr0), USER_REG(ID_AA64PFR1_EL1, id_aa64pfr1), + USER_REG(ID_AA64PFR2_EL1, id_aa64pfr2), USER_REG(ID_AA64ZFR0_EL1, id_aa64zfr0), @@ -2552,6 +2560,11 @@ print_cpu_features(u_int cpu, struct cpu_desc *desc, print_id_register(sb, "Processor Features 1", desc->id_aa64pfr1, id_aa64pfr1_fields); + /* AArch64 Processor Feature Register 2 */ + if (SHOULD_PRINT_REG(id_aa64pfr2)) + print_id_register(sb, "Processor Features 2", + desc->id_aa64pfr2, id_aa64pfr2_fields); + /* AArch64 Memory Model Feature Register 0 */ if (SHOULD_PRINT_REG(id_aa64mmfr0)) print_id_register(sb, "Memory Model Features 0", @@ -2695,6 +2708,7 @@ identify_cpu(u_int cpu) desc->id_aa64mmfr4 = READ_SPECIALREG(id_aa64mmfr4_el1); desc->id_aa64pfr0 = READ_SPECIALREG(id_aa64pfr0_el1); desc->id_aa64pfr1 = READ_SPECIALREG(id_aa64pfr1_el1); + desc->id_aa64pfr2 = READ_SPECIALREG(id_aa64pfr2_el1); /* * ID_AA64ZFR0_EL1 is only valid when at least one of: diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 7624adf9eee4..92a62c8d2b53 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1258,6 +1258,14 @@ #define ID_AA64PFR1_NMI_NONE (UL(0x0) << ID_AA64PFR1_NMI_SHIFT) #define ID_AA64PFR1_NMI_IMPL (UL(0x1) << ID_AA64PFR1_NMI_SHIFT) +/* ID_AA64PFR2_EL1 */ +#define ID_AA64PFR2_EL1 MRS_REG(ID_AA64PFR2_EL1) +#define ID_AA64PFR2_EL1_op0 3 +#define ID_AA64PFR2_EL1_op1 0 +#define ID_AA64PFR2_EL1_CRn 0 +#define ID_AA64PFR2_EL1_CRm 4 +#define ID_AA64PFR2_EL1_op2 2 + /* ID_AA64ZFR0_EL1 */ #define ID_AA64ZFR0_EL1 MRS_REG(ID_AA64ZFR0_EL1) #define ID_AA64ZFR0_EL1_REG MRS_REG_ALT_NAME(ID_AA64ZFR0_EL1)