@@ -62,6 +62,7 @@
#include "hw/compat.h"
#include <libfdt.h>
+#include "sysemu/device_tree.h"
/* SLOF memory layout:
*
@@ -1711,6 +1712,11 @@ static void ppc_spapr_init(MachineState *machine)
/* used by RTAS */
QTAILQ_INIT(&spapr->ccs_list);
qemu_register_reset(spapr_ccs_reset_hook, spapr);
+
+ if (spapr->dr_phb_enabled) {
+ qbus_set_hotplug_handler_generic(sysbus_get_default(), OBJECT(machine),
+ NULL);
+ }
}
static int spapr_kvm_type(const char *vm_type)
@@ -1829,14 +1835,104 @@ static void spapr_nmi(NMIState *n, int cpu_index, Error **errp)
}
}
+static void spapr_machine_phb_plug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ sPAPRPHBState *sphb;
+ void *fdt = NULL;
+ int fdt_start_offset = 0;
+ int fdt_size = 0;
+ Error *local_err = NULL;
+ sPAPRDRConnector *drc;
+ sPAPRDRConnectorClass *drck;
+
+ sphb = SPAPR_PCI_HOST_BRIDGE(dev);
+ drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_PHB, sphb->index);
+ /* hotplug hooks should check it's enabled before getting this far */
+ g_assert(drc);
+ drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
+
+ /* boot-time devices get their device tree node created by SLOF, but for
+ * hotplugged devices we need QEMU to generate it so the guest can fetch
+ * it via RTAS
+ */
+ if (dev->hotplugged) {
+ int ret;
+ fdt = create_device_tree(&fdt_size);
+ ret = spapr_populate_pci_dt(sphb, PHANDLE_XICP, fdt, &fdt_start_offset);
+ if (ret < 0) {
+ error_setg(&local_err, "unable to create FDT for hotplugged PHB");
+ goto out;
+ }
+
+ /* generally SLOF creates these, for hotplug it's up to QEMU */
+ _FDT(fdt_setprop_string(fdt, fdt_start_offset, "name", "pci"));
+ }
+
+ /* boot-time devices still get associated with a DRC to allow for unplug,
+ * but since we use SLOF-generated DT here we don't need to re-generate it
+ */
+ drck->attach(drc, DEVICE(dev),
+ fdt, fdt_start_offset, !dev->hotplugged, &local_err);
+out:
+ if (local_err) {
+ error_propagate(errp, local_err);
+ g_free(fdt);
+ return;
+ }
+
+ if (dev->hotplugged) {
+ spapr_hotplug_req_add_event(drc);
+ }
+}
+
+static void spapr_machine_phb_remove_cb(DeviceState *dev, void *opaque)
+{
+ object_unparent(OBJECT(dev));
+}
+
+static void spapr_machine_phb_unplug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ sPAPRPHBState *sphb;
+ sPAPRDRConnector *drc;
+ sPAPRDRConnectorClass *drck;
+ Error *local_err = NULL;
+
+ sphb = SPAPR_PCI_HOST_BRIDGE(dev);
+ drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_PHB, sphb->index);
+ g_assert(drc);
+ drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
+
+ if (!drck->release_pending(drc)) {
+ drck->detach(drc, DEVICE(dev), spapr_machine_phb_remove_cb, NULL,
+ &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+ spapr_hotplug_req_remove_event(drc);
+ }
+}
+
static void spapr_machine_device_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
+ if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_PCI_HOST_BRIDGE)) {
+ if (spapr->dr_phb_enabled) {
+ spapr_machine_phb_plug(hotplug_dev, dev, errp);
+ }
+ }
}
static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
+ if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_PCI_HOST_BRIDGE)) {
+ if (spapr->dr_phb_enabled) {
+ spapr_machine_phb_unplug(hotplug_dev, dev, errp);
+ }
+ }
}
static HotplugHandler *spapr_get_hotplug_handler(MachineState *machine,
Hotplugging PHBs is a machine-level operation, but PHBs reside on the main system bus, so we register spapr machine as the handler for the main system bus. The entry point for plug/unplug is shared by all such machine-level hotplug operations (memory, CPU, PHB, etc), and from there we branch off to specific hotplug callbacks based on the object type. Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> --- hw/ppc/spapr.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+)