From nobody Mon Jul 15 12:37:55 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 4WN1v80jCrz5QrR3; Mon, 15 Jul 2024 12:37:56 +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 4WN1v75pXFz4GTP; Mon, 15 Jul 2024 12:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047075; 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=bUgFhkuI2SQxSaasgX2BRebr7Ul62RMmxY4byOxOhM0=; b=I9ut2cwFXILLM1XCVVf3pMur6TUUVBIr46IX/LbWekHdzz0kIudFGUPjlbwPEeNdlxK+BC 2eBx+PSE8a83y7lgCYIkqitNCPrmkMZKyswv2hkZ/Rr6vlCL/myS1CxOpnA0EIyDViTzW/ QJtW/l0+Iz/yf5e6Qlcte+j66VHCgx9ie3ZnFETPoodwtT6dPsPArkwbzOZWBN0vmb/nli nLtL9BuZyXdOMc3xI+Zz/cVFhbzyUzYU3bmraPVcv0gy/vEytmcnVHzIHQC/mVEB6SEykM bLKsFSgxcQ7+VIBVe5GnIu9qWyYmmVfNgJdVoPDmm4fQQl3iji8NznFesPP7qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047075; a=rsa-sha256; cv=none; b=eHIzmkKPY/NI/+6lOpA5yaJIJAIoRv4WklZg3ZqCjjARaYfOMdA5O/7tYNfBa7PzuyGGzD scrkCHuhyP/rvHbzMFt3w0cc+YLwC9EK3buSCSXcmIz181KQVNtcgI9Xh1V1CL9+LiZ4Hr Wb544sKQqDXynUNAYeIaLRGHqBLaHjDDmOvty6p7iWlsHtVdE5gjjubyvPmHxC5Eq8ZHb7 BXh1lq/Uk2B2EYxSNyEe0edcMgi2V9X9VW+RobirdzfhCtTzENOyOz82ufn2Rz0BCacSFO fQ3Im6NMBbfPV7EHKlGehM9VJTQHS3NXfTZR4FZUIUoaNviWVElfXHkWeufj+w== 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=1721047075; 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=bUgFhkuI2SQxSaasgX2BRebr7Ul62RMmxY4byOxOhM0=; b=OObRaLe9aul+IZGxRk1XYnpImcqCOIJL3n3hvNurFlncCWLnMImfqKVm9z74d2s/KG4k+q jn5xIIUCxkMjs2Fi1PgU/Tvx0qu0N5Xp46AKCkuF/qpGg7BqwW/XHXQKGYesbEK0tsnUtg U1/UBGla/LpxYoND224N5pIzClFVrYSnNgxTYVJ0VR9z7ZqieaLVOJLcQLrS3nBUmZ8Nyd DC/Pt0pReEy/Cj0sHMk2uKqu1tKpapulrf0xqwX5BAnJdf63miETfRn4rLELsv4PUdDTE3 zFM1lWV77xSU5HUnPnEDbfNQGqKr68NJmQw5eI+OwTgSlm1KtpABEdN8QbJI1g== 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 4WN1v752Rczsp6; Mon, 15 Jul 2024 12:37:55 +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 46FCbtag058749; Mon, 15 Jul 2024 12:37:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCbtXC058746; Mon, 15 Jul 2024 12:37:55 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:37:55 GMT Message-Id: <202407151237.46FCbtXC058746@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: 2b5827fbbae7 - stable/13 - arm64: Decode the ID_AA64MMFR4_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: 2b5827fbbae7b7de96221e966d8f676560120084 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2b5827fbbae7b7de96221e966d8f676560120084 commit 2b5827fbbae7b7de96221e966d8f676560120084 Author: Andrew Turner AuthorDate: 2023-07-06 13:51:52 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 08:09:50 +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 (cherry picked from commit 22235b631ba27d71090aa8f0d2794395feddbbe6) --- 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 2750f400fb66..02dcfa326559 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -130,6 +130,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; @@ -1243,6 +1244,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, ""), @@ -1780,6 +1787,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), @@ -2481,6 +2489,11 @@ print_cpu_features(u_int cpu) print_id_register(sb, "Memory Model Features 3", cpu_desc[cpu].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", + cpu_desc[cpu].id_aa64mmfr4, id_aa64mmfr4_fields); + /* AArch64 Debug Feature Register 0 */ if (SHOULD_PRINT_REG(id_aa64dfr0)) print_id_register(sb, "Debug Features 0", @@ -2594,6 +2607,7 @@ identify_cpu(u_int cpu) cpu_desc[cpu].id_aa64mmfr1 = READ_SPECIALREG(id_aa64mmfr1_el1); cpu_desc[cpu].id_aa64mmfr2 = READ_SPECIALREG(id_aa64mmfr2_el1); cpu_desc[cpu].id_aa64mmfr3 = READ_SPECIALREG(id_aa64mmfr3_el1); + 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); diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 1a5863b82535..4f99f50456ef 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1116,6 +1116,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 3