[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [qemu-s390x] [PATCH v5 13/17] spapr_pci: provide node start offset v
From: |
David Gibson |
Subject: |
Re: [qemu-s390x] [PATCH v5 13/17] spapr_pci: provide node start offset via spapr_populate_pci_dt() |
Date: |
Wed, 20 Feb 2019 14:28:55 +1100 |
User-agent: |
Mutt/1.10.1 (2018-07-13) |
On Tue, Feb 19, 2019 at 06:18:39PM +0100, Greg Kurz wrote:
> From: Michael Roth <address@hidden>
>
> PHB hotplug re-uses PHB device tree generation code and passes
> it to a guest via RTAS. Doing this requires knowledge of where
> exactly in the device tree the node describing the PHB begins.
>
> Provide this via a new optional pointer that can be used to
> store the PHB node's start offset.
>
> 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 | 2 +-
> hw/ppc/spapr_pci.c | 5 ++++-
> include/hw/pci-host/spapr.h | 2 +-
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index fcda17709066..76b3c15d5952 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1312,7 +1312,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr)
>
> QLIST_FOREACH(phb, &spapr->phbs, list) {
> ret = spapr_populate_pci_dt(phb, PHANDLE_INTC, fdt,
> - spapr->irq->nr_msis);
> + spapr->irq->nr_msis, NULL);
> if (ret < 0) {
> error_report("couldn't setup PCI devices in fdt");
> exit(1);
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index ede928b0bff3..a0e17694396a 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -2153,7 +2153,7 @@ static void spapr_phb_pci_enumerate(sPAPRPHBState *phb)
> }
>
> int spapr_populate_pci_dt(sPAPRPHBState *phb, uint32_t intc_phandle, void
> *fdt,
> - uint32_t nr_msis)
> + uint32_t nr_msis, int *node_offset)
> {
> int bus_off, i, j, ret;
> gchar *nodename;
> @@ -2208,6 +2208,9 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb, uint32_t
> intc_phandle, void *fdt,
> nodename = g_strdup_printf("address@hidden" PRIx64, phb->buid);
> _FDT(bus_off = fdt_add_subnode(fdt, 0, nodename));
> g_free(nodename);
> + if (node_offset) {
> + *node_offset = bus_off;
> + }
>
> /* Write PHB properties */
> _FDT(fdt_setprop_string(fdt, bus_off, "device_type", "pci"));
> diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
> index 4b0443f4cfe4..ab0e3a0a6f72 100644
> --- a/include/hw/pci-host/spapr.h
> +++ b/include/hw/pci-host/spapr.h
> @@ -113,7 +113,7 @@ static inline qemu_irq spapr_phb_lsi_qirq(struct
> sPAPRPHBState *phb, int pin)
> }
>
> int spapr_populate_pci_dt(sPAPRPHBState *phb, uint32_t intc_phandle, void
> *fdt,
> - uint32_t nr_msis);
> + uint32_t nr_msis, int *node_offset);
>
> void spapr_pci_rtas_init(void);
>
>
--
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
- Re: [qemu-s390x] [PATCH v5 08/17] spapr_irq: Expose the phandle of the interrupt controller, (continued)
- [qemu-s390x] [PATCH v5 11/17] spapr: populate PHB DRC entries for root DT node, Greg Kurz, 2019/02/19
- [qemu-s390x] [PATCH v5 09/17] spapr_pci: add PHB unrealize, Greg Kurz, 2019/02/19
- [qemu-s390x] [PATCH v5 12/17] spapr_events: add support for phb hotplug events, Greg Kurz, 2019/02/19
- [qemu-s390x] [PATCH v5 10/17] spapr: create DR connectors for PHBs, Greg Kurz, 2019/02/19
- [qemu-s390x] [PATCH v5 13/17] spapr_pci: provide node start offset via spapr_populate_pci_dt(), Greg Kurz, 2019/02/19
- Re: [qemu-s390x] [PATCH v5 13/17] spapr_pci: provide node start offset via spapr_populate_pci_dt(),
David Gibson <=
- [qemu-s390x] [PATCH v5 15/17] spapr: add hotplug hooks for PHB hotplug, Greg Kurz, 2019/02/19
- [qemu-s390x] [PATCH v5 14/17] spapr_pci: add ibm, my-drc-index property for PHB hotplug, Greg Kurz, 2019/02/19
- [qemu-s390x] [PATCH v5 16/17] spapr: enable PHB hotplug for default pseries machine type, Greg Kurz, 2019/02/19
- [qemu-s390x] [PATCH v5 17/17] tests/device-plug: Add PHB unplug request test for spapr, Greg Kurz, 2019/02/19
- Re: [qemu-s390x] [PATCH v5 00/17] spapr: Add support for PHB hotplug, David Gibson, 2019/02/19