From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> To: f.fainelli@gmail.com, gregkh@linuxfoundation.org, wahrenst@gmx.net, helgaas@kernel.org, linux-kernel@vger.kernel.org, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Rob Herring <robh@kernel.org>, bcm-kernel-feedback-list@broadcom.com Cc: linux-usb@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, tim.gover@raspberrypi.org, linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com> Subject: [PATCH v8 3/4] PCI: brcmstb: Wait for Raspberry Pi's firmware when present Date: Tue, 5 May 2020 18:13:16 +0200 [thread overview] Message-ID: <20200505161318.26200-4-nsaenzjulienne@suse.de> (raw) In-Reply-To: <20200505161318.26200-1-nsaenzjulienne@suse.de> xHCI's PCI fixup, run at the end of pcie-brcmstb's probe, depends on RPi4's VideoCore firmware interface to be up and running. It's possible for both initializations to race, so make sure it's available prior to starting. Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> --- Changes since v6: - Add more complete comment drivers/pci/controller/pcie-brcmstb.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 6d79d14527a6..0b97b94c4a9a 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -28,6 +28,8 @@ #include <linux/string.h> #include <linux/types.h> +#include <soc/bcm2835/raspberrypi-firmware.h> + #include "../pci.h" /* BRCM_PCIE_CAP_REGS - Offset for the mandatory capability config regs */ @@ -917,11 +919,26 @@ 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.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> To: f.fainelli@gmail.com, gregkh@linuxfoundation.org, wahrenst@gmx.net, helgaas@kernel.org, linux-kernel@vger.kernel.org, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Rob Herring <robh@kernel.org>, bcm-kernel-feedback-list@broadcom.com Cc: tim.gover@raspberrypi.org, linux-pci@vger.kernel.org, linux-usb@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, Bjorn Helgaas <bhelgaas@google.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 3/4] PCI: brcmstb: Wait for Raspberry Pi's firmware when present Date: Tue, 5 May 2020 18:13:16 +0200 [thread overview] Message-ID: <20200505161318.26200-4-nsaenzjulienne@suse.de> (raw) In-Reply-To: <20200505161318.26200-1-nsaenzjulienne@suse.de> xHCI's PCI fixup, run at the end of pcie-brcmstb's probe, depends on RPi4's VideoCore firmware interface to be up and running. It's possible for both initializations to race, so make sure it's available prior to starting. Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> --- Changes since v6: - Add more complete comment drivers/pci/controller/pcie-brcmstb.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 6d79d14527a6..0b97b94c4a9a 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -28,6 +28,8 @@ #include <linux/string.h> #include <linux/types.h> +#include <soc/bcm2835/raspberrypi-firmware.h> + #include "../pci.h" /* BRCM_PCIE_CAP_REGS - Offset for the mandatory capability config regs */ @@ -917,11 +919,26 @@ 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.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-05-05 16:13 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-05 16:13 [PATCH v8 0/4] USB: pci-quirks: Add Raspberry Pi 4 quirk Nicolas Saenz Julienne 2020-05-05 16:13 ` Nicolas Saenz Julienne 2020-05-05 16:13 ` [PATCH v8 1/4] soc: bcm2835: Add notify xHCI reset property Nicolas Saenz Julienne 2020-05-05 16:13 ` Nicolas Saenz Julienne 2020-05-07 21:48 ` Rob Herring 2020-05-07 21:48 ` Rob Herring 2020-05-05 16:13 ` [PATCH v8 2/4] firmware: raspberrypi: Introduce vl805 init routine Nicolas Saenz Julienne 2020-05-05 16:13 ` Nicolas Saenz Julienne 2020-05-07 21:48 ` Rob Herring 2020-05-07 21:48 ` Rob Herring 2020-05-09 10:02 ` Stefan Wahren 2020-05-09 10:02 ` Stefan Wahren 2020-05-09 10:09 ` Stefan Wahren 2020-05-09 10:09 ` Stefan Wahren 2020-05-09 19:20 ` Nicolas Saenz Julienne 2020-05-09 19:20 ` Nicolas Saenz Julienne 2020-05-05 16:13 ` Nicolas Saenz Julienne [this message] 2020-05-05 16:13 ` [PATCH v8 3/4] PCI: brcmstb: Wait for Raspberry Pi's firmware when present Nicolas Saenz Julienne 2020-05-07 21:49 ` Rob Herring 2020-05-07 21:49 ` Rob Herring 2020-05-05 16:13 ` [PATCH v8 4/4] USB: pci-quirks: Add Raspberry Pi 4 quirk Nicolas Saenz Julienne 2020-05-05 16:13 ` Nicolas Saenz Julienne 2020-05-07 21:52 ` Rob Herring 2020-05-07 21:52 ` Rob Herring 2020-05-11 14:25 ` Lorenzo Pieralisi 2020-05-11 14:25 ` Lorenzo Pieralisi 2020-05-13 7:05 ` Mathias Nyman 2020-05-13 7:05 ` Mathias Nyman 2020-06-02 10:05 ` Nicolas Saenz Julienne 2020-06-02 10:05 ` Nicolas Saenz Julienne 2020-06-02 21:57 ` Florian Fainelli 2020-06-02 21:57 ` Florian Fainelli 2020-05-13 11:17 ` [PATCH v8 0/4] " Lorenzo Pieralisi 2020-05-13 11:17 ` Lorenzo Pieralisi 2020-05-13 11:26 ` Nicolas Saenz Julienne 2020-05-13 11:26 ` Nicolas Saenz Julienne 2020-05-13 15:47 ` Lorenzo Pieralisi 2020-05-13 15:47 ` Lorenzo Pieralisi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200505161318.26200-4-nsaenzjulienne@suse.de \ --to=nsaenzjulienne@suse.de \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=bhelgaas@google.com \ --cc=f.fainelli@gmail.com \ --cc=gregkh@linuxfoundation.org \ --cc=helgaas@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux-rpi-kernel@lists.infradead.org \ --cc=linux-usb@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=robh@kernel.org \ --cc=tim.gover@raspberrypi.org \ --cc=wahrenst@gmx.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.