| Message ID | 20200306114348.5172-4-nsaenzjulienne@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | USB: pci-quirks: Add Raspberry Pi 4 quirk | expand |
On 06.03.2020 14:43, Nicolas Saenz Julienne wrote: > 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 > starting. Prior to starting? > Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> > Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> [...] MBR, Sergei
On Sat, 2020-03-07 at 12:55 +0300, Sergei Shtylyov wrote: > On 06.03.2020 14:43, Nicolas Saenz Julienne wrote: > > > 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 > > starting. > > Prior to starting? Of course, thanks! Nicolas
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 3a10e678c7f4..a3d3070a5832 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,24 @@ 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 the Raspberry Pi's firmware interface to be up + * as some PCI fixups depend on it. + */ + 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;