2022-12-05 10:38:21

by Johan Hovold

Subject: [PATCH 0/2] arm64: dts: qcom: sc8280xp: fix UFS DMA coherency

The SC8280XP UFS controllers are cache coherent and must be marked as
such in the devicetree to avoid potential data corruption.

Johan


Johan Hovold (2):
dt-bindings: ufs: qcom: allow 'dma-coherent' property
arm64: dts: qcom: sc8280xp: fix UFS DMA coherency

Documentation/devicetree/bindings/ufs/qcom,ufs.yaml | 2 ++
arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 ++
2 files changed, 4 insertions(+)

--
2.37.4

2022-12-05 10:55:17

by Johan Hovold

Subject: [PATCH 2/2] arm64: dts: qcom: sc8280xp: fix UFS DMA coherency

The SC8280XP UFS controllers are cache coherent and must be marked as
such in the devicetree to avoid potential data corruption.

Fixes: 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")
Cc: [email protected] # 6.0
Signed-off-by: Johan Hovold <[email protected]>
---
arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index c4947c563099..23d1f51527aa 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -1430,6 +1430,7 @@ ufs_mem_hc: ufs@1d84000 {
required-opps = <&rpmhpd_opp_nom>;

iommus = <&apps_smmu 0xe0 0x0>;
+ dma-coherent;

clocks = <&gcc GCC_UFS_PHY_AXI_CLK>,
<&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
@@ -1491,6 +1492,7 @@ ufs_card_hc: ufs@1da4000 {
power-domains = <&gcc UFS_CARD_GDSC>;

iommus = <&apps_smmu 0x4a0 0x0>;
+ dma-coherent;

clocks = <&gcc GCC_UFS_CARD_AXI_CLK>,
<&gcc GCC_AGGRE_UFS_CARD_AXI_CLK>,
--
2.37.4

2022-12-05 11:51:57

by Konrad Dybcio

Subject: Re: [PATCH 2/2] arm64: dts: qcom: sc8280xp: fix UFS DMA coherency

On 05/12/2022 11:08, Johan Hovold wrote:
> The SC8280XP UFS controllers are cache coherent and must be marked as
> such in the devicetree to avoid potential data corruption.
>
> Fixes: 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")
> Cc: [email protected] # 6.0
> Signed-off-by: Johan Hovold <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> index c4947c563099..23d1f51527aa 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> @@ -1430,6 +1430,7 @@ ufs_mem_hc: ufs@1d84000 {
> required-opps = <&rpmhpd_opp_nom>;
>
> iommus = <&apps_smmu 0xe0 0x0>;
> + dma-coherent;
>
> clocks = <&gcc GCC_UFS_PHY_AXI_CLK>,
> <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
> @@ -1491,6 +1492,7 @@ ufs_card_hc: ufs@1da4000 {
> power-domains = <&gcc UFS_CARD_GDSC>;
>
> iommus = <&apps_smmu 0x4a0 0x0>;
> + dma-coherent;
>
> clocks = <&gcc GCC_UFS_CARD_AXI_CLK>,
> <&gcc GCC_AGGRE_UFS_CARD_AXI_CLK>,

2022-12-05 13:20:34

by Manivannan Sadhasivam

Subject: Re: [PATCH 2/2] arm64: dts: qcom: sc8280xp: fix UFS DMA coherency

On Mon, Dec 05, 2022 at 11:08:37AM +0100, Johan Hovold wrote:
> The SC8280XP UFS controllers are cache coherent and must be marked as
> such in the devicetree to avoid potential data corruption.
>
> Fixes: 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")
> Cc: [email protected] # 6.0
> Signed-off-by: Johan Hovold <[email protected]>

Reviewed-by: Manivannan Sadhasivam <[email protected]>

Thanks,
Mani

> ---
> arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> index c4947c563099..23d1f51527aa 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> @@ -1430,6 +1430,7 @@ ufs_mem_hc: ufs@1d84000 {
> required-opps = <&rpmhpd_opp_nom>;
>
> iommus = <&apps_smmu 0xe0 0x0>;
> + dma-coherent;
>
> clocks = <&gcc GCC_UFS_PHY_AXI_CLK>,
> <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
> @@ -1491,6 +1492,7 @@ ufs_card_hc: ufs@1da4000 {
> power-domains = <&gcc UFS_CARD_GDSC>;
>
> iommus = <&apps_smmu 0x4a0 0x0>;
> + dma-coherent;
>
> clocks = <&gcc GCC_UFS_CARD_AXI_CLK>,
> <&gcc GCC_AGGRE_UFS_CARD_AXI_CLK>,
> --
> 2.37.4
>

--
மணிவண்ணன் சதாசிவம்

2022-12-06 18:40:27

by Bjorn Andersson

Subject: Re: (subset) [PATCH 0/2] arm64: dts: qcom: sc8280xp: fix UFS DMA coherency

On Mon, 5 Dec 2022 11:08:35 +0100, Johan Hovold wrote:
> The SC8280XP UFS controllers are cache coherent and must be marked as
> such in the devicetree to avoid potential data corruption.
>
> Johan
>
>
> Johan Hovold (2):
> dt-bindings: ufs: qcom: allow 'dma-coherent' property
> arm64: dts: qcom: sc8280xp: fix UFS DMA coherency
>
> [...]

Applied, thanks!

[2/2] arm64: dts: qcom: sc8280xp: fix UFS DMA coherency
commit: 0953777640354dc459a22369eea488603d225dd9

Best regards,
--
Bjorn Andersson <[email protected]>