[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 11/15] spapr_pci: add dynamic-reconfiguration opt
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH v6 11/15] spapr_pci: add dynamic-reconfiguration option for spapr-pci-host-bridge |
Date: |
Thu, 26 Feb 2015 21:11:11 -0600 |
This option enables/disables PCI hotplug for a particular PHB.
Also add machine compatibility code to disable it by default for machine
types prior to pseries-2.3.
Signed-off-by: Michael Roth <address@hidden>
Reviewed-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 5 +++++
hw/ppc/spapr_pci.c | 2 ++
include/hw/pci-host/spapr.h | 1 +
3 files changed, 8 insertions(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index c967721..7272509 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1801,6 +1801,11 @@ static const TypeInfo spapr_machine_info = {
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\
.property = "mem_win_size",\
.value = "0x20000000",\
+ },\
+ {\
+ .driver = "spapr-pci-host-bridge",\
+ .property = "dynamic-reconfiguration",\
+ .value = "off",\
}
#define SPAPR_COMPAT_2_1 \
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 7d37d83..e6e2f7b 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -684,6 +684,8 @@ static Property spapr_phb_properties[] = {
DEFINE_PROP_UINT64("io_win_addr", sPAPRPHBState, io_win_addr, -1),
DEFINE_PROP_UINT64("io_win_size", sPAPRPHBState, io_win_size,
SPAPR_PCI_IO_WIN_SIZE),
+ DEFINE_PROP_BOOL("dynamic-reconfiguration", sPAPRPHBState, dr_enabled,
+ true),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
index d725f0e..24867b0 100644
--- a/include/hw/pci-host/spapr.h
+++ b/include/hw/pci-host/spapr.h
@@ -67,6 +67,7 @@ struct sPAPRPHBState {
uint32_t index;
uint64_t buid;
char *dtbusname;
+ bool dr_enabled;
MemoryRegion memspace, iospace;
hwaddr mem_win_addr, mem_win_size, io_win_addr, io_win_size;
--
1.9.1
- [Qemu-devel] [PATCH v6 00/15] spapr: add support for pci hotplug, Michael Roth, 2015/02/26
- [Qemu-devel] [PATCH v6 09/15] spapr_events: event-scan RTAS interface, Michael Roth, 2015/02/26
- [Qemu-devel] [PATCH v6 10/15] spapr_drc: add spapr_drc_populate_dt(), Michael Roth, 2015/02/26
- [Qemu-devel] [PATCH v6 13/15] pci: make pci_bar useable outside pci.c, Michael Roth, 2015/02/26
- [Qemu-devel] [PATCH v6 11/15] spapr_pci: add dynamic-reconfiguration option for spapr-pci-host-bridge,
Michael Roth <=
- [Qemu-devel] [PATCH v6 12/15] spapr_pci: create DRConnectors for each PCI slot during PHB realize, Michael Roth, 2015/02/26
- [Qemu-devel] [PATCH v6 01/15] docs: add sPAPR hotplug/dynamic-reconfiguration documentation, Michael Roth, 2015/02/26
- [Qemu-devel] [PATCH v6 02/15] spapr_drc: initial implementation of sPAPRDRConnector device, Michael Roth, 2015/02/26
- [Qemu-devel] [PATCH v6 14/15] spapr_pci: enable basic hotplug operations, Michael Roth, 2015/02/26
- [Qemu-devel] [PATCH v6 04/15] spapr_rtas: add set-indicator RTAS interface, Michael Roth, 2015/02/26
- [Qemu-devel] [PATCH v6 15/15] spapr_pci: emit hotplug add/remove events during hotplug, Michael Roth, 2015/02/26