[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 27/33] spapr_pci: create DRConnectors for each PCI s
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCH 27/33] spapr_pci: create DRConnectors for each PCI slot during PHB realize |
Date: |
Thu, 7 May 2015 15:33:53 +1000 |
From: Michael Roth <address@hidden>
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: Michael Roth <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr_pci.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index a2dcc6a..c17e5f2 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -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;
}
--
2.1.0
- [Qemu-devel] [PATCH 11/33] spapr_iommu: Give unique QOM name to TCE table, (continued)
- [Qemu-devel] [PATCH 11/33] spapr_iommu: Give unique QOM name to TCE table, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 18/33] spapr_rtas: add get/set-power-level RTAS interfaces, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 15/33] hw/ppc/spapr: Use error_report() instead of hw_error(), David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 12/33] hw/ppc/spapr_iommu: Fix the check for invalid upper bits in liobn, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 32/33] spapr: override default ram size to 512MB, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 21/33] spapr: add rtas_st_buffer_direct() helper, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 28/33] pci: make pci_bar useable outside pci.c, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 19/33] spapr_rtas: add set-indicator RTAS interface, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 33/33] pseries: Enable in-kernel H_LOGICAL_CI_{LOAD, STORE} implementations, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 25/33] spapr_drc: add spapr_drc_populate_dt(), David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 27/33] spapr_pci: create DRConnectors for each PCI slot during PHB realize,
David Gibson <=
- [Qemu-devel] [PATCH 24/33] spapr_events: event-scan RTAS interface, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 16/33] docs: add sPAPR hotplug/dynamic-reconfiguration documentation, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 22/33] spapr_rtas: add ibm, configure-connector RTAS interface, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 30/33] spapr_pci: emit hotplug add/remove events during hotplug, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 26/33] spapr_pci: add dynamic-reconfiguration option for spapr-pci-host-bridge, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 31/33] machine: add default_ram_size to machine class, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 20/33] spapr_rtas: add get-sensor-state RTAS interface, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 23/33] spapr_events: re-use EPOW event infrastructure for hotplug events, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 29/33] spapr_pci: enable basic hotplug operations, David Gibson, 2015/05/07
- [Qemu-devel] [PATCH 17/33] spapr_drc: initial implementation of sPAPRDRConnector device, David Gibson, 2015/05/07