On Thu, Mar 19, 2020 at 06:05:30PM +0000, Lorenzo Pieralisi wrote:
> On Thu, Mar 19, 2020 at 02:12:30PM +0100, Thierry Reding wrote:
> > From: Thierry Reding <treding@xxxxxxxxxx>
> >
> > Probe deferral is an expected error condition that will usually be
> > recovered from. Print such error messages at debug level to make them
> > available for diagnostic purposes when building with debugging enabled
> > and hide them otherwise to not spam the kernel log with them.
> >
> > Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
> > ---
> > drivers/pci/controller/dwc/pcie-tegra194.c | 42 ++++++++++++++++++----
> > 1 file changed, 35 insertions(+), 7 deletions(-)
>
> Hi Thierry,
>
> what tree/branch is it based on ? I assume it may depend on some
> patches queued in one of my branches so please let me know and
> I will apply accordingly.
Hi Lorenzo,
This should apply on top of commit 5b645b7fade9 ("PCI: tegra: Add
support for PCIe endpoint mode in Tegra194") which is currently in
linux-next.
Looking at your "pci" tree, that commit seems to be in a branch
called pci/endpoint, though the equivalent commit there has a slightly
different SHA:
f4746b0ccef9 ("PCI: tegra: Add support for PCIe endpoint mode in Tegra194")
git range-diff shows that the only difference is that in the patch in
linux-next there are a couple of additional exported symbols that are
not in your pci/endpoint branch. That shouldn't be relevant, though,
since this patch touches another area of the code, so applying this to
your pci/endpoint branch should work.
Thierry
> > diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
> > index 97d3f3db1020..e4870fa6ce9c 100644
> > --- a/drivers/pci/controller/dwc/pcie-tegra194.c
> > +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
> > @@ -1159,17 +1159,31 @@ static int tegra_pcie_dw_parse_dt(struct tegra_pcie_dw *pcie)
> > /* Endpoint mode specific DT entries */
> > pcie->pex_rst_gpiod = devm_gpiod_get(pcie->dev, "reset", GPIOD_IN);
> > if (IS_ERR(pcie->pex_rst_gpiod)) {
> > - dev_err(pcie->dev, "Failed to get PERST GPIO: %ld\n",
> > - PTR_ERR(pcie->pex_rst_gpiod));
> > - return PTR_ERR(pcie->pex_rst_gpiod);
> > + int err = PTR_ERR(pcie->pex_rst_gpiod);
> > + const char *level = KERN_ERR;
> > +
> > + if (err == -EPROBE_DEFER)
> > + level = KERN_DEBUG;
> > +
> > + dev_printk(level, pcie->dev,
> > + dev_fmt("Failed to get PERST GPIO: %d\n"),
> > + err);
> > + return err;
> > }
> >
> > pcie->pex_refclk_sel_gpiod = devm_gpiod_get(pcie->dev,
> > "nvidia,refclk-select",
> > GPIOD_OUT_HIGH);
> > if (IS_ERR(pcie->pex_refclk_sel_gpiod)) {
> > - dev_info(pcie->dev, "Failed to get REFCLK select GPIOs: %ld\n",
> > - PTR_ERR(pcie->pex_refclk_sel_gpiod));
> > + int err = PTR_ERR(pcie->pex_refclk_sel_gpiod);
> > + const char *level = KERN_ERR;
> > +
> > + if (err == -EPROBE_DEFER)
> > + level = KERN_DEBUG;
> > +
> > + dev_printk(level, pcie->dev,
> > + dev_fmt("Failed to get REFCLK select GPIOs: %d\n"),
> > + err);
> > pcie->pex_refclk_sel_gpiod = NULL;
> > }
> >
> > @@ -2058,13 +2072,27 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev)
> >
> > ret = tegra_pcie_dw_parse_dt(pcie);
> > if (ret < 0) {
> > - dev_err(dev, "Failed to parse device tree: %d\n", ret);
> > + const char *level = KERN_ERR;
> > +
> > + if (ret == -EPROBE_DEFER)
> > + level = KERN_DEBUG;
> > +
> > + dev_printk(level, dev,
> > + dev_fmt("Failed to parse device tree: %d\n"),
> > + ret);
> > return ret;
> > }
> >
> > ret = tegra_pcie_get_slot_regulators(pcie);
> > if (ret < 0) {
> > - dev_err(dev, "Failed to get slot regulators: %d\n", ret);
> > + const char *level = KERN_ERR;
> > +
> > + if (ret == -EPROBE_DEFER)
> > + level = KERN_DEBUG;
> > +
> > + dev_printk(level, dev,
> > + dev_fmt("Failed to get slot regulators: %d\n"),
> > + ret);
> > return ret;
> > }
> >
> > --
> > 2.24.1
> >
Attachment:
signature.asc
Description: PGP signature
