[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH v8 12/16] spapr_pci: add dynamic-reconfiguration o
From: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [PATCH v8 12/16] spapr_pci: add dynamic-reconfiguration option for spapr-pci-host-bridge |
Date: |
Tue, 28 Apr 2015 17:26:50 +1000 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
On Wed, Apr 22, 2015 at 01:28:16AM -0500, Michael Roth wrote:
> 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.4.
>
> Signed-off-by: Michael Roth <address@hidden>
> Reviewed-by: David Gibson <address@hidden>
> ---
> hw/ppc/spapr.c | 15 ++++++++++++++-
> hw/ppc/spapr_pci.c | 2 ++
> include/hw/pci-host/spapr.h | 1 +
> 3 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 6fab4d3..837b36d 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1806,12 +1806,20 @@ static const TypeInfo spapr_machine_info = {
> },
> };
>
> +#define SPAPR_COMPAT_2_3 \
> + {\
> + .driver = "spapr-pci-host-bridge",\
> + .property = "dynamic-reconfiguration",\
> + .value = "off",\
> + }
> +
> #define SPAPR_COMPAT_2_2 \
> {\
> .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\
> .property = "mem_win_size",\
> .value = "0x20000000",\
> - }
> + },\
> + SPAPR_COMPAT_2_3
Convention in PC and other places seems to be to put the next version
compat macro at the top of the definition, rather than the bottom.
>
> #define SPAPR_COMPAT_2_1 \
> SPAPR_COMPAT_2_2
> @@ -1857,12 +1865,17 @@ static const TypeInfo spapr_machine_2_2_info = {
>
> static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data)
> {
> + static GlobalProperty compat_props[] = {
> + SPAPR_COMPAT_2_3,
> + { /* end of list */ }
> + };
> MachineClass *mc = MACHINE_CLASS(oc);
>
> mc->name = "pseries-2.3";
> mc->desc = "pSeries Logical Partition (PAPR compliant) v2.3";
> mc->alias = "pseries";
> mc->is_default = 0;
> + mc->compat_props = compat_props;
> }
>
> static const TypeInfo spapr_machine_2_3_info = {
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index 52c5c73..a2dcc6a 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -936,6 +936,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 5b497ce..9dca388 100644
> --- a/include/hw/pci-host/spapr.h
> +++ b/include/hw/pci-host/spapr.h
> @@ -71,6 +71,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;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
pgpQxqqPQcl01.pgp
Description: PGP signature
- [Qemu-ppc] [PATCH v8 00/16] spapr: add support for pci hotplug, Michael Roth, 2015/04/22
- [Qemu-ppc] [PATCH v8 09/16] spapr_events: event-scan RTAS interface, Michael Roth, 2015/04/22
- [Qemu-ppc] [PATCH v8 10/16] spapr_drc: add spapr_drc_populate_dt(), Michael Roth, 2015/04/22
- [Qemu-ppc] [PATCH v8 11/16] spapr: add pseries-2.4 machine type, Michael Roth, 2015/04/22
- [Qemu-ppc] [PATCH v8 13/16] spapr_pci: create DRConnectors for each PCI slot during PHB realize, Michael Roth, 2015/04/22
- [Qemu-ppc] [PATCH v8 12/16] spapr_pci: add dynamic-reconfiguration option for spapr-pci-host-bridge, Michael Roth, 2015/04/22
- Re: [Qemu-ppc] [PATCH v8 12/16] spapr_pci: add dynamic-reconfiguration option for spapr-pci-host-bridge,
David Gibson <=
- [Qemu-ppc] [PATCH v8 14/16] pci: make pci_bar useable outside pci.c, Michael Roth, 2015/04/22
- [Qemu-ppc] [PATCH v8 15/16] spapr_pci: enable basic hotplug operations, Michael Roth, 2015/04/22
- [Qemu-ppc] [PATCH v8 16/16] spapr_pci: emit hotplug add/remove events during hotplug, Michael Roth, 2015/04/22
- [Qemu-ppc] [PATCH v8 01/16] docs: add sPAPR hotplug/dynamic-reconfiguration documentation, Michael Roth, 2015/04/22
- [Qemu-ppc] [PATCH v8 02/16] spapr_drc: initial implementation of sPAPRDRConnector device, Michael Roth, 2015/04/22
- [Qemu-ppc] [PATCH v8 04/16] spapr_rtas: add set-indicator RTAS interface, Michael Roth, 2015/04/22