Re: [PATCH v3 15/19] ppc/pnv: Add big-core machine property

[Cédric Le Goater]

On 7/16/24 18:26, Nicholas Piggin wrote:

Big-core implementation is complete, so expose it as a machine
property that may be set with big-core=on option on powernv9 and
powernv10 machines.

Signed-off-by: Nicholas Piggin <npig...@gmail.com>

Reviewed-by: Cédric Le Goater <c...@redhat.com>

Thanks,

C.

---
  hw/ppc/pnv.c | 61 ++++++++++++++++++++++++++++++++++++++--------------
  1 file changed, 45 insertions(+), 16 deletions(-)

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 322ab9073b..08aaac359b 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -2581,6 +2581,34 @@ static int pnv10_xive_match_nvt(XiveFabric *xfb, uint8_t 
format,
      return total_count;
  }

+static bool pnv_machine_get_big_core(Object *obj, Error **errp)

+{
+    PnvMachineState *pnv = PNV_MACHINE(obj);
+    return pnv->big_core;
+}
+
+static void pnv_machine_set_big_core(Object *obj, bool value, Error **errp)
+{
+    PnvMachineState *pnv = PNV_MACHINE(obj);
+    pnv->big_core = value;
+}
+
+static bool pnv_machine_get_hb(Object *obj, Error **errp)
+{
+    PnvMachineState *pnv = PNV_MACHINE(obj);
+
+    return !!pnv->fw_load_addr;
+}
+
+static void pnv_machine_set_hb(Object *obj, bool value, Error **errp)
+{
+    PnvMachineState *pnv = PNV_MACHINE(obj);
+
+    if (value) {
+        pnv->fw_load_addr = 0x8000000;
+    }
+}
+
  static void pnv_machine_power8_class_init(ObjectClass *oc, void *data)
  {
      MachineClass *mc = MACHINE_CLASS(oc);
@@ -2632,6 +2660,12 @@ static void pnv_machine_power9_class_init(ObjectClass 
*oc, void *data)
      pmc->dt_power_mgt = pnv_dt_power_mgt;

machine_class_allow_dynamic_sysbus_dev(mc, TYPE_PNV_PHB);

+
+    object_class_property_add_bool(oc, "big-core",
+                                   pnv_machine_get_big_core,
+                                   pnv_machine_set_big_core);
+    object_class_property_set_description(oc, "big-core",
+                              "Use big-core (aka fused-core) mode");
  }

static void pnv_machine_p10_common_class_init(ObjectClass *oc, void *data)

@@ -2668,6 +2702,17 @@ static void pnv_machine_power10_class_init(ObjectClass 
*oc, void *data)

pnv_machine_p10_common_class_init(oc, data);

      mc->desc = "IBM PowerNV (Non-Virtualized) POWER10";
+
+    /*
+     * This is the parent of POWER10 Rainier class, so properies go here
+     * rather than common init (which would add them to both parent and
+     * child which is invalid).
+     */
+    object_class_property_add_bool(oc, "big-core",
+                                   pnv_machine_get_big_core,
+                                   pnv_machine_set_big_core);
+    object_class_property_set_description(oc, "big-core",
+                              "Use big-core (aka fused-core) mode");
  }

static void pnv_machine_p10_rainier_class_init(ObjectClass *oc, void *data)

@@ -2680,22 +2725,6 @@ static void 
pnv_machine_p10_rainier_class_init(ObjectClass *oc, void *data)
      pmc->i2c_init = pnv_rainier_i2c_init;
  }

-static bool pnv_machine_get_hb(Object *obj, Error **errp)

-{
-    PnvMachineState *pnv = PNV_MACHINE(obj);
-
-    return !!pnv->fw_load_addr;
-}
-
-static void pnv_machine_set_hb(Object *obj, bool value, Error **errp)
-{
-    PnvMachineState *pnv = PNV_MACHINE(obj);
-
-    if (value) {
-        pnv->fw_load_addr = 0x8000000;
-    }
-}
-
  static void pnv_cpu_do_nmi_on_cpu(CPUState *cs, run_on_cpu_data arg)
  {
      CPUPPCState *env = cpu_env(cs);