From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C274C04AAC for ; Thu, 23 May 2019 05:34:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 068CD20881 for ; Thu, 23 May 2019 05:34:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="ll88wXPa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 068CD20881 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:57956 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTgNB-0003IK-A8 for qemu-devel@archiver.kernel.org; Thu, 23 May 2019 01:34:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTgIK-00080F-PI for qemu-devel@nongnu.org; Thu, 23 May 2019 01:29:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTgII-0005hU-P7 for qemu-devel@nongnu.org; Thu, 23 May 2019 01:29:36 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:46377 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTgIG-0005eq-Sy; Thu, 23 May 2019 01:29:34 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 458dNM1cfDz9sBV; Thu, 23 May 2019 15:29:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1558589363; bh=wlcVpy0sbRd29hFk1MbdfxHd4sEwdHTcHO9jwTKHELc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ll88wXPaUY6Y0K9apcMfZbHyPEhPOulAbUL9qLVLSFukOqLYuCwigRelOw8vSEKgK f3qTh2pTxibYeowkPzOglxTJ2q9rMGsgfq3RBqAb7FjlSudHnvUPPuoP/bOPu7Pj0X Ry4lfljL8Zs0Q/UfeQqew6eM30sdpRmeO6L2GssI= From: David Gibson To: qemu-ppc@nongnu.org Date: Thu, 23 May 2019 15:29:14 +1000 Message-Id: <20190523052918.1129-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523052918.1129-1-david@gibson.dropbear.id.au> References: <20190523052918.1129-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 4/8] spapr: Clean up spapr_drc_populate_dt() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mst@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, clg@kaod.org, mdroth@linux.ibm.com, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This makes some minor cleanups to spapr_drc_populate_dt(), renaming it to the shorter and more idiomatic spapr_dt_drc() along the way. Signed-off-by: David Gibson --- hw/ppc/spapr.c | 7 +++---- hw/ppc/spapr_drc.c | 13 ++++++------- hw/ppc/spapr_pci.c | 3 +-- include/hw/ppc/spapr_drc.h | 3 +-- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 44573adce7..507fd50dd5 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1320,13 +1320,12 @@ static void *spapr_build_fdt(SpaprMachineState *s= papr) spapr_populate_cpus_dt_node(fdt, spapr); =20 if (smc->dr_lmb_enabled) { - _FDT(spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE= _LMB)); + _FDT(spapr_dt_drc(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_LMB)); } =20 if (mc->has_hotpluggable_cpus) { int offset =3D fdt_path_offset(fdt, "/cpus"); - ret =3D spapr_drc_populate_dt(fdt, offset, NULL, - SPAPR_DR_CONNECTOR_TYPE_CPU); + ret =3D spapr_dt_drc(fdt, offset, NULL, SPAPR_DR_CONNECTOR_TYPE_= CPU); if (ret < 0) { error_report("Couldn't set up CPU DR device tree properties"= ); exit(1); @@ -1363,7 +1362,7 @@ static void *spapr_build_fdt(SpaprMachineState *spa= pr) } =20 if (smc->dr_phb_enabled) { - ret =3D spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_T= YPE_PHB); + ret =3D spapr_dt_drc(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_PHB); if (ret < 0) { error_report("Couldn't set up PHB DR device tree properties"= ); exit(1); diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 597f236b9c..bacadfcac5 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -781,7 +781,7 @@ SpaprDrc *spapr_drc_by_id(const char *type, uint32_t = id) } =20 /** - * spapr_drc_populate_dt + * spapr_dt_drc * * @fdt: libfdt device tree * @path: path in the DT to generate properties @@ -794,8 +794,7 @@ SpaprDrc *spapr_drc_by_id(const char *type, uint32_t = id) * * as documented in PAPR+ v2.1, 13.5.2 */ -int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, - uint32_t drc_type_mask) +int spapr_dt_drc(void *fdt, int offset, Object *owner, uint32_t drc_type= _mask) { Object *root_container; ObjectProperty *prop; @@ -873,7 +872,7 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, = Object *owner, *(uint32_t *)drc_names->str =3D cpu_to_be32(drc_count); *(uint32_t *)drc_types->str =3D cpu_to_be32(drc_count); =20 - ret =3D fdt_setprop(fdt, fdt_offset, "ibm,drc-indexes", + ret =3D fdt_setprop(fdt, offset, "ibm,drc-indexes", drc_indexes->data, drc_indexes->len * sizeof(uint32_t)); if (ret) { @@ -881,7 +880,7 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, = Object *owner, goto out; } =20 - ret =3D fdt_setprop(fdt, fdt_offset, "ibm,drc-power-domains", + ret =3D fdt_setprop(fdt, offset, "ibm,drc-power-domains", drc_power_domains->data, drc_power_domains->len * sizeof(uint32_t)); if (ret) { @@ -889,14 +888,14 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset= , Object *owner, goto out; } =20 - ret =3D fdt_setprop(fdt, fdt_offset, "ibm,drc-names", + ret =3D fdt_setprop(fdt, offset, "ibm,drc-names", drc_names->str, drc_names->len); if (ret) { error_report("Couldn't finalize ibm,drc-names property"); goto out; } =20 - ret =3D fdt_setprop(fdt, fdt_offset, "ibm,drc-types", + ret =3D fdt_setprop(fdt, offset, "ibm,drc-types", drc_types->str, drc_types->len); if (ret) { error_report("Couldn't finalize ibm,drc-types property"); diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index c166df4145..04855d3125 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -2282,8 +2282,7 @@ int spapr_dt_phb(SpaprPhbState *phb, uint32_t intc_= phandle, void *fdt, return ret; } =20 - ret =3D spapr_drc_populate_dt(fdt, bus_off, OBJECT(phb), - SPAPR_DR_CONNECTOR_TYPE_PCI); + ret =3D spapr_dt_drc(fdt, bus_off, OBJECT(phb), SPAPR_DR_CONNECTOR_T= YPE_PCI); if (ret) { return ret; } diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index fad0a887f9..c2c543a591 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -266,8 +266,7 @@ SpaprDrc *spapr_dr_connector_new(Object *owner, const= char *type, uint32_t id); SpaprDrc *spapr_drc_by_index(uint32_t index); SpaprDrc *spapr_drc_by_id(const char *type, uint32_t id); -int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, - uint32_t drc_type_mask); +int spapr_dt_drc(void *fdt, int offset, Object *owner, uint32_t drc_type= _mask); =20 void spapr_drc_attach(SpaprDrc *drc, DeviceState *d, Error **errp); void spapr_drc_detach(SpaprDrc *drc); --=20 2.21.0