On Fri, Jul 28, 2017 at 8:03 PM, Florian Fainelli <f.fainelli@xxxxxxxxx> wrote:
> On 07/25/2017 03:06 PM, Jon Mason wrote:
>> Cache related issues with DMA rings and performance issues related to
>> caching are being caused by not properly setting the "dma-coherent" flag
>> in the device tree entries. Adding it here to correct the issue.
>>
>> Signed-off-by: Jon Mason <jon.mason@xxxxxxxxxxxx>
>> Fixes: 5fa1026a3e4d ("ARM: dts: NSP: Add PL330 support")
>> Fixes: 3107fa5bcfb2 ("ARM: dts: NSP: Add SD/MMC support")
>> Fixes: 13d04f20935c ("ARM: dts: NSP: Add AMAC entries")
>> Fixes: 5aeda7bf8a1e ("ARM: dts: NSP: Add and enable amac2")
>> Fixes: 17d517172300 ("ARM: dts: NSP: Add mailbox (PDC) to NSP")
>> Fixes: 1d8ece6639e1 ("ARM: dts: NSP: Add EHCI/OHCI USB nodes to device tree")
>> Fixes: bf2289bedef4 ("ARM: dts: NSP: Add Switch Register Access Block node")
>
> The SRAB block is not DMA capable, so this seems a bit superfluous here.
I'll double check on that part as well.
> Do you want to submit a patch that omits PL330 for now and adds it
> eventually later so I can proceed with applying patches 2 & 3 for this
> cycle?
Yes, I'll do a v2 with those 2 portions removed, and double back to
add (if necessary) once I've bottomed out internally.
Thanks,
Jon
>> Fixes: 0f9f27a36d09 ("ARM: dts: NSP: Add I2C support to the DT")
>> Fixes: 8dbcad020f2e ("ARM: dts: nsp: Add sata device tree entry")
>> Fixes: 522199029fdc ("ARM: dts: NSP: Fix PCIE DT issue")
>> ---
>> arch/arm/boot/dts/bcm-nsp.dtsi | 14 ++++++++++++++
>> 1 file changed, 14 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
>> index 7204d1def23d..c8d734d9f5fc 100644
>> --- a/arch/arm/boot/dts/bcm-nsp.dtsi
>> +++ b/arch/arm/boot/dts/bcm-nsp.dtsi
>> @@ -207,6 +207,7 @@
>> clocks = <&iprocslow>;
>> clock-names = "apb_pclk";
>> #dma-cells = <1>;
>> + dma-coherent;
>> };
>>
>> sdio: sdhci@21000 {
>> @@ -215,6 +216,7 @@
>> interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
>> sdhci,auto-cmd12;
>> clocks = <&lcpll0 BCM_NSP_LCPLL0_SDIO_CLK>;
>> + dma-coherent;
>> status = "disabled";
>> };
>>
>> @@ -224,6 +226,7 @@
>> <0x110000 0x1000>;
>> reg-names = "amac_base", "idm_base";
>> interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
>> + dma-coherent;
>> status = "disabled";
>> };
>>
>> @@ -233,6 +236,7 @@
>> <0x111000 0x1000>;
>> reg-names = "amac_base", "idm_base";
>> interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
>> + dma-coherent;
>> status = "disabled";
>> };
>>
>> @@ -242,6 +246,7 @@
>> <0x112000 0x1000>;
>> reg-names = "amac_base", "idm_base";
>> interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
>> + dma-coherent;
>> status = "disabled";
>> };
>>
>> @@ -252,6 +257,7 @@
>> #mbox-cells = <1>;
>> brcm,rx-status-len = <32>;
>> brcm,use-bcm-hdr;
>> + dma-coherent;
>> };
>>
>> nand: nand@26000 {
>> @@ -325,6 +331,7 @@
>> compatible = "generic-ehci";
>> reg = <0x2a000 0x100>;
>> interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
>> + dma-coherent;
>> status = "disabled";
>> };
>>
>> @@ -332,6 +339,7 @@
>> compatible = "generic-ohci";
>> reg = <0x2b000 0x100>;
>> interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
>> + dma-coherent;
>> status = "disabled";
>> };
>>
>> @@ -364,6 +372,7 @@
>> #address-cells = <1>;
>> #size-cells = <0>;
>>
>> + dma-coherent;
>> status = "disabled";
>>
>> /* ports are defined in board DTS */
>> @@ -376,6 +385,7 @@
>> #size-cells = <0>;
>> interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;
>> clock-frequency = <100000>;
>> + dma-coherent;
>> status = "disabled";
>> };
>>
>> @@ -446,6 +456,7 @@
>> interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
>> #address-cells = <1>;
>> #size-cells = <0>;
>> + dma-coherent;
>> status = "disabled";
>>
>> sata0: sata-port@0 {
>> @@ -483,6 +494,7 @@
>> */
>> ranges = <0x82000000 0 0x08000000 0x08000000 0 0x8000000>;
>>
>> + dma-coherent;
>> status = "disabled";
>>
>> msi-parent = <&msi0>;
>> @@ -519,6 +531,7 @@
>> */
>> ranges = <0x82000000 0 0x40000000 0x40000000 0 0x8000000>;
>>
>> + dma-coherent;
>> status = "disabled";
>>
>> msi-parent = <&msi1>;
>> @@ -555,6 +568,7 @@
>> */
>> ranges = <0x82000000 0 0x48000000 0x48000000 0 0x8000000>;
>>
>> + dma-coherent;
>> status = "disabled";
>>
>> msi-parent = <&msi2>;
>>
>
>
> --
> Florian
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
