From nobody Fri Jul 28 12:08:07 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 4RC5xt0H7Lz4pyS8; Fri, 28 Jul 2023 12:08:17 +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 4RC5xg4gQWz42wD; Fri, 28 Jul 2023 12:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690546087; 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=3eI8jUsC+7WM9uuSIYjNLUCN4AUIAMS5a3uxV3CWPrA=; b=a3rjDuwfEW5oyRYxrEKT7n/BTwpPzLt5fhmqTl7xlOILHJhEgOm2syaGh2LcceqbAJPpjm ehmTPI34ZYcNV7bk+uKcXfEeOididdDgD7cAN1Nrk5nsuHfvCnekv9paxKexpS6Kl+b53Y WEqAt8kKOmdW7owCSTvt3n16cNDa+CQLh0UiuKSDkUDw2KISQ78nunk5keuAbEgJiJmJZ0 0/O+bF426sQYYHYeMJxy4Q6k/K8+X0vtKHz1M0QOsU24vGHXCT0utigDQaJU/AcYFKAkJ0 DUNmK755rcZZfJgsMlIXQ0Uqkq/AH8DpLrOrGmc0Qhok0cMiN9mqVYWCN/uKfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690546087; 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=3eI8jUsC+7WM9uuSIYjNLUCN4AUIAMS5a3uxV3CWPrA=; b=SDvfOTDw8ciAY0/vu6ADkXE+y3MlsyO9OFsp/+ujJ4eQv3bTWNaoqO7U9VgbWl7o6m2yoR EWOh0pCmv+SvbDDNX1z0cay/FulnxcCe9PtBKGDOw2enHZLpaILvwNmK6gs/r6JQWGdgRD Pb5iYGZdRM7IZCL8sx15uxwCvFw8AX5ZffxBrrQ3dVg8nV/wleFsAFGG0wSVj+aChqjRHe 67i6wW0mSMDM22G8oej1GS76gHU+ISmQMyIMhhEgxawu52N4cwVHjEwqcBMNXkdLEPjRXc I5vtpUeDBtm5ZPNHZFZvOD/GPJDr/O65CRXPDW82Bo0XzDntmiQLmhUDAO27Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690546087; a=rsa-sha256; cv=none; b=XQX4NWwaqJ2EeAcFJfOIklri5f+1eSZBFgXGp3N8H+hQShoGd5hd5t5qEzQ9LkWeKVMuPA oT9HfnPHOEaHd8kFow3GGQl/WvKDVpflgOCk6awm1p3jP88qDYR3+9rGCz27GFG7ucG6SE hpVmbDpBdKwUcCzW1lkMkrCl3FJnp+DPGnt7VEtRBDu88BYhnfQUYYTWLlyC394K2BH+G4 GPcxFdv24xwJO4ssV1g4CSKxqqMdlOx36334MOInYLPT2YD5/kQwANefx1Ciss2LMsI//j q6MUWP/IwRuS/d6nJSYvrdiiJQj5v3q0HDou5Uc2bUTlkdWdjG7WmM+qtEGQsA== 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 4RC5xg2zDvzqr6; Fri, 28 Jul 2023 12:08:07 +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 36SC87fo062173; Fri, 28 Jul 2023 12:08:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36SC87iI062172; Fri, 28 Jul 2023 12:08:07 GMT (envelope-from git) Date: Fri, 28 Jul 2023 12:08:07 GMT Message-Id: <202307281208.36SC87iI062172@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: 22235b631ba2 - main - arm64: Decode the ID_AA64MMFR4_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: 22235b631ba27d71090aa8f0d2794395feddbbe6 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=22235b631ba27d71090aa8f0d2794395feddbbe6 commit 22235b631ba27d71090aa8f0d2794395feddbbe6 Author: Andrew Turner AuthorDate: 2023-07-06 13:51:52 +0000 Commit: Andrew Turner CommitDate: 2023-07-28 11:53:02 +0000 arm64: Decode the ID_AA64MMFR4_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/D40894 --- 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 047bb07dc337..dabec74f5a19 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -140,6 +140,7 @@ struct cpu_desc { uint64_t id_aa64mmfr1; uint64_t id_aa64mmfr2; uint64_t id_aa64mmfr3; + uint64_t id_aa64mmfr4; uint64_t id_aa64pfr0; uint64_t id_aa64pfr1; uint64_t id_aa64zfr0; @@ -1297,6 +1298,12 @@ static const struct mrs_field id_aa64mmfr3_fields[] = { }; +/* ID_AA64MMFR4_EL1 */ +static const struct mrs_field id_aa64mmfr4_fields[] = { + MRS_FIELD_END, +}; + + /* ID_AA64PFR0_EL1 */ static const struct mrs_field_value id_aa64pfr0_csv3[] = { MRS_FIELD_VALUE(ID_AA64PFR0_CSV3_NONE, ""), @@ -1778,6 +1785,7 @@ static const struct mrs_user_reg user_regs[] = { USER_REG(ID_AA64MMFR1_EL1, id_aa64mmfr1), USER_REG(ID_AA64MMFR2_EL1, id_aa64mmfr2), USER_REG(ID_AA64MMFR3_EL1, id_aa64mmfr3), + USER_REG(ID_AA64MMFR4_EL1, id_aa64mmfr4), USER_REG(ID_AA64PFR0_EL1, id_aa64pfr0), USER_REG(ID_AA64PFR1_EL1, id_aa64pfr1), @@ -2509,6 +2517,11 @@ print_cpu_features(u_int cpu, struct cpu_desc *desc, print_id_register(sb, "Memory Model Features 3", desc->id_aa64mmfr3, id_aa64mmfr3_fields); + /* AArch64 Memory Model Feature Register 4 */ + if (SHOULD_PRINT_REG(id_aa64mmfr4)) + print_id_register(sb, "Memory Model Features 4", + desc->id_aa64mmfr4, id_aa64mmfr4_fields); + /* AArch64 Debug Feature Register 0 */ if (SHOULD_PRINT_REG(id_aa64dfr0)) print_id_register(sb, "Debug Features 0", @@ -2624,6 +2637,7 @@ identify_cpu(u_int cpu) desc->id_aa64mmfr1 = READ_SPECIALREG(id_aa64mmfr1_el1); desc->id_aa64mmfr2 = READ_SPECIALREG(id_aa64mmfr2_el1); desc->id_aa64mmfr3 = READ_SPECIALREG(id_aa64mmfr3_el1); + desc->id_aa64mmfr4 = READ_SPECIALREG(id_aa64mmfr4_el1); desc->id_aa64pfr0 = READ_SPECIALREG(id_aa64pfr0_el1); desc->id_aa64pfr1 = READ_SPECIALREG(id_aa64pfr1_el1); diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 3adb7ad7325d..47499f258534 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1094,6 +1094,14 @@ #define ID_AA64MMFR3_Spec_FPACC_NONE (UL(0x0) << ID_AA64MMFR3_Spec_FPACC_SHIFT) #define ID_AA64MMFR3_Spec_FPACC_IMPL (UL(0x1) << ID_AA64MMFR3_Spec_FPACC_SHIFT) +/* ID_AA64MMFR4_EL1 */ +#define ID_AA64MMFR4_EL1 MRS_REG(ID_AA64MMFR4_EL1) +#define ID_AA64MMFR4_EL1_op0 3 +#define ID_AA64MMFR4_EL1_op1 0 +#define ID_AA64MMFR4_EL1_CRn 0 +#define ID_AA64MMFR4_EL1_CRm 7 +#define ID_AA64MMFR4_EL1_op2 4 + /* ID_AA64PFR0_EL1 */ #define ID_AA64PFR0_EL1 MRS_REG(ID_AA64PFR0_EL1) #define ID_AA64PFR0_EL1_op0 0x3