From nobody Fri Apr 19 15:20:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1560318737; cv=none; d=zoho.com; s=zohoarc; b=P6UtMLFjPMXg/imdnMNItgpA1MvyYLmcMozI+111mUsr0EfJDre51nx6/nWMi4vbdtwFCe0tV+o25flV4cAKgpDZSgMLEvg1CfdmKuQNtheGbHImpCbLpEFZWJErH2XXAgBgr6NTJO4MUZSgP5WwitbB0M00DSfNw2Xh04JkCgQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560318737; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1Ieo2Zrx03vfMGJmJk9XUvcN0Xw/tCyIW7ourfw2kpk=; b=EkXzSYZ4L4aMDw0yb8tQcG0DtJcDQnftujEzQTrIMp+qonrHHwnEDZrqGG5mPEKPYKKNEi2ySMLfB/0WCGqL7h+RTw3U3b/euffsDrwKiBSxa15Oqwo/GkouvQXlVLgxqPFM6rY80vl/dP0upFwYNChIrb/GOZI6Ieyb9wRmu68= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560318735797563.249681878553; Tue, 11 Jun 2019 22:52:15 -0700 (PDT) Received: from localhost ([::1]:56810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hawB9-0006hz-7v for importer@patchew.org; Wed, 12 Jun 2019 01:52:11 -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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 tree, 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 something 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 fold 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 clas= s, 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) & 0xf= f, - 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 *d= ev, 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(SpaprPhbState = *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) & 0= xff, + 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