Commit 5c1da812 authored by David Gibson's avatar David Gibson
Browse files

spapr: Remove unnecessary differences between hotplug and coldplug paths 



spapr_drc_attach() has a 'coldplug' parameter which sets the DRC into
configured state initially, instead of the usual ISOLATED/UNUSABLE state.
It turns out this is unnecessary: although coldplugged devices do need to
be in CONFIGURED state once the guest starts, that will already be
accomplished by the reset code which will move DRCs for already plugged
devices into a coldplug equivalent state.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
parent 6b762f29

hw/ppc/spapr.c

+3 −10
Original line number Diff line number Diff line
@@ -2611,7 +2611,7 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size, 
        fdt_offset = spapr_populate_memory_node(fdt, node, addr,

                                                SPAPR_MEMORY_BLOCK_SIZE);



        spapr_drc_attach(drc, dev, fdt, fdt_offset, !dev->hotplugged, errp);

        spapr_drc_attach(drc, dev, fdt, fdt_offset, errp);

        addr += SPAPR_MEMORY_BLOCK_SIZE;

    }

    /* send hotplug notification to the
@@ -2956,17 +2956,10 @@ static void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev, 


    g_assert(drc || !mc->has_hotpluggable_cpus);



    /*

     * Setup CPU DT entries only for hotplugged CPUs. For boot time or

     * coldplugged CPUs DT entries are setup in spapr_build_fdt().

     */

    if (dev->hotplugged) {

    fdt = spapr_populate_hotplug_cpu_dt(cs, &fdt_offset, spapr);

    }



    if (drc) {

        spapr_drc_attach(drc, dev, fdt, fdt_offset, !dev->hotplugged,

                         &local_err);

        spapr_drc_attach(drc, dev, fdt, fdt_offset, &local_err);

        if (local_err) {

            g_free(fdt);

            error_propagate(errp, local_err);

hw/ppc/spapr_drc.c

+2 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name, 
}



void spapr_drc_attach(sPAPRDRConnector *drc, DeviceState *d, void *fdt,

                      int fdt_start_offset, bool coldplug, Error **errp)

                      int fdt_start_offset, Error **errp)

{

    trace_spapr_drc_attach(spapr_drc_index(drc));
@@ -351,12 +351,11 @@ void spapr_drc_attach(sPAPRDRConnector *drc, DeviceState *d, void *fdt, 
    if (spapr_drc_type(drc) == SPAPR_DR_CONNECTOR_TYPE_PCI) {

        g_assert(drc->allocation_state == SPAPR_DR_ALLOCATION_STATE_USABLE);

    }

    g_assert(fdt || coldplug);

    g_assert(fdt);



    drc->dev = d;

    drc->fdt = fdt;

    drc->fdt_start_offset = fdt_start_offset;

    drc->configured = coldplug;



    if (spapr_drc_type(drc) != SPAPR_DR_CONNECTOR_TYPE_PCI) {

        drc->awaiting_allocation = true;

hw/ppc/spapr_pci.c

+1 −2
Original line number Diff line number Diff line
@@ -1435,8 +1435,7 @@ static void spapr_phb_hot_plug_child(HotplugHandler *plug_handler, 
        goto out;

    }



    spapr_drc_attach(drc, DEVICE(pdev), fdt, fdt_start_offset,

                     !plugged_dev->hotplugged, &local_err);

    spapr_drc_attach(drc, DEVICE(pdev), fdt, fdt_start_offset, &local_err);

    if (local_err) {

        goto out;

    }

include/hw/ppc/spapr_drc.h

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, 
                          uint32_t drc_type_mask);



void spapr_drc_attach(sPAPRDRConnector *drc, DeviceState *d, void *fdt,

                      int fdt_start_offset, bool coldplug, Error **errp);

                      int fdt_start_offset, Error **errp);

void spapr_drc_detach(sPAPRDRConnector *drc, DeviceState *d, Error **errp);



#endif /* HW_SPAPR_DRC_H */