pci-dra7xx: Enable errata i870 workaround for RC mode
Subsystems (4)
Vignesh R
maintainerv3 cover pci-dra7xx: Enable errata i870 workaround for RC mode
Make workaround for errata i870 applicable in Host mode as well(previously it was enabled only for EP mode) as per errata
documentation: http://www.ti.com/lit/er/sprz450/sprz450.pdf
Tested on DRA72 EVM
Tony,
If you are okay with the series, could you pick this via omap tree? All ACKs are in place and Lorenzo is okay with PCIe bits to go along with rest of DTS changes.
Regards
Vignesh
Changes since v2:
Reorder patch 2 to appear at the last.
Collect all the ACKs
Changes since v1:
Drop IRQ handling rework (will be sent out separately)
v2: https://patchwork.ozlabs.org/cover/935454/
v1: https://lkml.org/lkml/2017/12/1/59
Vignesh R (4):
dt-bindings: PCI: dra7xx: Add bindings for unaligned access in host
mode
ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode
ARM: dts: dra7: Fix up unaligned access setting for PCIe EP
pci: dwc: pci-dra7xx: Enable errata i870 for both EP and RC mode
Documentation/devicetree/bindings/pci/ti-pci.txt | 5 +++++ arch/arm/boot/dts/dra7.dtsi | 4 +++- drivers/pci/controller/dwc/pci-dra7xx.c | 12 ++++++------ 3 files changed, 14 insertions(+), 7 deletions(-)
Signature · 1 line
2.18.0
Vignesh R
maintainerPATCH v3 1/4 dt-bindings: PCI: dra7xx: Add bindings for unaligned access in host mode
Update device tree binding documentation of TI's dra7xx PCI controller for enabling unaligned mem access as applicable not just in EP mode but in host mode as well.
--- Documentation/devicetree/bindings/pci/ti-pci.txt | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/pci/ti-pci.txt +5 -0
@@ -26,6 +26,11 @@ HOST MODE ranges, interrupt-map-mask, interrupt-map : as specified in ../designware-pcie.txt + - ti,syscon-unaligned-access: phandle to the syscon DT node. The 1st argument + should contain the register offset within syscon + and the 2nd argument should contain the bit field + for setting the bit to enable unaligned + access. DEVICE MODE ===========
Signature · 1 line
2.18.0
Vignesh R
maintainerPATCH v3 2/4 ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode
In reply to Vignesh RAdd ti,syscon-unaligned-access property to PCIe RC nodes to set appropriate bits in CTRL_CORE_SMA_SW_7 register to enable workaround for errata i870.
--- arch/arm/boot/dts/dra7.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/dra7.dtsi +2 -0
@@ -336,6 +336,7 @@ <0 0 0 2 &pcie1_intc 2>, <0 0 0 3 &pcie1_intc 3>, <0 0 0 4 &pcie1_intc 4>; + ti,syscon-unaligned-access = <&scm_conf1 0x14 1>; status = "disabled"; pcie1_intc: interrupt-controller { interrupt-controller;
@@ -387,6 +388,7 @@ <0 0 0 2 &pcie2_intc 2>, <0 0 0 3 &pcie2_intc 3>, <0 0 0 4 &pcie2_intc 4>; + ti,syscon-unaligned-access = <&scm_conf1 0x14 2>; pcie2_intc: interrupt-controller { interrupt-controller; #address-cells = <0>;
Signature · 1 line
2.18.0
Vignesh R
maintainerPATCH v3 3/4 ARM: dts: dra7: Fix up unaligned access setting for PCIe EP
In reply to Vignesh RBit positions of PCIE_SS1_AXI2OCP_LEGACY_MODE_ENABLE and PCIE_SS1_AXI2OCP_LEGACY_MODE_ENABLE in CTRL_CORE_SMA_SW_7 are incorrectly documented in the TRM. In fact, the bit positions are swapped. Update the DT bindings for PCIe EP to reflect the same.
---
v3;
Add Fixes tag
arch/arm/boot/dts/dra7.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/dra7.dtsi +1 -1
@@ -355,7 +355,7 @@ ti,hwmods = "pcie1"; phys = <&pcie1_phy>; phy-names = "pcie-phy0"; - ti,syscon-unaligned-access = <&scm_conf1 0x14 2>; + ti,syscon-unaligned-access = <&scm_conf1 0x14 1>; status = "disabled"; }; };
Signature · 1 line
2.18.0
Vignesh R
maintainerPATCH v3 4/4 pci: dwc: pci-dra7xx: Enable errata i870 for both EP and RC mode
In reply to Vignesh RErrata i870 is applicable in both EP and RC mode. Therefore rename function dra7xx_pcie_ep_unaligned_memaccess(), that implements errata workaround, to dra7xx_pcie_unaligned_memaccess() and call it from a common place. So, that errata workaround is applied for both modes of operation.
---
v3:
collect ACKs.
Fix s/appplied/applied.
drivers/pci/controller/dwc/pci-dra7xx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/pci/controller/dwc/pci-dra7xx.c +6 -6
@@ -542,7 +542,7 @@ static const struct of_device_id of_dra7xx_pcie_match[] = { };/* -* dra7xx_pcie_ep_unaligned_memaccess: workaround for AM572x/AM571x Errata i870 +* dra7xx_pcie_unaligned_memaccess: workaround for AM572x/AM571x Errata i870 * @dra7xx: the dra7xx device where the workaround should be applied * * Access to the PCIe slave port that are not 32-bit aligned will result
@@ -552,7 +552,7 @@ static const struct of_device_id of_dra7xx_pcie_match[] = {* * To avoid this issue set PCIE_SS1_AXI2OCP_LEGACY_MODE_ENABLE to 1. */ -static int dra7xx_pcie_ep_unaligned_memaccess (struct device *dev) +static int dra7xx_pcie_unaligned_memaccess (struct device *dev) {int ret;struct device_node *np = dev->of_node;
@@ -695,6 +695,10 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)if (dra7xx->link_gen <0 || dra7xx->link_gen >2 ) dra7xx->link_gen =2 ; + ret =dra7xx_pcie_unaligned_memaccess (dev); +if (ret) +dev_err (dev,"WA for Errata i870 not applied. Update DT\n" ); +switch (mode) {case DW_PCIE_RC_TYPE :if (!IS_ENABLED (CONFIG_PCI_DRA7XX_HOST )) {
@@ -717,10 +721,6 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)dra7xx_pcie_writel (dra7xx,PCIECTRL_TI_CONF_DEVICE_TYPE ,DEVICE_TYPE_EP ); - ret =dra7xx_pcie_ep_unaligned_memaccess (dev); -if (ret) - goto err_gpio; - ret =dra7xx_add_pcie_ep (dra7xx, pdev);if (ret <0 ) goto err_gpio;
Signature · 1 line
2.18.0
Quoted 11 lines · Vignesh R
Make workaround for errata i870 applicable in Host mode as well(previously it was enabled only for EP mode) as per errata
documentation: http://www.ti.com/lit/er/sprz450/sprz450.pdfTested on DRA72 EVM
Tony,
If you are okay with the series, could you pick this via omap tree? All ACKs are in place and Lorenzo is okay with PCIe bits to go along with rest of DTS changes.
I think we have missed the v4.19 merge window by now - please let me know if I can drop this series from the PCI patch queue.
Thanks,
Lorenzo
Quoted 30 lines
Regards
VigneshChanges since v2:
Reorder patch 2 to appear at the last.
Collect all the ACKsChanges since v1:
Drop IRQ handling rework (will be sent out separately)v2: https://patchwork.ozlabs.org/cover/935454/
v1: https://lkml.org/lkml/2017/12/1/59Vignesh R (4):
dt-bindings: PCI: dra7xx: Add bindings for unaligned access in host
mode
ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode
ARM: dts: dra7: Fix up unaligned access setting for PCIe EP
pci: dwc: pci-dra7xx: Enable errata i870 for both EP and RC modeDocumentation/devicetree/bindings/pci/ti-pci.txt | 5 +++++ arch/arm/boot/dts/dra7.dtsi | 4 +++- drivers/pci/controller/dwc/pci-dra7xx.c | 12 ++++++------ 3 files changed, 14 insertions(+), 7 deletions(-)Signature · 1 line
2.18.0
Vignesh R
maintainerQuoted 7 lines · Lorenzo Pieralisi
Quoted 6 lines · Vignesh R
Make workaround for errata i870 applicable in Host mode as well(previously it was enabled only for EP mode) as per errata
documentation: http://www.ti.com/lit/er/sprz450/sprz450.pdfTested on DRA72 EVM
Quoted 7 lines
Quoted 5 lines
Tony,
If you are okay with the series, could you pick this via omap tree? All ACKs are in place and Lorenzo is okay with PCIe bits to go along with rest of DTS changes.
I think we have missed the v4.19 merge window by now -
Right. I didn't get any response from Tony.
Quoted 2 lines
please let me know if I can drop this series from the PCI patch queue.
Ok, I will resend the patch after 4.19-rc. Thanks!
Regards
Vignesh
Quoted 33 lines
Thanks,
LorenzoQuoted 30 lines
Regards
VigneshChanges since v2:
Reorder patch 2 to appear at the last.
Collect all the ACKsChanges since v1:
Drop IRQ handling rework (will be sent out separately)v2: https://patchwork.ozlabs.org/cover/935454/
v1: https://lkml.org/lkml/2017/12/1/59Vignesh R (4):
dt-bindings: PCI: dra7xx: Add bindings for unaligned access in host
mode
ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode
ARM: dts: dra7: Fix up unaligned access setting for PCIe EP
pci: dwc: pci-dra7xx: Enable errata i870 for both EP and RC modeDocumentation/devicetree/bindings/pci/ti-pci.txt | 5 +++++ arch/arm/boot/dts/dra7.dtsi | 4 +++- drivers/pci/controller/dwc/pci-dra7xx.c | 12 ++++++------ 3 files changed, 14 insertions(+), 7 deletions(-)Signature · 1 line
2.18.0
Quoted 12 lines · Vignesh R
Quoted 9 lines · Lorenzo Pieralisi
Quoted 8 lines · Vignesh R
Make workaround for errata i870 applicable in Host mode as well(previously it was enabled only for EP mode) as per errata
documentation: http://www.ti.com/lit/er/sprz450/sprz450.pdfTested on DRA72 EVM
Tony,
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
If you are okay with the series, could you pick this via omap tree? All ACKs are in place and Lorenzo is okay with PCIe bits to go along with rest of DTS changes.
I think we have missed the v4.19 merge window by now -
Right. I didn't get any response from Tony.
Sorry catching up with pending mails.. I try hard to not touch anything except fixes around -rc6 time.
Quoted 4 lines
Quoted 2 lines
please let me know if I can drop this series from the PCI patch queue.
Ok, I will resend the patch after 4.19-rc. Thanks!
FYI, I'm untagging this thread too. Please post the dts changes separately once the dependencies (if any) have cleared.
Regards,
Tony
Quoted 24 lines · Tony Lindgren
Quoted 12 lines · Vignesh R
Quoted 9 lines · Lorenzo Pieralisi
Quoted 8 lines · Vignesh R
Make workaround for errata i870 applicable in Host mode as well(previously it was enabled only for EP mode) as per errata
documentation: http://www.ti.com/lit/er/sprz450/sprz450.pdfTested on DRA72 EVM
Tony,
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
If you are okay with the series, could you pick this via omap tree? All ACKs are in place and Lorenzo is okay with PCIe bits to go along with rest of DTS changes.
I think we have missed the v4.19 merge window by now -
Right. I didn't get any response from Tony.
Sorry catching up with pending mails.. I try hard to not touch anything except fixes around -rc6 time.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
please let me know if I can drop this series from the PCI patch queue.
Ok, I will resend the patch after 4.19-rc. Thanks!
FYI, I'm untagging this thread too. Please post the dts changes separately once the dependencies (if any) have cleared.
Ok, Vignesh: I shall drop this series from the PCI patches queue, waiting for your new version, let me know how you want to handle this then please.
Thanks,
Lorenzo
Vignesh R
maintainerHi Lorenzo,
Quoted 3 lines · Lorenzo Pieralisi
Quoted 2 lines · Tony Lindgren
Quoted 1 line · Vignesh R
[...]
Quoted 18 lines
Quoted 18 lines
Quoted 9 lines
Quoted 7 lines
Quoted 5 lines
Tony,
If you are okay with the series, could you pick this via omap tree? All ACKs are in place and Lorenzo is okay with PCIe bits to go along with rest of DTS changes.
I think we have missed the v4.19 merge window by now -
Right. I didn't get any response from Tony.
Sorry catching up with pending mails.. I try hard to not touch anything except fixes around -rc6 time.
Quoted 4 lines
Quoted 2 lines
please let me know if I can drop this series from the PCI patch queue.
Ok, I will resend the patch after 4.19-rc. Thanks!
Quoted 8 lines
Quoted 3 lines
FYI, I'm untagging this thread too. Please post the dts changes separately once the dependencies (if any) have cleared.
Ok, Vignesh: I shall drop this series from the PCI patches queue, waiting for your new version, let me know how you want to handle this then please.
Thanks for the response!
I have sent v4 dropping DT changes (will send after driver patches have made it upstream). If possible, consider the patches for next rc as they are fixes.
Regards
Vignesh