Skip to content

Commit 4b3f481

Browse files
committed
Merge branch 'pci/controller/brcmstb'
- Assert PERST# when probing BCM2711 because some bootloaders don't do it (Jim Quinlan) * pci/controller/brcmstb: PCI: brcmstb: Remove stale comment PCI: brcmstb: Assert PERST# on BCM2711
2 parents 98072e3 + 6dac150 commit 4b3f481

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

drivers/pci/controller/pcie-brcmstb.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@ static struct irq_chip brcm_msi_irq_chip = {
439439
};
440440

441441
static struct msi_domain_info brcm_msi_domain_info = {
442-
/* Multi MSI is supported by the controller, but not by this driver */
443442
.flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
444443
MSI_FLAG_MULTI_PCI_MSI),
445444
.chip = &brcm_msi_irq_chip,
@@ -874,6 +873,11 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
874873

875874
/* Reset the bridge */
876875
pcie->bridge_sw_init_set(pcie, 1);
876+
877+
/* Ensure that PERST# is asserted; some bootloaders may deassert it. */
878+
if (pcie->type == BCM2711)
879+
pcie->perst_set(pcie, 1);
880+
877881
usleep_range(100, 200);
878882

879883
/* Take the bridge out of reset */

0 commit comments

Comments
 (0)