From nobody Mon Feb 9 07:00:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496986917070504.7767755186626; Thu, 8 Jun 2017 22:41:57 -0700 (PDT) Received: from localhost ([::1]:52746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJCgF-0001Qb-6c for importer@patchew.org; Fri, 09 Jun 2017 01:41:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJCS0-0003zy-Dj for qemu-devel@nongnu.org; Fri, 09 Jun 2017 01:27:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJCRy-0006gW-Sx for qemu-devel@nongnu.org; Fri, 09 Jun 2017 01:27:12 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:35677) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dJCRy-0006eF-Cl; Fri, 09 Jun 2017 01:27:10 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3wkW4d4GPdz9sNb; Fri, 9 Jun 2017 15:26:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1496986017; bh=BMxyRMhJcY8i1PvxCx+wqv17vMjz3x0FVI3GNDgmqns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ms5DA/zK91wkNfn6Qd11CSw05nP4wbUvrO5AjfeANynCPqq8hyGBtn4k1DiE46PLx EMVrKIrHLht9BEvYlIXrV78qUx5z7imPI3N8JwgeQIcHPUQhcmXipxpEPABZBGhL/Y eTSZOscwpRmUSXsiLURYOsz6rFppfiMRyGSgBN/U= From: David Gibson To: peter.maydell@linaro.org Date: Fri, 9 Jun 2017 15:26:46 +1000 Message-Id: <20170609052652.23200-15-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170609052652.23200-1-david@gibson.dropbear.id.au> References: <20170609052652.23200-1-david@gibson.dropbear.id.au> 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 14/20] hw/ppc/spapr: Adjust firmware name for PCI bridges 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: Thomas Huth , qemu-devel@nongnu.org, sursingh@redhat.com, mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-ppc@nongnu.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) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth SLOF uses "pci" as name for PCI bridges nodes in the device tree instead of "pci-bridges", so booting via bootindex from a device behind a PCI bridge currently does not work since QEMU passes the wrong name in the "qemu,boot-list" property. Fix it by changing the name of the PCI bridge nodes to "pci" instead. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1459170 Signed-off-by: Thomas Huth Signed-off-by: David Gibson --- hw/ppc/spapr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e340ff3..01dda9e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2441,6 +2441,12 @@ static char *spapr_get_fw_dev_path(FWPathProvider *p= , BusState *bus, return g_strdup_printf("disk@%"PRIX64, (uint64_t)id << 32); } =20 + if (g_str_equal("pci-bridge", qdev_fw_name(dev))) { + /* SLOF uses "pci" instead of "pci-bridge" for PCI bridges */ + PCIDevice *pcidev =3D CAST(PCIDevice, dev, TYPE_PCI_DEVICE); + return g_strdup_printf("pci@%x", PCI_SLOT(pcidev->devfn)); + } + return NULL; } =20 --=20 2.9.4