On Wed, Jul 6, 2022 at 5:56 PM Bjorn Helgaas <helgaas@xxxxxxxxxx> wrote: > > On Fri, Jul 01, 2022 at 12:27:22PM -0400, Jim Quinlan wrote: > > We need to take some code in brcm_pcie_setup() and put it in a new function > > brcm_pcie_linkup(). In future commits the brcm_pcie_linkup() function will > > be called indirectly by pci_host_probe() as opposed to the host driver > > invoking it directly. > > > > Some code that was executed after the PCIe linkup is now placed so that it > > executes prior to linkup, since this code has to run prior to the > > invocation of pci_host_probe(). > > This says we need to move some code from brcm_pcie_setup() to > brcm_pcie_linkup(), but not *why* we need to do that. I will elaborate in the commit message. > > In brcm_pcie_resume(), they're called together: > > brcm_pcie_resume > brcm_pcie_setup > brcm_pcie_linkup > > In the probe path, they're not called together, but they're in the > same order: > > brcm_pcie_probe > brcm_pcie_setup > pci_host_probe > ... > brcm_pcie_add_bus # bus->ops->add_bus > brcm_pcie_linkup > > Is there something that must happen *between* them in the probe path? Yes. In the probe() case, we must do things in this order: 1. brcm_pcie_setup() 2. Turn on regulators 3. brcm_pcie_linkup() Since the voltage regulators are turned on during enumeration, pci_host_probe() must be invoked prior to 3. Before regulators, we did not care. In the resume case, there is no enumeration of course but our driver has a handle to the regulators and can turn them on/off w/o help. Regards, Jim Quinlan Broradcom STB > > > Link: https://lore.kernel.org/r/20220106160332.2143-5-jim2101024@xxxxxxxxx > > Signed-off-by: Jim Quinlan <jim2101024@xxxxxxxxx> > > --- > > drivers/pci/controller/pcie-brcmstb.c | 69 +++++++++++++++++---------- > > 1 file changed, 43 insertions(+), 26 deletions(-) > > > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > > index e61058e13818..2bf5cc399fd0 100644 > > --- a/drivers/pci/controller/pcie-brcmstb.c > > +++ b/drivers/pci/controller/pcie-brcmstb.c > > @@ -926,16 +926,9 @@ static inline int brcm_pcie_get_rc_bar2_size_and_offset(struct brcm_pcie *pcie, > > > > static int brcm_pcie_setup(struct brcm_pcie *pcie) > > { > > - struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie); > > u64 rc_bar2_offset, rc_bar2_size; > > void __iomem *base = pcie->base; > > - struct device *dev = pcie->dev; > > - struct resource_entry *entry; > > - bool ssc_good = false; > > - struct resource *res; > > - int num_out_wins = 0; > > - u16 nlw, cls, lnksta; > > - int i, ret, memc; > > + int ret, memc; > > u32 tmp, burst, aspm_support; > > > > /* Reset the bridge */ > > @@ -1025,6 +1018,40 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) > > if (pcie->gen) > > brcm_pcie_set_gen(pcie, pcie->gen); > > > > + /* Don't advertise L0s capability if 'aspm-no-l0s' */ > > + aspm_support = PCIE_LINK_STATE_L1; > > + if (!of_property_read_bool(pcie->np, "aspm-no-l0s")) > > + aspm_support |= PCIE_LINK_STATE_L0S; > > + tmp = readl(base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); > > + u32p_replace_bits(&tmp, aspm_support, > > + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK); > > + writel(tmp, base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); > > + > > + /* > > + * For config space accesses on the RC, show the right class for > > + * a PCIe-PCIe bridge (the default setting is to be EP mode). > > + */ > > + tmp = readl(base + PCIE_RC_CFG_PRIV1_ID_VAL3); > > + u32p_replace_bits(&tmp, 0x060400, > > + PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_MASK); > > + writel(tmp, base + PCIE_RC_CFG_PRIV1_ID_VAL3); > > + > > + return 0; > > +} > > + > > +static int brcm_pcie_linkup(struct brcm_pcie *pcie) > > +{ > > + struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie); > > + struct device *dev = pcie->dev; > > + void __iomem *base = pcie->base; > > + struct resource_entry *entry; > > + struct resource *res; > > + int num_out_wins = 0; > > + u16 nlw, cls, lnksta; > > + bool ssc_good = false; > > + u32 tmp; > > + int ret, i; > > + > > /* Unassert the fundamental reset */ > > pcie->perst_set(pcie, 0); > > > > @@ -1075,24 +1102,6 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) > > num_out_wins++; > > } > > > > - /* Don't advertise L0s capability if 'aspm-no-l0s' */ > > - aspm_support = PCIE_LINK_STATE_L1; > > - if (!of_property_read_bool(pcie->np, "aspm-no-l0s")) > > - aspm_support |= PCIE_LINK_STATE_L0S; > > - tmp = readl(base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); > > - u32p_replace_bits(&tmp, aspm_support, > > - PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK); > > - writel(tmp, base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); > > - > > - /* > > - * For config space accesses on the RC, show the right class for > > - * a PCIe-PCIe bridge (the default setting is to be EP mode). > > - */ > > - tmp = readl(base + PCIE_RC_CFG_PRIV1_ID_VAL3); > > - u32p_replace_bits(&tmp, 0x060400, > > - PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_MASK); > > - writel(tmp, base + PCIE_RC_CFG_PRIV1_ID_VAL3); > > - > > if (pcie->ssc) { > > ret = brcm_pcie_set_ssc(pcie); > > if (ret == 0) > > @@ -1281,6 +1290,10 @@ static int brcm_pcie_resume(struct device *dev) > > if (ret) > > goto err_reset; > > > > + ret = brcm_pcie_linkup(pcie); > > + if (ret) > > + goto err_reset; > > + > > if (pcie->msi) > > brcm_msi_set_regs(pcie->msi); > > > > @@ -1398,6 +1411,10 @@ static int brcm_pcie_probe(struct platform_device *pdev) > > if (ret) > > goto fail; > > > > + ret = brcm_pcie_linkup(pcie); > > + if (ret) > > + goto fail; > > + > > pcie->hw_rev = readl(pcie->base + PCIE_MISC_REVISION); > > if (pcie->type == BCM4908 && pcie->hw_rev >= BRCM_PCIE_HW_REV_3_20) { > > dev_err(pcie->dev, "hardware revision with unsupported PERST# setup\n"); > > -- > > 2.17.1 > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Attachment:
smime.p7s
Description: S/MIME Cryptographic Signature
