Commit 62083979 authored by Michael Roth's avatar Michael Roth Committed by Alexander Graf
Browse files

spapr_pci: create DRConnectors for each PCI slot during PHB realize 



These will be used to support hotplug/unplug of PCI devices to the PCI
bus associated with a particular PHB.

We also set up device-tree properties in each PHBs initial FDT to
describe the DRCs associated with them. This advertises to guests that
each PHB is DR-capable device with physical hotpluggable slots, each
managed by the corresponding DRC. This is necessary for allowing
hotplugging of devices to it later via bus rescan or guest rpaphp
hotplug module.

Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 7619c7b0

hw/ppc/spapr_pci.c

+17 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "qemu/error-report.h"



#include "hw/pci/pci_bus.h"

#include "hw/ppc/spapr_drc.h"



/* Copied from the kernel arch/powerpc/platforms/pseries/msi.c */

#define RTAS_QUERY_FN           0
@@ -880,6 +881,15 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) 
        sphb->lsi_table[i].irq = irq;

    }



    /* allocate connectors for child PCI devices */

    if (sphb->dr_enabled) {

        for (i = 0; i < PCI_SLOT_MAX * 8; i++) {

            spapr_dr_connector_new(OBJECT(phb),

                                   SPAPR_DR_CONNECTOR_TYPE_PCI,

                                   (sphb->index << 16) | i);

        }

    }



    if (!info->finish_realize) {

        error_setg(errp, "finish_realize not defined");

        return;
@@ -1096,7 +1106,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb, 
                          uint32_t xics_phandle,

                          void *fdt)

{

    int bus_off, i, j;

    int bus_off, i, j, ret;

    char nodename[256];

    uint32_t bus_range[] = { cpu_to_be32(0), cpu_to_be32(0xff) };

    const uint64_t mmiosize = memory_region_size(&phb->memwindow);
@@ -1188,6 +1198,12 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb, 
                 tcet->liobn, tcet->bus_offset,

                 tcet->nb_table << tcet->page_shift);



    ret = spapr_drc_populate_dt(fdt, bus_off, OBJECT(phb),

                                SPAPR_DR_CONNECTOR_TYPE_PCI);

    if (ret) {

        return ret;

    }



    return 0;

}