* [PATCH v3 1/4] dt-bindings: PCI: dra7xx: Add bindings for unaligned access in host mode
2018-07-24 17:31 [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for RC mode Vignesh R
@ 2018-07-24 17:31 ` Vignesh R
2018-07-24 17:31 ` [PATCH v3 2/4] ARM: dts: dra7: Enable workaround for errata i870 in PCIe " Vignesh R
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Vignesh R @ 2018-07-24 17:31 UTC (permalink / raw)
To: Tony Lindgren
Cc: Kishon Vijay Abraham I, Bjorn Helgaas, Rob Herring,
Lorenzo Pieralisi, linux-omap, linux-pci, devicetree,
linux-kernel, Vignesh R
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.
Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Rob Herring <robh@kernel.org>
---
Documentation/devicetree/bindings/pci/ti-pci.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/pci/ti-pci.txt b/Documentation/devicetree/bindings/pci/ti-pci.txt
index 7f7af3044016..452fe48c4fdd 100644
--- a/Documentation/devicetree/bindings/pci/ti-pci.txt
+++ b/Documentation/devicetree/bindings/pci/ti-pci.txt
@@ -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
===========
--
2.18.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 2/4] ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode
2018-07-24 17:31 [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for RC mode Vignesh R
2018-07-24 17:31 ` [PATCH v3 1/4] dt-bindings: PCI: dra7xx: Add bindings for unaligned access in host mode Vignesh R
@ 2018-07-24 17:31 ` Vignesh R
2018-07-24 17:31 ` [PATCH v3 3/4] ARM: dts: dra7: Fix up unaligned access setting for PCIe EP Vignesh R
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Vignesh R @ 2018-07-24 17:31 UTC (permalink / raw)
To: Tony Lindgren
Cc: Kishon Vijay Abraham I, Bjorn Helgaas, Rob Herring,
Lorenzo Pieralisi, linux-omap, linux-pci, devicetree,
linux-kernel, Vignesh R
Add 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.
Signed-off-by: Vignesh R <vigneshr@ti.com>
---
arch/arm/boot/dts/dra7.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index a0ddf497e8cd..1050da6c6d35 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -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>;
--
2.18.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 3/4] ARM: dts: dra7: Fix up unaligned access setting for PCIe EP
2018-07-24 17:31 [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for RC mode Vignesh R
2018-07-24 17:31 ` [PATCH v3 1/4] dt-bindings: PCI: dra7xx: Add bindings for unaligned access in host mode Vignesh R
2018-07-24 17:31 ` [PATCH v3 2/4] ARM: dts: dra7: Enable workaround for errata i870 in PCIe " Vignesh R
@ 2018-07-24 17:31 ` Vignesh R
2018-07-24 17:31 ` [PATCH v3 4/4] pci: dwc: pci-dra7xx: Enable errata i870 for both EP and RC mode Vignesh R
2018-08-08 16:57 ` [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for " Lorenzo Pieralisi
4 siblings, 0 replies; 10+ messages in thread
From: Vignesh R @ 2018-07-24 17:31 UTC (permalink / raw)
To: Tony Lindgren
Cc: Kishon Vijay Abraham I, Bjorn Helgaas, Rob Herring,
Lorenzo Pieralisi, linux-omap, linux-pci, devicetree,
linux-kernel, Vignesh R
Bit 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.
Fixes: d23f3839fe97 ("ARM: dts: DRA7: Add pcie1 dt node for EP mode")
Cc: stable@vger.kernel.org
Signed-off-by: Vignesh R <vigneshr@ti.com>
---
v3;
Add Fixes tag
arch/arm/boot/dts/dra7.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 1050da6c6d35..fc50d6a8e51a 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -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";
};
};
--
2.18.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 4/4] pci: dwc: pci-dra7xx: Enable errata i870 for both EP and RC mode
2018-07-24 17:31 [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for RC mode Vignesh R
` (2 preceding siblings ...)
2018-07-24 17:31 ` [PATCH v3 3/4] ARM: dts: dra7: Fix up unaligned access setting for PCIe EP Vignesh R
@ 2018-07-24 17:31 ` Vignesh R
2018-08-08 16:57 ` [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for " Lorenzo Pieralisi
4 siblings, 0 replies; 10+ messages in thread
From: Vignesh R @ 2018-07-24 17:31 UTC (permalink / raw)
To: Tony Lindgren
Cc: Kishon Vijay Abraham I, Bjorn Helgaas, Rob Herring,
Lorenzo Pieralisi, linux-omap, linux-pci, devicetree,
linux-kernel, Vignesh R
Errata 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.
Reported-by: Chris Welch <Chris.Welch@viavisolutions.com>
Signed-off-by: Vignesh R <vigneshr@ti.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
---
v3:
collect ACKs.
Fix s/appplied/applied.
drivers/pci/controller/dwc/pci-dra7xx.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
index ce9224a36f62..43711561a199 100644
--- a/drivers/pci/controller/dwc/pci-dra7xx.c
+++ b/drivers/pci/controller/dwc/pci-dra7xx.c
@@ -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;
--
2.18.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for RC mode
2018-07-24 17:31 [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for RC mode Vignesh R
` (3 preceding siblings ...)
2018-07-24 17:31 ` [PATCH v3 4/4] pci: dwc: pci-dra7xx: Enable errata i870 for both EP and RC mode Vignesh R
@ 2018-08-08 16:57 ` Lorenzo Pieralisi
2018-08-10 10:07 ` Vignesh R
4 siblings, 1 reply; 10+ messages in thread
From: Lorenzo Pieralisi @ 2018-08-08 16:57 UTC (permalink / raw)
To: Vignesh R
Cc: Tony Lindgren, Kishon Vijay Abraham I, Bjorn Helgaas,
Rob Herring, linux-omap, linux-pci, devicetree, linux-kernel
On Tue, Jul 24, 2018 at 11:01:46PM +0530, Vignesh R wrote:
> 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.
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
> 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(-)
>
> --
> 2.18.0
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for RC mode
2018-08-08 16:57 ` [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for " Lorenzo Pieralisi
@ 2018-08-10 10:07 ` Vignesh R
2018-09-07 17:00 ` Tony Lindgren
0 siblings, 1 reply; 10+ messages in thread
From: Vignesh R @ 2018-08-10 10:07 UTC (permalink / raw)
To: Lorenzo Pieralisi
Cc: Tony Lindgren, KISHON VIJAY ABRAHAM, Bjorn Helgaas, Rob Herring,
linux-omap, linux-pci, devicetree, linux-kernel
On Wednesday 08 August 2018 10:27 PM, Lorenzo Pieralisi wrote:
> On Tue, Jul 24, 2018 at 11:01:46PM +0530, Vignesh R wrote:
>> 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.
>
> I think we have missed the v4.19 merge window by now -
Right. I didn't get any response from Tony.
> 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
> Thanks,
> Lorenzo
>
>> 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(-)
>>
>> --
>> 2.18.0
>>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for RC mode
2018-08-10 10:07 ` Vignesh R
@ 2018-09-07 17:00 ` Tony Lindgren
2018-09-17 9:47 ` Lorenzo Pieralisi
0 siblings, 1 reply; 10+ messages in thread
From: Tony Lindgren @ 2018-09-07 17:00 UTC (permalink / raw)
To: Vignesh R
Cc: Lorenzo Pieralisi, KISHON VIJAY ABRAHAM, Bjorn Helgaas,
Rob Herring, linux-omap, linux-pci, devicetree, linux-kernel
* Vignesh R <vigneshr@ti.com> [180810 10:10]:
>
>
> On Wednesday 08 August 2018 10:27 PM, Lorenzo Pieralisi wrote:
> > On Tue, Jul 24, 2018 at 11:01:46PM +0530, Vignesh R wrote:
> >> 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.
> >
> > 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.
> > 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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for RC mode
2018-09-07 17:00 ` Tony Lindgren
@ 2018-09-17 9:47 ` Lorenzo Pieralisi
2018-09-17 18:12 ` Vignesh R
0 siblings, 1 reply; 10+ messages in thread
From: Lorenzo Pieralisi @ 2018-09-17 9:47 UTC (permalink / raw)
To: Tony Lindgren
Cc: Vignesh R, KISHON VIJAY ABRAHAM, Bjorn Helgaas, Rob Herring,
linux-omap, linux-pci, devicetree, linux-kernel
On Fri, Sep 07, 2018 at 10:00:09AM -0700, Tony Lindgren wrote:
> * Vignesh R <vigneshr@ti.com> [180810 10:10]:
> >
> >
> > On Wednesday 08 August 2018 10:27 PM, Lorenzo Pieralisi wrote:
> > > On Tue, Jul 24, 2018 at 11:01:46PM +0530, Vignesh R wrote:
> > >> 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.
> > >
> > > 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.
>
> > > 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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 0/4] pci-dra7xx: Enable errata i870 workaround for RC mode
2018-09-17 9:47 ` Lorenzo Pieralisi
@ 2018-09-17 18:12 ` Vignesh R
0 siblings, 0 replies; 10+ messages in thread
From: Vignesh R @ 2018-09-17 18:12 UTC (permalink / raw)
To: Lorenzo Pieralisi, Tony Lindgren
Cc: KISHON VIJAY ABRAHAM, Bjorn Helgaas, Rob Herring, linux-omap,
linux-pci, devicetree, linux-kernel
Hi Lorenzo,
On 17-Sep-18 3:17 PM, Lorenzo Pieralisi wrote:
> On Fri, Sep 07, 2018 at 10:00:09AM -0700, Tony Lindgren wrote:
>> * Vignesh R <vigneshr@ti.com> [180810 10:10]:
>>>
[...]
>>>>> 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.
>>
>>>> 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 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
^ permalink raw reply [flat|nested] 10+ messages in thread