Skip to contentSkip to conversation

PCI: tegra: Enable Relaxed Ordering only for Tegra20 & Tegra30

PATCH Superseded Vidya Sagar 3 participants 7 messages Jun 18, 2019 – Jul 1, 2019

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: tegra: Enable Relaxed Ordering only for Tegra20 & Tegra30

Currently Relaxed Ordering bit in the configuration space is enabled for all devices whereas it should be enabled only for root ports for Tegra20 and Tegra30 chips to avoid deadlock in hardware.

---
 drivers/pci/controller/pci-tegra.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-tegra.c +5 -2
index 464ba2538d52..bc7be369c1b3 100644
@@ -545,12 +545,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_request_resources(struct tegra_pcie *pcie)
 {
Signature · 1 line
2.17.1
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Vidya Sagar

Currently Relaxed Ordering bit in the configuration space is enabled for all devices whereas it should be enabled only for root ports for Tegra20 and Tegra30 chips to avoid deadlock in hardware.

---
 drivers/pci/controller/pci-tegra.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
#2 lore raw
Quoted 5 lines · Thierry Reding
Quoted 4 lines · Vidya Sagar

Currently Relaxed Ordering bit in the configuration space is enabled for all devices whereas it should be enabled only for root ports for Tegra20 and Tegra30 chips to avoid deadlock in hardware.

Quoted 7 lines
Quoted 4 lines
---
  drivers/pci/controller/pci-tegra.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)

Bjorn / Lorenzo,
Can you please consider this patch?

Thanks,
Vidya Sagar

#3 lore raw
In reply to Vidya Sagar
Quoted 3 lines · Vidya Sagar

Currently Relaxed Ordering bit in the configuration space is enabled for all devices whereas it should be enabled only for root ports for Tegra20 and Tegra30 chips to avoid deadlock in hardware.

This is a fix so I think you had better add a Fixes: tag and if the erratum is a public document it would be good to add it to the log to explain what the problem is.

Thanks,
Lorenzo

Quoted 30 lines
---
 drivers/pci/controller/pci-tegra.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-tegra.c +5 -2
index 464ba2538d52..bc7be369c1b3 100644
@@ -545,12 +545,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_request_resources(struct tegra_pcie *pcie)
 {
Signature · 1 line
2.17.1
#4 lore raw
Quoted 11 lines · Lorenzo Pieralisi
Quoted 3 lines · Vidya Sagar

Currently Relaxed Ordering bit in the configuration space is enabled for all devices whereas it should be enabled only for root ports for Tegra20 and Tegra30 chips to avoid deadlock in hardware.

This is a fix so I think you had better add a Fixes: tag and if the erratum is a public document it would be good to add it to the log to explain what the problem is.

Thanks,
Lorenzo

This has been there from the beginning. I mean, if I have to give a tag as part of Fixes: , then I should give the tag that adds this driver itself. Is that fine? I can quote the following document section 31.1 for Tegra20, but the same information is not mentioned in Tegra30 specific public document.
https://www.chiark.greenend.org.uk/~theom/riscos/docs/Tegra2_TRM_DP04508001v01p.pdf
Is it fine to just quote only this document?

Thanks,
Vidya Sagar

Quoted 31 lines
Quoted 31 lines
---
  drivers/pci/controller/pci-tegra.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-tegra.c +5 -2
index 464ba2538d52..bc7be369c1b3 100644
@@ -545,12 +545,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_request_resources(struct tegra_pcie *pcie)
  {
Signature · 1 line
2.17.1
#5 lore raw
Quoted 10 lines · Vidya Sagar
Quoted 9 lines · Lorenzo Pieralisi
Quoted 3 lines · Vidya Sagar

Currently Relaxed Ordering bit in the configuration space is enabled for all devices whereas it should be enabled only for root ports for Tegra20 and Tegra30 chips to avoid deadlock in hardware.

This is a fix so I think you had better add a Fixes: tag and if the erratum is a public document it would be good to add it to the log to explain what the problem is.

Quoted 8 lines
Quoted 2 lines

Thanks,
Lorenzo

This has been there from the beginning. I mean, if I have to give a tag as part of Fixes: , then I should give the tag that adds this driver itself. Is that fine? I can quote the following document section 31.1 for Tegra20, but the same information is not mentioned in Tegra30 specific public document.
https://www.chiark.greenend.org.uk/~theom/riscos/docs/Tegra2_TRM_DP04508001v01p.pdf
Is it fine to just quote only this document?

I am pretty sure an errata document should exist about this and Nvidia owns it (if it is not public, well, there is nothing to quote then); I would not quote this website, it does not look like Nvidia official documentation.

For the Fixes: tag, it is up to you, to me this seems like a critical bug (deadlock in hardware) and I do not think you want to ship stable kernels with it. It depends on the entity of the bug we are fixing, I leave it to you to decide the best course of action, I am just trying to help.

Lorenzo

Quoted 32 lines

Thanks,
Vidya Sagar

Quoted 29 lines
Quoted 29 lines
---
  drivers/pci/controller/pci-tegra.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-tegra.c +5 -2
index 464ba2538d52..bc7be369c1b3 100644
@@ -545,12 +545,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_request_resources(struct tegra_pcie *pcie)
  {
Signature · 1 line
2.17.1
#6 lore raw
Quoted 20 lines · Lorenzo Pieralisi
Quoted 10 lines · Vidya Sagar
Quoted 9 lines · Lorenzo Pieralisi
Quoted 3 lines · Vidya Sagar

Currently Relaxed Ordering bit in the configuration space is enabled for all devices whereas it should be enabled only for root ports for Tegra20 and Tegra30 chips to avoid deadlock in hardware.

This is a fix so I think you had better add a Fixes: tag and if the erratum is a public document it would be good to add it to the log to explain what the problem is.

Quoted 8 lines
Quoted 2 lines

Thanks,
Lorenzo

This has been there from the beginning. I mean, if I have to give a tag as part of Fixes: , then I should give the tag that adds this driver itself. Is that fine? I can quote the following document section 31.1 for Tegra20, but the same information is not mentioned in Tegra30 specific public document.
https://www.chiark.greenend.org.uk/~theom/riscos/docs/Tegra2_TRM_DP04508001v01p.pdf
Is it fine to just quote only this document?

Quoted 4 lines

I am pretty sure an errata document should exist about this and Nvidia owns it (if it is not public, well, there is nothing to quote then); I would not quote this website, it does not look like Nvidia official documentation.

We have the TRM (Technical Reference Manual) document available for Tegra20 at
https://developer.nvidia.com/embedded/downloads#?search=tegra%202 but basic registration is required to download the document. I'll mention this link in the commit message.

Quoted 6 lines

For the Fixes: tag, it is up to you, to me this seems like a critical bug (deadlock in hardware) and I do not think you want to ship stable kernels with it. It depends on the entity of the bug we are fixing, I leave it to you to decide the best course of action, I am just trying to help.

Since there is no specific commit that introduced this issue and the issue has been there from the beginning, I'm of the opinion that giving initial commit tag (the one that added the driver itself) for 'Fixes: tag doesn't really help here.

Quoted 35 lines

Lorenzo

Quoted 32 lines

Thanks,
Vidya Sagar

Quoted 29 lines
Quoted 29 lines
---
   drivers/pci/controller/pci-tegra.c | 7 +++++--
   1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-tegra.c +5 -2
index 464ba2538d52..bc7be369c1b3 100644
@@ -545,12 +545,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_request_resources(struct tegra_pcie *pcie)
   {
Signature · 1 line
2.17.1