PCI: tegra: Read "dbi" base address to program in application logic
diff mbox series

Message ID 20201125192554.5401-1-vidyas@nvidia.com
State Accepted
Commit d5353c00cfd93b1c03fb16a5e6b5b49026534755
Headers show
Series
  • PCI: tegra: Read "dbi" base address to program in application logic
Related show

Commit Message

Vidya Sagar Nov. 25, 2020, 7:25 p.m. UTC
PCIe controller in Tegra194 requires the "dbi" region base address to be
programmed in one of the application logic registers to enable CPU access
to the "dbi" region. But, commit a0fd361db8e5 ("PCI: dwc: Move "dbi",
"dbi2", and "addr_space" resource setup into common code") moved the code
that reads the whereabouts of "dbi" region to the common code causing the
existing code in pcie-tegra194.c file to program NULL in the application
logic registers. This is causing null pointer dereference when the "dbi"
registers are accessed. This issue is fixed by explicitly reading the
"dbi" base address from DT node.

Fixes: a0fd361db8e5 ("PCI: dwc: Move "dbi", "dbi2", and "addr_space" resource setup into common code")
Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
---
 drivers/pci/controller/dwc/pcie-tegra194.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Thierry Reding Nov. 26, 2020, 11:30 a.m. UTC | #1
On Thu, Nov 26, 2020 at 12:55:54AM +0530, Vidya Sagar wrote:
> PCIe controller in Tegra194 requires the "dbi" region base address to be
> programmed in one of the application logic registers to enable CPU access
> to the "dbi" region. But, commit a0fd361db8e5 ("PCI: dwc: Move "dbi",
> "dbi2", and "addr_space" resource setup into common code") moved the code
> that reads the whereabouts of "dbi" region to the common code causing the
> existing code in pcie-tegra194.c file to program NULL in the application
> logic registers. This is causing null pointer dereference when the "dbi"
> registers are accessed. This issue is fixed by explicitly reading the
> "dbi" base address from DT node.
> 
> Fixes: a0fd361db8e5 ("PCI: dwc: Move "dbi", "dbi2", and "addr_space" resource setup into common code")
> Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
> ---
>  drivers/pci/controller/dwc/pcie-tegra194.c | 7 +++++++
>  1 file changed, 7 insertions(+)

Tested-by: Thierry Reding <treding@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Lorenzo Pieralisi Dec. 1, 2020, 10:39 a.m. UTC | #2
On Thu, 26 Nov 2020 00:55:54 +0530, Vidya Sagar wrote:
> PCIe controller in Tegra194 requires the "dbi" region base address to be
> programmed in one of the application logic registers to enable CPU access
> to the "dbi" region. But, commit a0fd361db8e5 ("PCI: dwc: Move "dbi",
> "dbi2", and "addr_space" resource setup into common code") moved the code
> that reads the whereabouts of "dbi" region to the common code causing the
> existing code in pcie-tegra194.c file to program NULL in the application
> logic registers. This is causing null pointer dereference when the "dbi"
> registers are accessed. This issue is fixed by explicitly reading the
> "dbi" base address from DT node.

Applied to pci/dwc, thanks!

[1/1] PCI: tegra: Read "dbi" base address to program in application logic
      https://git.kernel.org/lpieralisi/pci/c/d5353c00cf

Thanks,
Lorenzo

Patch
diff mbox series

diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
index fa54d9aaa430..ac2225175087 100644
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -1053,9 +1053,16 @@  static int tegra_pcie_enable_phy(struct tegra_pcie_dw *pcie)
 
 static int tegra_pcie_dw_parse_dt(struct tegra_pcie_dw *pcie)
 {
+	struct platform_device *pdev = to_platform_device(pcie->dev);
 	struct device_node *np = pcie->dev->of_node;
 	int ret;
 
+	pcie->dbi_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
+	if (!pcie->dbi_res) {
+		dev_err(pcie->dev, "Failed to find \"dbi\" region\n");
+		return -ENODEV;
+	}
+
 	ret = of_property_read_u32(np, "nvidia,aspm-cmrt-us", &pcie->aspm_cmrt);
 	if (ret < 0) {
 		dev_info(pcie->dev, "Failed to read ASPM T_cmrt: %d\n", ret);