Re: [PATCH v3 03/14] ppc/spapr: remove deprecated machine pseries-2.3

[Cédric Le Goater]

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.3 specific code with this patch for now.

While at it, also remove the dynamic-reconfiguration option which was
introduced to disable it by default for legacy machines until pseries-2.3.

Suggested-by: Cédric Le Goater <c...@kaod.org>
Signed-off-by: Harsh Prateek Bora <hars...@linux.ibm.com>

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

Thanks,

C.

---
  include/hw/pci-host/spapr.h |  1 -
  hw/ppc/spapr.c              | 15 ---------------
  hw/ppc/spapr_pci.c          | 35 -----------------------------------
  3 files changed, 51 deletions(-)

diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
index 3778aac27b..79187e80fd 100644
--- a/include/hw/pci-host/spapr.h
+++ b/include/hw/pci-host/spapr.h
@@ -53,7 +53,6 @@ struct SpaprPhbState {
      uint32_t index;
      uint64_t buid;
      char *dtbusname;
-    bool dr_enabled;

MemoryRegion memspace, iospace;

      hwaddr mem_win_addr, mem_win_size, mem64_win_addr, mem64_win_size;
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 34d655d0b3..599a59910c 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -5349,21 +5349,6 @@ static void spapr_machine_2_4_class_options(MachineClass 
*mc)

DEFINE_SPAPR_MACHINE(2, 4); -/*

- * pseries-2.3
- */
-
-static void spapr_machine_2_3_class_options(MachineClass *mc)
-{
-    static GlobalProperty compat[] = {
-        { "spapr-pci-host-bridge", "dynamic-reconfiguration", "off" },
-    };
-    spapr_machine_2_4_class_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_3, hw_compat_2_3_len);
-    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
-}
-DEFINE_SPAPR_MACHINE(2, 3);
-
  static void spapr_machine_register_types(void)
  {
      type_register_static(&spapr_machine_info);
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 5c0024bef9..8f1964ce52 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1237,10 +1237,6 @@ static void add_drcs(SpaprPhbState *phb, PCIBus *bus)
      int i;
      uint8_t chassis;

- if (!phb->dr_enabled) {

-        return;
-    }
-
      chassis = chassis_from_bus(bus);

if (pci_bus_is_root(bus)) {

@@ -1260,10 +1256,6 @@ static void remove_drcs(SpaprPhbState *phb, PCIBus *bus)
      int i;
      uint8_t chassis;

- if (!phb->dr_enabled) {

-        return;
-    }
-
      chassis = chassis_from_bus(bus);

for (i = PCI_SLOT_MAX * PCI_FUNC_MAX - 1; i >= 0; i--) {

@@ -1548,17 +1540,6 @@ static void spapr_pci_pre_plug(HotplugHandler 
*plug_handler,
      PCIBus *bus = PCI_BUS(qdev_get_parent_bus(DEVICE(pdev)));
      uint32_t slotnr = PCI_SLOT(pdev->devfn);

- if (!phb->dr_enabled) {

-        /* if this is a hotplug operation initiated by the user
-         * we need to let them know it's not enabled
-         */
-        if (plugged_dev->hotplugged) {
-            error_setg(errp, "Bus '%s' does not support hotplugging",
-                       phb->parent_obj.bus->qbus.name);
-            return;
-        }
-    }
-
      if (IS_PCI_BRIDGE(plugged_dev)) {
          if (!bridge_has_valid_chassis_nr(OBJECT(plugged_dev), errp)) {
              return;
@@ -1591,14 +1572,6 @@ static void spapr_pci_plug(HotplugHandler *plug_handler,
      SpaprDrc *drc = drc_from_dev(phb, pdev);
      uint32_t slotnr = PCI_SLOT(pdev->devfn);

- /*

-     * If DR is disabled we don't need to do anything in the case of
-     * hotplug or coldplug callbacks.
-     */
-    if (!phb->dr_enabled) {
-        return;
-    }
-
      g_assert(drc);

if (IS_PCI_BRIDGE(plugged_dev)) {

@@ -1673,12 +1646,6 @@ static void spapr_pci_unplug_request(HotplugHandler 
*plug_handler,
      PCIDevice *pdev = PCI_DEVICE(plugged_dev);
      SpaprDrc *drc = drc_from_dev(phb, pdev);

- if (!phb->dr_enabled) {

-        error_setg(errp, "Bus '%s' does not support hotplugging",
-                   phb->parent_obj.bus->qbus.name);
-        return;
-    }
-
      g_assert(drc);
      g_assert(drc->dev == plugged_dev);

@@ -2089,8 +2056,6 @@ static Property spapr_phb_properties[] = {

                         SPAPR_PCI_MEM64_WIN_SIZE),
      DEFINE_PROP_UINT64("io_win_size", SpaprPhbState, io_win_size,
                         SPAPR_PCI_IO_WIN_SIZE),
-    DEFINE_PROP_BOOL("dynamic-reconfiguration", SpaprPhbState, dr_enabled,
-                     true),
      /* Default DMA window is 0..1GB */
      DEFINE_PROP_UINT64("dma_win_addr", SpaprPhbState, dma_win_addr, 0),
      DEFINE_PROP_UINT64("dma_win_size", SpaprPhbState, dma_win_size, 
0x40000000),