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=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 CBF68C433DF for ; Fri, 14 Aug 2020 10:16:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB709206DA for ; Fri, 14 Aug 2020 10:16:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726811AbgHNKQC (ORCPT ); Fri, 14 Aug 2020 06:16:02 -0400 Received: from foss.arm.com ([217.140.110.172]:32858 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726012AbgHNKQB (ORCPT ); Fri, 14 Aug 2020 06:16:01 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EAF991063; Fri, 14 Aug 2020 03:16:00 -0700 (PDT) Received: from e121166-lin.cambridge.arm.com (e121166-lin.cambridge.arm.com [10.1.196.255]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EF8E53F6CF; Fri, 14 Aug 2020 03:15:58 -0700 (PDT) Date: Fri, 14 Aug 2020 11:15:56 +0100 From: Lorenzo Pieralisi To: Nicolas Saenz Julienne Cc: f.fainelli@gmail.com, gregkh@linuxfoundation.org, robh@kernel.org, wahrenst@gmx.net, p.zabel@pengutronix.de, andy.shevchenko@gmail.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, tim.gover@raspberrypi.org, linux-pci@vger.kernel.org, helgaas@kernel.org, mathias.nyman@linux.intel.com Subject: Re: [PATCH v5 9/9] Revert "PCI: brcmstb: Wait for Raspberry Pi's firmware when present" Message-ID: <20200814101556.GB19387@e121166-lin.cambridge.arm.com> References: <20200629161845.6021-1-nsaenzjulienne@suse.de> <20200629161845.6021-10-nsaenzjulienne@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200629161845.6021-10-nsaenzjulienne@suse.de> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 29, 2020 at 06:18:45PM +0200, Nicolas Saenz Julienne wrote: > This reverts commit 44331189f9082c7e659697bbac1747db3def73e7. > > Now that the VL805 init routine is run through a reset controller driver > the device dependencies are being taken care of by the device core. No > need to do it manually here. > > Signed-off-by: Nicolas Saenz Julienne > Reviewed-by: Florian Fainelli > --- > drivers/pci/controller/pcie-brcmstb.c | 17 ----------------- > 1 file changed, 17 deletions(-) Acked-by: Lorenzo Pieralisi > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 7730ea845ff2..752f5b331579 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -28,8 +28,6 @@ > #include > #include > > -#include > - > #include "../pci.h" > > /* BRCM_PCIE_CAP_REGS - Offset for the mandatory capability config regs */ > @@ -931,26 +929,11 @@ static int brcm_pcie_probe(struct platform_device *pdev) > { > struct device_node *np = pdev->dev.of_node, *msi_np; > struct pci_host_bridge *bridge; > - struct device_node *fw_np; > struct brcm_pcie *pcie; > struct pci_bus *child; > struct resource *res; > int ret; > > - /* > - * We have to wait for Raspberry Pi's firmware interface to be up as a > - * PCI fixup, rpi_firmware_init_vl805(), depends on it. This driver's > - * probe can race with the firmware interface's (see > - * drivers/firmware/raspberrypi.c) and potentially break the PCI fixup. > - */ > - fw_np = of_find_compatible_node(NULL, NULL, > - "raspberrypi,bcm2835-firmware"); > - if (fw_np && !rpi_firmware_get(fw_np)) { > - of_node_put(fw_np); > - return -EPROBE_DEFER; > - } > - of_node_put(fw_np); > - > bridge = devm_pci_alloc_host_bridge(&pdev->dev, sizeof(*pcie)); > if (!bridge) > return -ENOMEM; > -- > 2.27.0 >