diff mbox series

[v3,04/14] ppc/spapr: remove deprecated machine pseries-2.4

Message ID 20241007153838.1085522-5-harshpb@linux.ibm.com (mailing list archive)
State New, archived
Headers show
Series ppc/spapr: remove deprecated machines specific code | expand

Commit Message

Harsh Prateek Bora Oct. 7, 2024, 3:38 p.m. UTC 
Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.4 specific code with this patch for now.

While at it, also remove SpaprMachineClass::dr_lmb_enabled which is
now turned useless.

Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
 include/hw/ppc/spapr.h |  1 -
 hw/ppc/spapr.c         | 38 ++++----------------------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

Comments

Cédric Le Goater Oct. 11, 2024, 6:06 a.m. UTC | #1 
On 10/7/24 17:38, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.4 specific code with this patch for now.
> 
> While at it, also remove SpaprMachineClass::dr_lmb_enabled which is
> now turned useless.
> 
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>


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

Thanks,

C.


> ---
>   include/hw/ppc/spapr.h |  1 -
>   hw/ppc/spapr.c         | 38 ++++----------------------------------
>   2 files changed, 4 insertions(+), 35 deletions(-)
> 
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index f6de3e9972..1821ef96c7 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -141,7 +141,6 @@ struct SpaprMachineClass {
>       MachineClass parent_class;
>   
>       /*< public >*/
> -    bool dr_lmb_enabled;       /* enable dynamic-reconfig/hotplug of LMBs */
>       bool dr_phb_enabled;       /* enable dynamic-reconfig/hotplug of PHBs */
>       bool update_dt_enabled;    /* enable KVMPPC_H_UPDATE_DT */
>       bool use_ohci_by_default;  /* use USB-OHCI instead of XHCI */
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 599a59910c..4d7705c89f 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -682,7 +682,6 @@ static int spapr_dt_dynamic_reconfiguration_memory(SpaprMachineState *spapr,
>   static int spapr_dt_memory(SpaprMachineState *spapr, void *fdt)
>   {
>       MachineState *machine = MACHINE(spapr);
> -    SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
>       hwaddr mem_start, node_size;
>       int i, nb_nodes = machine->numa_state->num_nodes;
>       NodeInfo *nodes = machine->numa_state->nodes;
> @@ -724,7 +723,6 @@ static int spapr_dt_memory(SpaprMachineState *spapr, void *fdt)
>       if (spapr_ovec_test(spapr->ov5_cas, OV5_DRCONF_MEMORY)) {
>           int ret;
>   
> -        g_assert(smc->dr_lmb_enabled);
>           ret = spapr_dt_dynamic_reconfiguration_memory(spapr, fdt);
>           if (ret) {
>               return ret;
> @@ -1307,9 +1305,7 @@ void *spapr_build_fdt(SpaprMachineState *spapr, bool reset, size_t space)
>       spapr_dt_cpus(fdt, spapr);
>   
>       /* ibm,drc-indexes and friends */
> -    if (smc->dr_lmb_enabled) {
> -        root_drc_type_mask |= SPAPR_DR_CONNECTOR_TYPE_LMB;
> -    }
> +    root_drc_type_mask |= SPAPR_DR_CONNECTOR_TYPE_LMB;
>       if (smc->dr_phb_enabled) {
>           root_drc_type_mask |= SPAPR_DR_CONNECTOR_TYPE_PHB;
>       }
> @@ -2929,10 +2925,8 @@ static void spapr_machine_init(MachineState *machine)
>       spapr->ov5 = spapr_ovec_new();
>       spapr->ov5_cas = spapr_ovec_new();
>   
> -    if (smc->dr_lmb_enabled) {
> -        spapr_ovec_set(spapr->ov5, OV5_DRCONF_MEMORY);
> -        spapr_validate_node_memory(machine, &error_fatal);
> -    }
> +    spapr_ovec_set(spapr->ov5, OV5_DRCONF_MEMORY);
> +    spapr_validate_node_memory(machine, &error_fatal);
>   
>       spapr_ovec_set(spapr->ov5, OV5_FORM1_AFFINITY);
>   
> @@ -3016,9 +3010,7 @@ static void spapr_machine_init(MachineState *machine)
>           machine_memory_devices_init(machine, device_mem_base, device_mem_size);
>       }
>   
> -    if (smc->dr_lmb_enabled) {
> -        spapr_create_lmb_dr_connectors(spapr);
> -    }
> +    spapr_create_lmb_dr_connectors(spapr);
>   
>       if (mc->nvdimm_supported) {
>           spapr_create_nvdimm_dr_connectors(spapr);
> @@ -3662,7 +3654,6 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev)
>   static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
>                                     Error **errp)
>   {
> -    const SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(hotplug_dev);
>       SpaprMachineState *spapr = SPAPR_MACHINE(hotplug_dev);
>       bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
>       PCDIMMDevice *dimm = PC_DIMM(dev);
> @@ -3671,11 +3662,6 @@ static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
>       Object *memdev;
>       hwaddr pagesize;
>   
> -    if (!smc->dr_lmb_enabled) {
> -        error_setg(errp, "Memory hotplug not supported for this machine");
> -        return;
> -    }
> -
>       size = memory_device_get_region_size(MEMORY_DEVICE(dimm), &local_err);
>       if (local_err) {
>           error_propagate(errp, local_err);
> @@ -4713,7 +4699,6 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
>       hc->unplug_request = spapr_machine_device_unplug_request;
>       hc->unplug = spapr_machine_device_unplug;
>   
> -    smc->dr_lmb_enabled = true;
>       smc->update_dt_enabled = true;
>       mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power10_v2.0");
>       mc->has_hotpluggable_cpus = true;
> @@ -5334,21 +5319,6 @@ static void spapr_machine_2_5_class_options(MachineClass *mc)
>   
>   DEFINE_SPAPR_MACHINE(2, 5);
>   
> -/*
> - * pseries-2.4
> - */
> -
> -static void spapr_machine_2_4_class_options(MachineClass *mc)
> -{
> -    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
> -
> -    spapr_machine_2_5_class_options(mc);
> -    smc->dr_lmb_enabled = false;
> -    compat_props_add(mc->compat_props, hw_compat_2_4, hw_compat_2_4_len);
> -}
> -
> -DEFINE_SPAPR_MACHINE(2, 4);
> -
>   static void spapr_machine_register_types(void)
>   {
>       type_register_static(&spapr_machine_info);
diff mbox series

Patch

diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index f6de3e9972..1821ef96c7 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -141,7 +141,6 @@  struct SpaprMachineClass {
     MachineClass parent_class;
 
     /*< public >*/
-    bool dr_lmb_enabled;       /* enable dynamic-reconfig/hotplug of LMBs */
     bool dr_phb_enabled;       /* enable dynamic-reconfig/hotplug of PHBs */
     bool update_dt_enabled;    /* enable KVMPPC_H_UPDATE_DT */
     bool use_ohci_by_default;  /* use USB-OHCI instead of XHCI */
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 599a59910c..4d7705c89f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -682,7 +682,6 @@  static int spapr_dt_dynamic_reconfiguration_memory(SpaprMachineState *spapr,
 static int spapr_dt_memory(SpaprMachineState *spapr, void *fdt)
 {
     MachineState *machine = MACHINE(spapr);
-    SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
     hwaddr mem_start, node_size;
     int i, nb_nodes = machine->numa_state->num_nodes;
     NodeInfo *nodes = machine->numa_state->nodes;
@@ -724,7 +723,6 @@  static int spapr_dt_memory(SpaprMachineState *spapr, void *fdt)
     if (spapr_ovec_test(spapr->ov5_cas, OV5_DRCONF_MEMORY)) {
         int ret;
 
-        g_assert(smc->dr_lmb_enabled);
         ret = spapr_dt_dynamic_reconfiguration_memory(spapr, fdt);
         if (ret) {
             return ret;
@@ -1307,9 +1305,7 @@  void *spapr_build_fdt(SpaprMachineState *spapr, bool reset, size_t space)
     spapr_dt_cpus(fdt, spapr);
 
     /* ibm,drc-indexes and friends */
-    if (smc->dr_lmb_enabled) {
-        root_drc_type_mask |= SPAPR_DR_CONNECTOR_TYPE_LMB;
-    }
+    root_drc_type_mask |= SPAPR_DR_CONNECTOR_TYPE_LMB;
     if (smc->dr_phb_enabled) {
         root_drc_type_mask |= SPAPR_DR_CONNECTOR_TYPE_PHB;
     }
@@ -2929,10 +2925,8 @@  static void spapr_machine_init(MachineState *machine)
     spapr->ov5 = spapr_ovec_new();
     spapr->ov5_cas = spapr_ovec_new();
 
-    if (smc->dr_lmb_enabled) {
-        spapr_ovec_set(spapr->ov5, OV5_DRCONF_MEMORY);
-        spapr_validate_node_memory(machine, &error_fatal);
-    }
+    spapr_ovec_set(spapr->ov5, OV5_DRCONF_MEMORY);
+    spapr_validate_node_memory(machine, &error_fatal);
 
     spapr_ovec_set(spapr->ov5, OV5_FORM1_AFFINITY);
 
@@ -3016,9 +3010,7 @@  static void spapr_machine_init(MachineState *machine)
         machine_memory_devices_init(machine, device_mem_base, device_mem_size);
     }
 
-    if (smc->dr_lmb_enabled) {
-        spapr_create_lmb_dr_connectors(spapr);
-    }
+    spapr_create_lmb_dr_connectors(spapr);
 
     if (mc->nvdimm_supported) {
         spapr_create_nvdimm_dr_connectors(spapr);
@@ -3662,7 +3654,6 @@  static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev)
 static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
                                   Error **errp)
 {
-    const SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(hotplug_dev);
     SpaprMachineState *spapr = SPAPR_MACHINE(hotplug_dev);
     bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
     PCDIMMDevice *dimm = PC_DIMM(dev);
@@ -3671,11 +3662,6 @@  static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
     Object *memdev;
     hwaddr pagesize;
 
-    if (!smc->dr_lmb_enabled) {
-        error_setg(errp, "Memory hotplug not supported for this machine");
-        return;
-    }
-
     size = memory_device_get_region_size(MEMORY_DEVICE(dimm), &local_err);
     if (local_err) {
         error_propagate(errp, local_err);
@@ -4713,7 +4699,6 @@  static void spapr_machine_class_init(ObjectClass *oc, void *data)
     hc->unplug_request = spapr_machine_device_unplug_request;
     hc->unplug = spapr_machine_device_unplug;
 
-    smc->dr_lmb_enabled = true;
     smc->update_dt_enabled = true;
     mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power10_v2.0");
     mc->has_hotpluggable_cpus = true;
@@ -5334,21 +5319,6 @@  static void spapr_machine_2_5_class_options(MachineClass *mc)
 
 DEFINE_SPAPR_MACHINE(2, 5);
 
-/*
- * pseries-2.4
- */
-
-static void spapr_machine_2_4_class_options(MachineClass *mc)
-{
-    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
-
-    spapr_machine_2_5_class_options(mc);
-    smc->dr_lmb_enabled = false;
-    compat_props_add(mc->compat_props, hw_compat_2_4, hw_compat_2_4_len);
-}
-
-DEFINE_SPAPR_MACHINE(2, 4);
-
 static void spapr_machine_register_types(void)
 {
     type_register_static(&spapr_machine_info);