From nobody Mon Jul 15 12:37:56 2024 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 4WN1v92fHvz5QrLc; Mon, 15 Jul 2024 12:37:57 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WN1v86hjWz4GnK; Mon, 15 Jul 2024 12:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047076; 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=RqlmCaX0mfabu24Fwg1i0Rl6WsIhJh2qpSPneWzLbtI=; b=OpdofDDbS0huCFMdLcpU3ieAlN7cMYPvIoFpuNfW7yW1YnhFgczvZad4pyrpXCOt0SXnrR rEpBJz4BRTzXyHJmv8esvHelxMBuvbtL0lj6dHgZ7avCTUTPGAWw+ZV5+UqrHZR0TyhvgF AdlRFdbo5gvdiQ+QB2Ta3bqDNSO4//NBZRDvTipigLY7g5I8qvXFsN8K/R5icRPChWS2TD wBtIlB7KmLzrVRcExyg1s2S6BlwzVtmjDPXJKu8buRTvDZHM+SmHR+wBlNapX6uuIBxl43 XKzERkJNneAHXBhNf64bxmxafS/0lTkjjFoMAQptLSeHYU1mhmv+R0dpybDZyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047076; a=rsa-sha256; cv=none; b=GrLfytzmx5/b09b4AFAyBb6PK22S627k/rguMaWU+t4urpfQledp07bhXnIJ623cwa9QOt ut/VIJqPVEJ17JK/gcDmg9eER5NAvvzu9Q6nc2mwRcMKZoPoNIlHA1I6HTuBo3YV9mXZY9 2YAbOH2rtkFO0Btp/3H88J3HL+X7VLOjg2T4iA1JvMNqr12kA4wRquYpmWCUz7EtMHWmT+ 0w3M0HlJSdkXaZ3oWBUL84S525hTxFEuVIVK26gkserSzDSLjLcDeFGq7BZBXYpzIH5Jb2 CN6DUDkwx2I9xclg7vQxhtNJhS1gt0tFhuW3UNl0zEWZrCl2NxivuezbEjbmXQ== 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=1721047076; 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=RqlmCaX0mfabu24Fwg1i0Rl6WsIhJh2qpSPneWzLbtI=; b=xHMlUpTDGAQeM4rDR0ywCYlBmonVmHrdlGE/LrNh2UURa+00a+Fgl0sLy5YjdlPq4nYyz2 xot9bc21radfoX+WXt2konjBCPWoxJexAy+nXRet4fsGDyH8J1bop2Z4K4KCT8FkjJYBIb hjjacYFVyblYKPnOE+rE2MI1DxbjhydkzsTtEFwiB7AXOSYgLPm95WsMr8UgK1nodWKj1w H6zikuR/ANVMILu31tefXslbg8AI4JmWATUeXN9bVOQv5to98NIuFEf6nxwmmQzBd71Bc6 bHbHOQEmWjye39yupXJr8rnaZGlE5b8iUl403Dd/d4Vxi/yF2Wb5+svwosvyHw== 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 4WN1v86JRbzscb; Mon, 15 Jul 2024 12:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46FCbuqf058833; Mon, 15 Jul 2024 12:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCbugb058830; Mon, 15 Jul 2024 12:37:56 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:37:56 GMT Message-Id: <202407151237.46FCbugb058830@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: c9303e68d316 - stable/13 - arm64: Decode the ID_AA64PFR2_EL1 register 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: c9303e68d31695875e5ec6dd98862b5ee409b1d6 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c9303e68d31695875e5ec6dd98862b5ee409b1d6 commit c9303e68d31695875e5ec6dd98862b5ee409b1d6 Author: Andrew Turner AuthorDate: 2023-07-06 14:48:42 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 08:09:50 +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 (cherry picked from commit 53e1af5a1094ec37412bc33b739de72ed723c428) --- 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 02dcfa326559..fcbf607b8fef 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -133,6 +133,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 @@ -1488,6 +1489,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), @@ -1791,6 +1798,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), @@ -2469,6 +2477,11 @@ print_cpu_features(u_int cpu) print_id_register(sb, "Processor Features 1", cpu_desc[cpu].id_aa64pfr1, id_aa64pfr1_fields); + /* AArch64 Processor Feature Register 2 */ + if (SHOULD_PRINT_REG(id_aa64pfr2)) + print_id_register(sb, "Processor Features 2", + cpu_desc[cpu].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", @@ -2610,6 +2623,7 @@ identify_cpu(u_int cpu) cpu_desc[cpu].id_aa64mmfr4 = READ_SPECIALREG(id_aa64mmfr4_el1); cpu_desc[cpu].id_aa64pfr0 = READ_SPECIALREG(id_aa64pfr0_el1); cpu_desc[cpu].id_aa64pfr1 = READ_SPECIALREG(id_aa64pfr1_el1); + cpu_desc[cpu].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 4f99f50456ef..b2d9d0926c8f 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1280,6 +1280,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)