The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=863e8b457b5a48efd5293a0da52e9b704bf13c23
commit 863e8b457b5a48efd5293a0da52e9b704bf13c23
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2025-07-30 10:51:41 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2025-07-30 12:46:35 +0000
arm64: Rename ID_AA64MMFR0_ECV_CNTHCTL
Rename ID_AA64MMFR0_ECV_CNTHCTL to ID_AA64MMFR0_ECV_POFF as this is the
field value when FEAT_ECV_POFF is implemented.
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D51370
---
sys/arm64/arm64/identcpu.c | 2 +-
sys/arm64/include/armreg.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c
index 55f7e98a1b1b..bcacea43ad2f 100644
--- a/sys/arm64/arm64/identcpu.c
+++ b/sys/arm64/arm64/identcpu.c
@@ -1161,7 +1161,7 @@ static const struct mrs_field id_aa64isar2_fields[] = {
/* ID_AA64MMFR0_EL1 */
static const struct mrs_field_value id_aa64mmfr0_ecv[] = {
MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR0, ECV, NONE, IMPL),
- MRS_FIELD_VALUE(ID_AA64MMFR0_ECV_CNTHCTL, "ECV+CNTHCTL"),
+ MRS_FIELD_VALUE(ID_AA64MMFR0_ECV_POFF, "ECV POFF"),
MRS_FIELD_VALUE_END,
};
diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h
index cd770386f852..38b7f57f7853 100644
--- a/sys/arm64/include/armreg.h
+++ b/sys/arm64/include/armreg.h
@@ -1287,7 +1287,7 @@
#define ID_AA64MMFR0_ECV_VAL(x) ((x) & ID_AA64MMFR0_ECV_MASK)
#define ID_AA64MMFR0_ECV_NONE (UL(0x0) <<
ID_AA64MMFR0_ECV_SHIFT)
#define ID_AA64MMFR0_ECV_IMPL (UL(0x1) <<
ID_AA64MMFR0_ECV_SHIFT)
-#define ID_AA64MMFR0_ECV_CNTHCTL (UL(0x2) <<
ID_AA64MMFR0_ECV_SHIFT)
+#define ID_AA64MMFR0_ECV_POFF (UL(0x2) <<
ID_AA64MMFR0_ECV_SHIFT)
/* ID_AA64MMFR1_EL1 */
#define ID_AA64MMFR1_EL1_REG
MRS_REG_ALT_NAME(ID_AA64MMFR1_EL1)
