The commit 6b31a9744b87 ("arm64: dts: qcom: sdm845: Affirm IDR0.CCTW on
apps_smmu") enabled dma-coherent property for the IOMMU device. This
works for some devices, like Qualcomm RB3 platform, but at the same time
it breaks booting on Lenovo Yoga C630 (most likely because of some TZ
differences). Disable DMA coherency for IOMMU on Lenove Yoga C630.

Fixes: 6b31a9744b87 ("arm64: dts: qcom: sdm845: Affirm IDR0.CCTW on apps_smmu")
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
index f18050848cd8892666015c8182971ff0567747b7..67a60ec33e8cf701a672696e7c7bd85120950441 100644
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -342,6 +342,10 @@ vreg_lvs2a_1p8: lvs2 {
 	};
 };
 
+&apps_smmu {
+	/delete-property/ dma-coherent;
+};
+
 &cdsp_pas {
 	firmware-name = "qcom/sdm850/LENOVO/81JL/qccdsp850.mbn";
 	status = "okay";

---
base-commit: ed58d103e6da15a442ff87567898768dc3a66987
change-id: 20250215-yoga-dma-coherent-ea255630fd7d

Best regards,
-- 
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

On 15.02.2025 3:43 AM, Dmitry Baryshkov wrote:
> The commit 6b31a9744b87 ("arm64: dts: qcom: sdm845: Affirm IDR0.CCTW on
> apps_smmu") enabled dma-coherent property for the IOMMU device. This
> works for some devices, like Qualcomm RB3 platform, but at the same time
> it breaks booting on Lenovo Yoga C630 (most likely because of some TZ
> differences). Disable DMA coherency for IOMMU on Lenove Yoga C630.
> 
> Fixes: 6b31a9744b87 ("arm64: dts: qcom: sdm845: Affirm IDR0.CCTW on apps_smmu")
> Cc: stable@vger.kernel.org
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Let's revert the offending commit instead, this must have been some
sort of fw development fluke..

Konrad