[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 27/32] spapr_pci: create DRConnectors for each PCI s
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCH 27/32] spapr_pci: create DRConnectors for each PCI slot during PHB realize |
Date: |
Fri, 1 May 2015 16:41:45 +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 00/32] Accumulated -machine pseries patches 2015/05/01, David Gibson, 2015/05/01
- [Qemu-devel] [PATCH 27/32] spapr_pci: create DRConnectors for each PCI slot during PHB realize,
David Gibson <=
- [Qemu-devel] [PATCH 12/32] hw/ppc/spapr_iommu: Fix the check for invalid upper bits in liobn, David Gibson, 2015/05/01
- [Qemu-devel] [PATCH 26/32] spapr_pci: add dynamic-reconfiguration option for spapr-pci-host-bridge, David Gibson, 2015/05/01
- [Qemu-devel] [PATCH 11/32] spapr_iommu: Give unique QOM name to TCE table, David Gibson, 2015/05/01
- [Qemu-devel] [PATCH 14/32] hw/ppc/spapr: Fix error message when firmware could not be loaded, David Gibson, 2015/05/01
- [Qemu-devel] [PATCH 09/32] spapr_iommu: Make spapr_tce_find_by_liobn() public, David Gibson, 2015/05/01
- [Qemu-devel] [PATCH 18/32] spapr_rtas: add get/set-power-level RTAS interfaces, David Gibson, 2015/05/01
- [Qemu-devel] [PATCH 20/32] spapr_rtas: add get-sensor-state RTAS interface, David Gibson, 2015/05/01
- [Qemu-devel] [PATCH 19/32] spapr_rtas: add set-indicator RTAS interface, David Gibson, 2015/05/01
- [Qemu-devel] [PATCH 04/32] spapr_pci: Introduce a liobn number generating macros, David Gibson, 2015/05/01
- [Qemu-devel] [PATCH 03/32] spapr_iommu: Make H_PUT_TCE_INDIRECT endian-safe, David Gibson, 2015/05/01