| Message ID | 20221205100837.29212-3-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0953777640354dc459a22369eea488603d225dd9 |
| Headers | show |
| Series | arm64: dts: qcom: sc8280xp: fix UFS DMA coherency | expand |
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: stable@vger.kernel.org # 6.0 > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> 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>,
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: stable@vger.kernel.org # 6.0 > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> 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 >
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>,
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: stable@vger.kernel.org # 6.0 Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 ++ 1 file changed, 2 insertions(+)