Commit 268dd4ed authored Oct 11, 2023 by Vladimir Lypak Committed by Will Deacon Dec 12, 2023

iommu/qcom: restore IOMMU state if needed



If the IOMMU has a power domain then some state will be lost in
qcom_iommu_suspend and TZ will reset device if we don't call
qcom_scm_restore_sec_cfg before accessing it again.

Signed-off-by: Vladimir Lypak <vladimir.lypak@gmail.com>
[luca@z3ntu.xyz: reword commit message a bit]
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Link: https://lore.kernel.org/r/20231011-msm8953-iommu-restore-v1-1-48a0c93809a2@z3ntu.xyz


Signed-off-by: Will Deacon <will@kernel.org>

parent 28af105c

drivers/iommu/arm/arm-smmu/qcom_iommu.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -900,8 +900,16 @@ static void qcom_iommu_device_remove(struct platform_device *pdev)
		static int __maybe_unused qcom_iommu_resume(struct device *dev)
		{
		struct qcom_iommu_dev *qcom_iommu = dev_get_drvdata(dev);
		int ret;

		ret = clk_bulk_prepare_enable(CLK_NUM, qcom_iommu->clks);
		if (ret < 0)
		return ret;

		if (dev->pm_domain)
		return qcom_scm_restore_sec_cfg(qcom_iommu->sec_id, 0);

		return clk_bulk_prepare_enable(CLK_NUM, qcom_iommu->clks);
		return ret;
		}

		static int __maybe_unused qcom_iommu_suspend(struct device *dev)