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.6 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 257F0C31E46 for ; Wed, 12 Jun 2019 05:52:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E4A2820866 for ; Wed, 12 Jun 2019 05:52:03 +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="YqhUbCMZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4A2820866 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 ([::1]:56810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hawB0-0006hz-Vy for qemu-devel@archiver.kernel.org; Wed, 12 Jun 2019 01:52:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58386) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haw8i-0004OP-TR for qemu-devel@nongnu.org; Wed, 12 Jun 2019 01:49:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1haw8h-00070d-HJ for qemu-devel@nongnu.org; Wed, 12 Jun 2019 01:49:40 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:36969 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1haw8g-0006zh-MQ; Wed, 12 Jun 2019 01:49:39 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 45NwtQ626Nz9sDB; Wed, 12 Jun 2019 15:49:34 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1560318574; bh=vsL1MTcIqQtzX5J9XA5ybbRM13gWkkMbqPYJHP8GFT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YqhUbCMZHahPs5YVI05TxaJhglxTkClsJ4hYf45s1tEYhMu87B0z2s57fxtww0vbX SfRqNwvfj+IrzY3b7rfzayjLQd94TMlFmrzxxmrnUOv2AzNVkVL+3vig0SYamQBqjx Y2Mf4VhVrApEZj+Au7gVWP+HL60DLypChYQ30iuY= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 12 Jun 2019 15:49:19 +1000 Message-Id: <20190612054929.21136-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190612054929.21136-1-david@gibson.dropbear.id.au> References: <20190612054929.21136-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] [PULL 03/13] spapr: Clean up device node name generation for PCI devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, "Michael S . Tsirkin" , aik@ozlabs.ru, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" spapr_populate_pci_child_dt() adds a 'name' property to the device tree node for PCI devices. This is never necessary for a flattened device tre= e, it is implicit in the name added when the node is constructed. In fact anything we do add to a 'name' property will be overwritten with somethin= g derived from the structural name in the guest firmware (but in fact it is exactly the same bytes). So, remove that. In addition, pci_get_node_name() is very simple, so fol= d it into its (also simple) sole caller spapr_create_pci_child_dt(). While we're there rename pci_find_device_name() to the shorter and more accurate dt_name_from_class(). Signed-off-by: David Gibson Reviewed-by: Greg Kurz Acked-by: Michael S. Tsirkin --- hw/ppc/spapr_pci.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 483639b107..e8173d3246 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1173,8 +1173,8 @@ static const PCIClass pci_classes[] =3D { { "data-processing-controller", spc_subclass }, }; =20 -static const char *pci_find_device_name(uint8_t class, uint8_t subclass, - uint8_t iface) +static const char *dt_name_from_class(uint8_t class, uint8_t subclass, + uint8_t iface) { const PCIClass *pclass; const PCISubClass *psubclass; @@ -1216,23 +1216,6 @@ static const char *pci_find_device_name(uint8_t cl= ass, uint8_t subclass, return name; } =20 -static gchar *pci_get_node_name(PCIDevice *dev) -{ - int slot =3D PCI_SLOT(dev->devfn); - int func =3D PCI_FUNC(dev->devfn); - uint32_t ccode =3D pci_default_read_config(dev, PCI_CLASS_PROG, 3); - const char *name; - - name =3D pci_find_device_name((ccode >> 16) & 0xff, (ccode >> 8) & 0= xff, - ccode & 0xff); - - if (func !=3D 0) { - return g_strdup_printf("%s@%x,%x", name, slot, func); - } else { - return g_strdup_printf("%s@%x", name, slot); - } -} - static uint32_t spapr_phb_get_pci_drc_index(SpaprPhbState *phb, PCIDevice *pdev); =20 @@ -1300,11 +1283,6 @@ static void spapr_populate_pci_child_dt(PCIDevice = *dev, void *fdt, int offset, _FDT(fdt_setprop(fdt, offset, "udf-supported", NULL, 0)); } =20 - _FDT(fdt_setprop_string(fdt, offset, "name", - pci_find_device_name((ccode >> 16) & 0xff, - (ccode >> 8) & 0xff, - ccode & 0xff))); - buf =3D spapr_phb_get_loc_code(sphb, dev); _FDT(fdt_setprop_string(fdt, offset, "ibm,loc-code", buf)); g_free(buf); @@ -1348,10 +1326,23 @@ static int spapr_create_pci_child_dt(SpaprPhbStat= e *phb, PCIDevice *dev, void *fdt, int node_offset) { int offset; + const gchar *basename; gchar *nodename; + int slot =3D PCI_SLOT(dev->devfn); + int func =3D PCI_FUNC(dev->devfn); + uint32_t ccode =3D pci_default_read_config(dev, PCI_CLASS_PROG, 3); + + basename =3D dt_name_from_class((ccode >> 16) & 0xff, (ccode >> 8) &= 0xff, + ccode & 0xff); + + if (func !=3D 0) { + nodename =3D g_strdup_printf("%s@%x,%x", basename, slot, func); + } else { + nodename =3D g_strdup_printf("%s@%x", basename, slot); + } =20 - nodename =3D pci_get_node_name(dev); _FDT(offset =3D fdt_add_subnode(fdt, node_offset, nodename)); + g_free(nodename); =20 spapr_populate_pci_child_dt(dev, fdt, offset, phb); --=20 2.21.0