From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byT1q-0007px-Hz for qemu-devel@nongnu.org; Sun, 23 Oct 2016 20:22:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1byT1n-0005Kj-4B for qemu-devel@nongnu.org; Sun, 23 Oct 2016 20:22:14 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:34876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1byT1m-0005JH-Rv for qemu-devel@nongnu.org; Sun, 23 Oct 2016 20:22:11 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u9O0Imnh052101 for ; Sun, 23 Oct 2016 20:22:10 -0400 Received: from e17.ny.us.ibm.com (e17.ny.us.ibm.com [129.33.205.207]) by mx0a-001b2d01.pphosted.com with ESMTP id 2693xkebj2-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Sun, 23 Oct 2016 20:22:09 -0400 Received: from localhost by e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 23 Oct 2016 20:22:08 -0400 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <1477018600-6881-12-git-send-email-david@gibson.dropbear.id.au> References: <1477018600-6881-1-git-send-email-david@gibson.dropbear.id.au> <1477018600-6881-12-git-send-email-david@gibson.dropbear.id.au> Date: Sun, 23 Oct 2016 18:27:21 -0500 Message-Id: <20161023232721.17113.18925@loki> Subject: Re: [Qemu-devel] [PATCHv2 11/12] pseries: Consolidate construction of /vdevice device tree node List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , aik@ozlabs.ru, groug@kaod.org Cc: agraf@suse.de, lvivier@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org Quoting David Gibson (2016-10-20 21:56:39) > Construction of the /vdevice node (and its children) is divided between > spapr_create_fdt_skel() (at init time), which creates the base node, and > spapr_populate_vdevice() (at reset time) which creates the nodes for each > individual virtual device. > = > This consolidates both into a single function called from > spapr_build_fdt(). > = > Signed-off-by: David Gibson > Reviewed-by: Thomas Huth Reviewed-by: Michael Roth > --- > hw/ppc/spapr.c | 19 ++----------------- > hw/ppc/spapr_vio.c | 23 ++++++++++++++++------- > include/hw/ppc/spapr_vio.h | 2 +- > 3 files changed, 19 insertions(+), 25 deletions(-) > = > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 4bd547f..97369bd 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -316,18 +316,6 @@ static void *spapr_create_fdt_skel(sPAPRMachineState= *spapr) > _FDT((fdt_property_cell(fdt, "#address-cells", 0x2))); > _FDT((fdt_property_cell(fdt, "#size-cells", 0x2))); > = > - /* vdevice */ > - _FDT((fdt_begin_node(fdt, "vdevice"))); > - > - _FDT((fdt_property_string(fdt, "device_type", "vdevice"))); > - _FDT((fdt_property_string(fdt, "compatible", "IBM,vdevice"))); > - _FDT((fdt_property_cell(fdt, "#address-cells", 0x1))); > - _FDT((fdt_property_cell(fdt, "#size-cells", 0x0))); > - _FDT((fdt_property_cell(fdt, "#interrupt-cells", 0x2))); > - _FDT((fdt_property(fdt, "interrupt-controller", NULL, 0))); > - > - _FDT((fdt_end_node(fdt))); > - > _FDT((fdt_end_node(fdt))); /* close root node */ > _FDT((fdt_finish(fdt))); > = > @@ -943,11 +931,8 @@ static void *spapr_build_fdt(sPAPRMachineState *spap= r, > exit(1); > } > = > - ret =3D spapr_populate_vdevice(spapr->vio_bus, fdt); > - if (ret < 0) { > - error_report("couldn't setup vio devices in fdt"); > - exit(1); > - } > + /* /vdevice */ > + spapr_dt_vdevice(spapr->vio_bus, fdt); > = > if (object_resolve_path_type("", TYPE_SPAPR_RNG, NULL)) { > ret =3D spapr_rng_populate_dt(fdt); > diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c > index 2b67df0..cc1e09c 100644 > --- a/hw/ppc/spapr_vio.c > +++ b/hw/ppc/spapr_vio.c > @@ -36,6 +36,7 @@ > #include "hw/ppc/spapr.h" > #include "hw/ppc/spapr_vio.h" > #include "hw/ppc/xics.h" > +#include "hw/ppc/fdt.h" > #include "trace.h" > = > #include > @@ -624,11 +625,21 @@ static int compare_reg(const void *p1, const void *= p2) > return 1; > } > = > -int spapr_populate_vdevice(VIOsPAPRBus *bus, void *fdt) > +void spapr_dt_vdevice(VIOsPAPRBus *bus, void *fdt) > { > DeviceState *qdev, **qdevs; > BusChild *kid; > int i, num, ret =3D 0; > + int node; > + > + _FDT(node =3D fdt_add_subnode(fdt, 0, "vdevice")); > + > + _FDT(fdt_setprop_string(fdt, node, "device_type", "vdevice")); > + _FDT(fdt_setprop_string(fdt, node, "compatible", "IBM,vdevice")); > + _FDT(fdt_setprop_cell(fdt, node, "#address-cells", 1)); > + _FDT(fdt_setprop_cell(fdt, node, "#size-cells", 0)); > + _FDT(fdt_setprop_cell(fdt, node, "#interrupt-cells", 2)); > + _FDT(fdt_setprop(fdt, node, "interrupt-controller", NULL, 0)); > = > /* Count qdevs on the bus list */ > num =3D 0; > @@ -650,19 +661,17 @@ int spapr_populate_vdevice(VIOsPAPRBus *bus, void *= fdt) > * to know that will mean they are in forward order in the tree. */ > for (i =3D num - 1; i >=3D 0; i--) { > VIOsPAPRDevice *dev =3D (VIOsPAPRDevice *)(qdevs[i]); > + VIOsPAPRDeviceClass *vdc =3D VIO_SPAPR_DEVICE_GET_CLASS(dev); > = > ret =3D vio_make_devnode(dev, fdt); > - > if (ret < 0) { > - goto out; > + error_report("Couldn't create device node /vdevice/%s@%"PRIx= 32, > + vdc->dt_name, dev->reg); > + exit(1); > } > } > = > - ret =3D 0; > -out: > g_free(qdevs); > - > - return ret; > } > = > gchar *spapr_vio_stdout_path(VIOsPAPRBus *bus) > diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h > index a0e7542..14f5022 100644 > --- a/include/hw/ppc/spapr_vio.h > +++ b/include/hw/ppc/spapr_vio.h > @@ -80,7 +80,7 @@ struct VIOsPAPRBus { > = > extern VIOsPAPRBus *spapr_vio_bus_init(void); > extern VIOsPAPRDevice *spapr_vio_find_by_reg(VIOsPAPRBus *bus, uint32_t = reg); > -extern int spapr_populate_vdevice(VIOsPAPRBus *bus, void *fdt); > +void spapr_dt_vdevice(VIOsPAPRBus *bus, void *fdt); > extern gchar *spapr_vio_stdout_path(VIOsPAPRBus *bus); > = > static inline qemu_irq spapr_vio_qirq(VIOsPAPRDevice *dev) > -- = > 2.7.4 >=20