stable request: PCI: tegra: Enable Relaxed Ordering only for Tegra20 & Tegra30 - Linux-stable-mirror

11 Nov 2019

Hi Greg,
We noticed that the Tegra PCIe host controller driver enabled
"Relaxed Ordering" bit in the PCIe configuration space for "all"
devices erroneously. We pushed a fix for this through the
commit: 7be142caabc4780b13a522c485abc806de5c4114 and it has been
soaking in main line for the last four months.
Based on the discussion we had @ http://patchwork.ozlabs.org/patch/1127604/
we would now like to push it to the following stable kernels
4.19                  : Applies cleanly
3.16, 4.4, 4.9 & 4.14 : Following equivalent patch needs to be used as the
                         file was at drivers/pci/host/pci-tegra.c earlier
                         (and moved to drivers/pci/controller/pci-tegra.c starting 4.19)
---
  drivers/pci/host/pci-tegra.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
index 083cf37ca047..56daa83b041c 100644
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -615,12 +615,15 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 0x0bf1, tegra_pcie_fixup_class);
  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 0x0e1c, tegra_pcie_fixup_class);
  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 0x0e1d, tegra_pcie_fixup_class);
-/* Tegra PCIE requires relaxed ordering */
+/* Tegra20 and Tegra30 PCIE requires relaxed ordering */
  static void tegra_pcie_relax_enable(struct pci_dev *dev)
  {
         pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_RELAX_EN);
  }
-DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, tegra_pcie_relax_enable);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0bf0, tegra_pcie_relax_enable);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0bf1, tegra_pcie_relax_enable);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0e1c, tegra_pcie_relax_enable);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0e1d, tegra_pcie_relax_enable);
static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
  {
--
2.17.1

    