Skip to contentSkip to conversation

ppc: really change defaults

PATCH In review Nicholas Piggin 3 participants 5 messages Jan 18, 2024 – Jan 19, 2024

lore
Share & tools
lore
#0 lore raw

cover ppc: really change defaults

Oops, these two should be with the previous series too.

Thanks,
Nick

Nicholas Piggin (2):
ppc/spapr: change pseries machine default to POWER10 CPU ppc/pnv: Change powernv default to powernv10

 hw/ppc/pnv.c   | 4 ++--
 hw/ppc/spapr.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.42.0
#1 lore raw

PATCH 1/2 ppc/spapr: change pseries machine default to POWER10 CPU

POWER10 is the latest pseries CPU.

---
 hw/ppc/spapr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ppc/spapr.c +1 -1
index e8dabc8614..021b1a00e1 100644
@@ -4675,7 +4675,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
 
     smc->dr_lmb_enabled = true;
     smc->update_dt_enabled = true;
-    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power9_v2.2");
+    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power10_v2.0");
     mc->has_hotpluggable_cpus = true;
     mc->nvdimm_supported = true;
     smc->resize_hpt_default = SPAPR_RESIZE_HPT_ENABLED;
Signature · 1 line
2.42.0
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] ppc/spapr: change pseries machine default to POWER10 CPU

Quoted 3 lines · Nicholas Piggin

POWER10 is the latest pseries CPU.

Quoted 17 lines
---
  hw/ppc/spapr.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
hw/ppc/spapr.c +1 -1
index e8dabc8614..021b1a00e1 100644
@@ -4675,7 +4675,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
 
      smc->dr_lmb_enabled = true;
      smc->update_dt_enabled = true;
-    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power9_v2.2");
+    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power10_v2.0");
      mc->has_hotpluggable_cpus = true;
      mc->nvdimm_supported = true;
      smc->resize_hpt_default = SPAPR_RESIZE_HPT_ENABLED;
#3 lore raw

PATCH 2/2 ppc/pnv: Change powernv default to powernv10

In reply to Nicholas Piggin

POWER10 is the latest IBM Power machine. Although it is not offered in "OPAL mode" (i.e., powernv configuration), so there is a case that it should remain at powernv9, most of the development work is going into powernv10 at the moment.

---
 hw/ppc/pnv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/ppc/pnv.c +2 -2
index 0297871bdd..b949398689 100644
@@ -2242,8 +2242,6 @@ static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)
 
     xfc->match_nvt = pnv_match_nvt;
 
-    mc->alias = "powernv";
-
     pmc->compat = compat;
     pmc->compat_size = sizeof(compat);
     pmc->dt_power_mgt = pnv_dt_power_mgt;
@@ -2267,6 +2265,8 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
     mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power10_v2.0");
     compat_props_add(mc->compat_props, phb_compat, G_N_ELEMENTS(phb_compat));
 
+    mc->alias = "powernv";
+
     pmc->compat = compat;
     pmc->compat_size = sizeof(compat);
     pmc->dt_power_mgt = pnv_dt_power_mgt;
Signature · 1 line
2.42.0
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] ppc/pnv: Change powernv default to powernv10

Quoted 6 lines · Nicholas Piggin

POWER10 is the latest IBM Power machine. Although it is not offered in "OPAL mode" (i.e., powernv configuration), so there is a case that it should remain at powernv9, most of the development work is going into powernv10 at the moment.

May be we could drop support for power10_v1.0 and power9_v1.0 ? These were bringup CPUs.

Anyhow,

Thanks,

C.

Quoted 26 lines
---
  hw/ppc/pnv.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
hw/ppc/pnv.c +2 -2
index 0297871bdd..b949398689 100644
@@ -2242,8 +2242,6 @@ static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)
 
      xfc->match_nvt = pnv_match_nvt;
 
-    mc->alias = "powernv";
-
      pmc->compat = compat;
      pmc->compat_size = sizeof(compat);
      pmc->dt_power_mgt = pnv_dt_power_mgt;
@@ -2267,6 +2265,8 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
      mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power10_v2.0");
      compat_props_add(mc->compat_props, phb_compat, G_N_ELEMENTS(phb_compat));
 
+    mc->alias = "powernv";
+
      pmc->compat = compat;
      pmc->compat_size = sizeof(compat);
      pmc->dt_power_mgt = pnv_dt_power_mgt;