48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
|
From patchwork Sat Sep 23 06:17:40 2017
|
||
|
|
Content-Type: text/plain; charset="utf-8"
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Transfer-Encoding: 7bit
|
||
|
|
Subject: PCI: tegra: Use different MSI target address for Tegra20
|
||
|
|
From: Thierry Reding <thierry.reding@gmail.com>
|
||
|
|
X-Patchwork-Id: 9967397
|
||
|
|
Message-Id: <20170923061740.6012-1-treding@nvidia.com>
|
||
|
|
To: Bjorn Helgaas <bhelgaas@google.com>
|
||
|
|
Cc: Thierry Reding <thierry.reding@gmail.com>,
|
||
|
|
Jonathan Hunter <jonathanh@nvidia.com>,
|
||
|
|
linux-pci@vger.kernel.org, linux-tegra@vger.kernel.org
|
||
|
|
Date: Fri, 22 Sep 2017 23:17:40 -0700
|
||
|
|
|
||
|
|
The Tegra20 PCIe controller has a different address range for MSI, so
|
||
|
|
select a different target address.
|
||
|
|
|
||
|
|
Fixes: d7bd554f27c9 ("PCI: tegra: Do not allocate MSI target memory")
|
||
|
|
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||
|
|
---
|
||
|
|
drivers/pci/host/pci-tegra.c | 12 +++++++++++-
|
||
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
|
||
|
|
index e8e1ddbaabc9..5b02ea59524b 100644
|
||
|
|
--- a/drivers/pci/host/pci-tegra.c
|
||
|
|
+++ b/drivers/pci/host/pci-tegra.c
|
||
|
|
@@ -1563,8 +1563,18 @@ static int tegra_pcie_enable_msi(struct tegra_pcie *pcie)
|
||
|
|
* none of the Tegra SoCs that contain this PCI host bridge can
|
||
|
|
* address more than 16 GiB of system memory, the last 4 KiB of
|
||
|
|
* these 1012 GiB is a good candidate.
|
||
|
|
+ *
|
||
|
|
+ * Unfortunately, Tegra20 is slightly different in that the physical
|
||
|
|
+ * address for this MSI region is limited to the lower 32 bits of the
|
||
|
|
+ * address map, so the address that we pick is going to have to be
|
||
|
|
+ * located somewhere within the region addressable by the CPU and
|
||
|
|
+ * on-SoC controllers. To be on the safe side, we select an address
|
||
|
|
+ * from a region that is marked unused (0xf0010000 - 0xfffeffff).
|
||
|
|
*/
|
||
|
|
- msi->phys = 0xfcfffff000;
|
||
|
|
+ if (soc->msi_base_shift > 0)
|
||
|
|
+ msi->phys = 0xfcfffff000;
|
||
|
|
+ else
|
||
|
|
+ msi->phys = 0x00f0010000;
|
||
|
|
|
||
|
|
afi_writel(pcie, msi->phys >> soc->msi_base_shift, AFI_MSI_FPCI_BAR_ST);
|
||
|
|
afi_writel(pcie, msi->phys, AFI_MSI_AXI_BAR_ST);
|