From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpbJX-0002Kt-U3 for qemu-devel@nongnu.org; Tue, 05 May 2015 07:47:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YpbJU-0003dq-AX for qemu-devel@nongnu.org; Tue, 05 May 2015 07:47:03 -0400 Date: Tue, 5 May 2015 21:44:02 +1000 From: David Gibson Message-ID: <20150505114402.GG14090@voom.redhat.com> References: <1430335224-6716-1-git-send-email-mdroth@linux.vnet.ibm.com> <1430335224-6716-14-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="BNd1cQq+8a6XQVk/" Content-Disposition: inline In-Reply-To: <1430335224-6716-14-git-send-email-mdroth@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [RFC PATCH 13/15] spapr_pci: provide node start offset via spapr_populate_pci_dt() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth Cc: aik@ozlabs.ru, nfont@linux.vnet.ibm.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, bharata@linux.vnet.ibm.com --BNd1cQq+8a6XQVk/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 29, 2015 at 02:20:22PM -0500, Michael Roth wrote: > 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. >=20 > Provide this via a new optional pointer that can be used to > store the PHB node's start offset. >=20 > Signed-off-by: Michael Roth Reviewed-by: David Gibson > --- > hw/ppc/spapr.c | 2 +- > hw/ppc/spapr_pci.c | 6 +++++- > include/hw/pci-host/spapr.h | 3 ++- > 3 files changed, 8 insertions(+), 3 deletions(-) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 042e7a9..ecf40e4 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -767,7 +767,7 @@ static void spapr_finalize_fdt(sPAPREnvironment *spap= r, > } > =20 > QLIST_FOREACH(phb, &spapr->phbs, list) { > - ret =3D spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt); > + ret =3D spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt, NULL); > } > =20 > if (ret < 0) { > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index e37de28..66fe85f 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -1534,7 +1534,8 @@ PCIHostState *spapr_create_phb(sPAPREnvironment *sp= apr, int index) > =20 > int spapr_populate_pci_dt(sPAPRPHBState *phb, > uint32_t xics_phandle, > - void *fdt) > + void *fdt, > + int *node_offset) > { > int bus_off, i, j, ret; > char nodename[256]; > @@ -1578,6 +1579,9 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb, > if (bus_off < 0) { > return bus_off; > } > + if (node_offset) { > + *node_offset =3D bus_off; > + } > =20 > /* 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 9dca388..32a9213 100644 > --- a/include/hw/pci-host/spapr.h > +++ b/include/hw/pci-host/spapr.h > @@ -126,7 +126,8 @@ PCIHostState *spapr_create_phb(sPAPREnvironment *spap= r, int index); > =20 > int spapr_populate_pci_dt(sPAPRPHBState *phb, > uint32_t xics_phandle, > - void *fdt); > + void *fdt, > + int *node_offset); > =20 > void spapr_pci_msi_init(sPAPREnvironment *spapr, hwaddr addr); > =20 --=20 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 --BNd1cQq+8a6XQVk/ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJVSK0BAAoJEGw4ysog2bOSa6cQAL/MLpLe1EdVdp0BiGavponM n4r/xiDNObJaJKY0Y6CzU9ZZesWDMNquyh3LvJ/dEY9ZYYyFdJ+Fuv6hsttsAi25 1QUTsiHVs+/urY6Qmxuyy9OWb92nDQONOapw+UzW5xlwhyoonDyI7M+LKuGfUZH9 EPTIPNzxXkZs1cIWY4wkNWOBmlyJg3kc471rWAL3tvG3Lig2dvjsvMv4ZA5v/hJq Kkt/lPFTQ5U21o9x5skIdhQ+njzr1NqG6dE0Nk8odGQcesB8J4EH9YVNjxVWpluj z2Wetzdf92qbSg5VuByjS2kuxLodn2vVjK8yYFmybbYvr834G0kdXs2kzBRzw+HO pnjB1HRild+jr6/R6eoUkK8aK5RbgQxab+4KYXSZwwc9bBDDcltjqNrqtf+4lIpN HF6IPrjcrJ+6Lx4KGXv9aR4Q2kOEH/xFqLpqi1ynzwW17Ct3Yy6BAVC+4mPl/kyf POtdrhXkWtk2Lkpr+yi2EzlBfmQP5wZTR5AIuuA178wfCH8BlYc347JuZXIGCN9+ AHvZzkwydsYUvu4VSxuhG15zIOei7A8qFIyqKoIdZJes/T8rncX0tdXazkwd8kIV BaeTyGXuYpyUQYULt8K4xKq4a7hDf1WzYBXwM83rfSOEXLgOLIxoA8XUp2pF5zcR QMXSb0L7moHg61Ter2qG =uet5 -----END PGP SIGNATURE----- --BNd1cQq+8a6XQVk/--