[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v5 10/17] spapr: create DR connectors for PHBs
From: |
David Gibson |
Subject: |
Re: [Qemu-devel] [PATCH v5 10/17] spapr: create DR connectors for PHBs |
Date: |
Wed, 20 Feb 2019 14:27:21 +1100 |
User-agent: |
Mutt/1.10.1 (2018-07-13) |
On Tue, Feb 19, 2019 at 06:18:23PM +0100, Greg Kurz wrote:
> From: Michael Roth <address@hidden>
>
> Signed-off-by: Michael Roth <address@hidden>
> Reviewed-by: David Gibson <address@hidden>
> Signed-off-by: Greg Kurz <address@hidden>
Applied, thanks.
> ---
> hw/ppc/spapr.c | 13 +++++++++++++
> hw/ppc/spapr_drc.c | 17 +++++++++++++++++
> include/hw/ppc/spapr.h | 1 +
> include/hw/ppc/spapr_drc.h | 8 ++++++++
> 4 files changed, 39 insertions(+)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 9364d07364ac..96bea7580a3f 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2875,6 +2875,19 @@ static void spapr_machine_init(MachineState *machine)
> /* We always have at least the nvram device on VIO */
> spapr_create_nvram(spapr);
>
> + /*
> + * Setup hotplug / dynamic-reconfiguration connectors. top-level
> + * connectors (described in root DT node's "ibm,drc-types" property)
> + * are pre-initialized here. additional child connectors (such as
> + * connectors for a PHBs PCI slots) are added as needed during their
> + * parent's realization.
> + */
> + if (smc->dr_phb_enabled) {
> + for (i = 0; i < SPAPR_MAX_PHBS; i++) {
> + spapr_dr_connector_new(OBJECT(machine), TYPE_SPAPR_DRC_PHB, i);
> + }
> + }
> +
> /* Set up PCI */
> spapr_pci_rtas_init();
>
> diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
> index 87ca7d973564..fd6380adb367 100644
> --- a/hw/ppc/spapr_drc.c
> +++ b/hw/ppc/spapr_drc.c
> @@ -696,6 +696,15 @@ static void spapr_drc_lmb_class_init(ObjectClass *k,
> void *data)
> drck->dt_populate = spapr_lmb_dt_populate;
> }
>
> +static void spapr_drc_phb_class_init(ObjectClass *k, void *data)
> +{
> + sPAPRDRConnectorClass *drck = SPAPR_DR_CONNECTOR_CLASS(k);
> +
> + drck->typeshift = SPAPR_DR_CONNECTOR_TYPE_SHIFT_PHB;
> + drck->typename = "PHB";
> + drck->drc_name_prefix = "PHB ";
> +}
> +
> static const TypeInfo spapr_dr_connector_info = {
> .name = TYPE_SPAPR_DR_CONNECTOR,
> .parent = TYPE_DEVICE,
> @@ -739,6 +748,13 @@ static const TypeInfo spapr_drc_lmb_info = {
> .class_init = spapr_drc_lmb_class_init,
> };
>
> +static const TypeInfo spapr_drc_phb_info = {
> + .name = TYPE_SPAPR_DRC_PHB,
> + .parent = TYPE_SPAPR_DRC_LOGICAL,
> + .instance_size = sizeof(sPAPRDRConnector),
> + .class_init = spapr_drc_phb_class_init,
> +};
> +
> /* helper functions for external users */
>
> sPAPRDRConnector *spapr_drc_by_index(uint32_t index)
> @@ -1207,6 +1223,7 @@ static void spapr_drc_register_types(void)
> type_register_static(&spapr_drc_cpu_info);
> type_register_static(&spapr_drc_pci_info);
> type_register_static(&spapr_drc_lmb_info);
> + type_register_static(&spapr_drc_phb_info);
>
> spapr_rtas_register(RTAS_SET_INDICATOR, "set-indicator",
> rtas_set_indicator);
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index 5e3c76072505..b173fd714904 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -104,6 +104,7 @@ struct sPAPRMachineClass {
>
> /*< public >*/
> bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs */
> + bool dr_phb_enabled; /* enable dynamic-reconfig/hotplug of PHBs */
> bool update_dt_enabled; /* enable KVMPPC_H_UPDATE_DT */
> bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */
> bool pre_2_10_has_unused_icps;
> diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h
> index f32758ec8487..46b0f6216d83 100644
> --- a/include/hw/ppc/spapr_drc.h
> +++ b/include/hw/ppc/spapr_drc.h
> @@ -71,6 +71,14 @@
> #define SPAPR_DRC_LMB(obj) OBJECT_CHECK(sPAPRDRConnector, (obj), \
> TYPE_SPAPR_DRC_LMB)
>
> +#define TYPE_SPAPR_DRC_PHB "spapr-drc-phb"
> +#define SPAPR_DRC_PHB_GET_CLASS(obj) \
> + OBJECT_GET_CLASS(sPAPRDRConnectorClass, obj, TYPE_SPAPR_DRC_PHB)
> +#define SPAPR_DRC_PHB_CLASS(klass) \
> + OBJECT_CLASS_CHECK(sPAPRDRConnectorClass, klass, TYPE_SPAPR_DRC_PHB)
> +#define SPAPR_DRC_PHB(obj) OBJECT_CHECK(sPAPRDRConnector, (obj), \
> + TYPE_SPAPR_DRC_PHB)
> +
> /*
> * Various hotplug types managed by sPAPRDRConnector
> *
>
--
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
signature.asc
Description: PGP signature
- [Qemu-devel] [PATCH v5 04/17] spapr/pci: Generate FDT fragment at configure connector time, (continued)
- [Qemu-devel] [PATCH v5 04/17] spapr/pci: Generate FDT fragment at configure connector time, Greg Kurz, 2019/02/19
- [Qemu-devel] [PATCH v5 07/17] spapr: Expose the name of the interrupt controller node, Greg Kurz, 2019/02/19
- [Qemu-devel] [PATCH v5 09/17] spapr_pci: add PHB unrealize, Greg Kurz, 2019/02/19
- [Qemu-devel] [PATCH v5 08/17] spapr_irq: Expose the phandle of the interrupt controller, Greg Kurz, 2019/02/19
- [Qemu-devel] [PATCH v5 11/17] spapr: populate PHB DRC entries for root DT node, Greg Kurz, 2019/02/19
- [Qemu-devel] [PATCH v5 10/17] spapr: create DR connectors for PHBs, Greg Kurz, 2019/02/19
- Re: [Qemu-devel] [PATCH v5 10/17] spapr: create DR connectors for PHBs,
David Gibson <=
- [Qemu-devel] [PATCH v5 13/17] spapr_pci: provide node start offset via spapr_populate_pci_dt(), Greg Kurz, 2019/02/19
- [Qemu-devel] [PATCH v5 12/17] spapr_events: add support for phb hotplug events, Greg Kurz, 2019/02/19
- [Qemu-devel] [PATCH v5 14/17] spapr_pci: add ibm, my-drc-index property for PHB hotplug, Greg Kurz, 2019/02/19
- [Qemu-devel] [PATCH v5 15/17] spapr: add hotplug hooks for PHB hotplug, Greg Kurz, 2019/02/19
- [Qemu-devel] [PATCH v5 16/17] spapr: enable PHB hotplug for default pseries machine type, Greg Kurz, 2019/02/19
- [Qemu-devel] [PATCH v5 17/17] tests/device-plug: Add PHB unplug request test for spapr, Greg Kurz, 2019/02/19
- Re: [Qemu-devel] [PATCH v5 00/17] spapr: Add support for PHB hotplug, David Gibson, 2019/02/19