default

pbo-linaro · Dec 19, 2024 · 79b1e3c · 79b1e3c
1 parent 526f8cc
commit 79b1e3c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/hw/core/machine.c b/hw/core/machine.c
@@ -37,7 +37,7 @@
 #include "audio/audio.h"
 
 GlobalProperty hw_compat_10_0[] = {
-    {"arm-cpu", "pauth-default-use-qarma5", "true"},
+    {"arm-cpu", "backcompat-pauth-default-use-qarma5", "true"},
 };
 const size_t hw_compat_10_0_len = G_N_ELEMENTS(hw_compat_10_0);
 

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
@@ -2652,6 +2652,8 @@ static const Property arm_cpu_properties[] = {
     DEFINE_PROP_INT32("core-count", ARMCPU, core_count, -1),
     /* True to default to the backward-compat old CNTFRQ rather than 1Ghz */
     DEFINE_PROP_BOOL("backcompat-cntfrq", ARMCPU, backcompat_cntfrq, false),
+    DEFINE_PROP_BOOL("backcompat-pauth-default-use-qarma5", ARMCPU,
+                      backcompat_pauth_default_use_qarma5, false),
     DEFINE_PROP_END_OF_LIST()
 };
 

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
@@ -972,6 +972,9 @@ struct ArchCPU {
     /* QOM property to indicate we should use the back-compat CNTFRQ default */
     bool backcompat_cntfrq;
 
+    /* QOM property to indicate we should use the back-compat QARMA5 default */
+    bool backcompat_pauth_default_use_qarma5;
+
     /* Specify the number of cores in this CPU cluster. Used for the L2CTLR
      * register.
      */
@@ -1060,7 +1063,6 @@ struct ArchCPU {
      * Once finalized, the values should be read from ID_AA64*.
      */
     bool prop_pauth;
-    bool prop_pauth_default_use_qarma5;
     bool prop_pauth_impdef;
     bool prop_pauth_qarma3;
     bool prop_pauth_qarma5;

diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
@@ -534,14 +534,16 @@ void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp)
                                !cpu->prop_pauth_impdef;
 
             if (cpu->prop_pauth_qarma5 ||
-                (use_default && cpu->prop_pauth_default_use_qarma5)) {
+                (use_default &&
+                 cpu->backcompat_pauth_default_use_qarma5)) {
                 isar1 = FIELD_DP64(isar1, ID_AA64ISAR1, APA, features);
                 isar1 = FIELD_DP64(isar1, ID_AA64ISAR1, GPA, 1);
             } else if (cpu->prop_pauth_qarma3) {
                 isar2 = FIELD_DP64(isar2, ID_AA64ISAR2, APA3, features);
                 isar2 = FIELD_DP64(isar2, ID_AA64ISAR2, GPA3, 1);
             } else if (cpu->prop_pauth_impdef ||
-                       (use_default && !cpu->prop_pauth_default_use_qarma5)) {
+                       (use_default &&
+                        !cpu->backcompat_pauth_default_use_qarma5)) {
                 isar1 = FIELD_DP64(isar1, ID_AA64ISAR1, API, features);
                 isar1 = FIELD_DP64(isar1, ID_AA64ISAR1, GPI, 1);
             } else {
@@ -562,9 +564,6 @@ void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp)
 
 static const Property arm_cpu_pauth_property =
     DEFINE_PROP_BOOL("pauth", ARMCPU, prop_pauth, true);
-static const Property arm_cpu_pauth_default_use_qarma5_property =
-    DEFINE_PROP_BOOL("pauth-default-use-qarma5", ARMCPU,
-                     prop_pauth_default_use_qarma5, true);
 static const Property arm_cpu_pauth_impdef_property =
     DEFINE_PROP_BOOL("pauth-impdef", ARMCPU, prop_pauth_impdef, false);
 static const Property arm_cpu_pauth_qarma3_property =
@@ -578,8 +577,6 @@ void aarch64_add_pauth_properties(Object *obj)
 
     /* Default to PAUTH on, with the architected algorithm on TCG. */
     qdev_property_add_static(DEVICE(obj), &arm_cpu_pauth_property);
-    qdev_property_add_static(DEVICE(obj),
-                             &arm_cpu_pauth_default_use_qarma5_property);
     if (kvm_enabled() || hvf_enabled()) {
         /*
          * Mirror PAuth support from the probed sysregs back into the