git: 55dbd744b374 - stable/13 - Switch the order of the ID_AA64PFR1_EL1 fields

[Andrew Turner]

The branch stable/13 has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=55dbd744b37410e34410b121d6c0438fcbc3df70

commit 55dbd744b37410e34410b121d6c0438fcbc3df70
Author:     Andrew Turner <andrew at FreeBSD.org>
AuthorDate: 2021-07-01 00:45:39 +0000
Commit:     Andrew Turner <andrew at FreeBSD.org>
CommitDate: 2021-08-05 20:50:17 +0000

    Switch the order of the ID_AA64PFR1_EL1 fields
    
    This makes them consistent with the fields in other registers.
    
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 244002b48257a8e4d3b4772872981c0d7a467923)
---
 sys/arm64/arm64/identcpu.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c
index 5dc3a91031b6..88d925f8162a 100644
--- a/sys/arm64/arm64/identcpu.c
+++ b/sys/arm64/arm64/identcpu.c
@@ -901,9 +901,10 @@ static struct mrs_field id_aa64pfr0_fields[] = {
 
 
 /* ID_AA64PFR1_EL1 */
-static struct mrs_field_value id_aa64pfr1_bt[] = {
-	MRS_FIELD_VALUE(ID_AA64PFR1_BT_NONE, ""),
-	MRS_FIELD_VALUE(ID_AA64PFR1_BT_IMPL, "BTI"),
+static struct mrs_field_value id_aa64pfr1_mte[] = {
+	MRS_FIELD_VALUE(ID_AA64PFR1_MTE_NONE, ""),
+	MRS_FIELD_VALUE(ID_AA64PFR1_MTE_IMPL_EL0, "MTE EL0"),
+	MRS_FIELD_VALUE(ID_AA64PFR1_MTE_IMPL, "MTE"),
 	MRS_FIELD_VALUE_END,
 };
 
@@ -914,17 +915,16 @@ static struct mrs_field_value id_aa64pfr1_ssbs[] = {
 	MRS_FIELD_VALUE_END,
 };
 
-static struct mrs_field_value id_aa64pfr1_mte[] = {
-	MRS_FIELD_VALUE(ID_AA64PFR1_MTE_NONE, ""),
-	MRS_FIELD_VALUE(ID_AA64PFR1_MTE_IMPL_EL0, "MTE EL0"),
-	MRS_FIELD_VALUE(ID_AA64PFR1_MTE_IMPL, "MTE"),
+static struct mrs_field_value id_aa64pfr1_bt[] = {
+	MRS_FIELD_VALUE(ID_AA64PFR1_BT_NONE, ""),
+	MRS_FIELD_VALUE(ID_AA64PFR1_BT_IMPL, "BTI"),
 	MRS_FIELD_VALUE_END,
 };
 
 static struct mrs_field id_aa64pfr1_fields[] = {
-	MRS_FIELD(ID_AA64PFR1, BT, false, MRS_EXACT, id_aa64pfr1_bt),
-	MRS_FIELD(ID_AA64PFR1, SSBS, false, MRS_LOWER, id_aa64pfr1_ssbs),
 	MRS_FIELD(ID_AA64PFR1, MTE, false, MRS_EXACT, id_aa64pfr1_mte),
+	MRS_FIELD(ID_AA64PFR1, SSBS, false, MRS_LOWER, id_aa64pfr1_ssbs),
+	MRS_FIELD(ID_AA64PFR1, BT, false, MRS_EXACT, id_aa64pfr1_bt),
 	MRS_FIELD_END,
 };