[PATCH] iommu/qcom: Disable clocks if restoring the secure config fails

From: Suyuan Wang via B4 Relay

Date: Sun Nov 22 2026 - 05:12:00 EST


From: Suyuan Wang <stevewong@xxxxxxxxxxx>

qcom_iommu_resume() enables the clocks and then, for an IOMMU with a
power domain, calls qcom_scm_restore_sec_cfg(). If that call fails, the
error is returned but the clocks stay enabled. The PM core then treats
the device as still suspended, so qcom_iommu_suspend() will not run to
turn them off.

Disable the clocks again when qcom_scm_restore_sec_cfg() fails.

Found with a static analysis tool and checked by hand.

Fixes: 268dd4edb748 ("iommu/qcom: restore IOMMU state if needed")
Cc: stable@xxxxxxxxxxxxxxx
Co-developed-by: Kaixuan Li <kaixuan.li@xxxxxxxxxx>
Signed-off-by: Kaixuan Li <kaixuan.li@xxxxxxxxxx>
Signed-off-by: Suyuan Wang <stevewong@xxxxxxxxxxx>
---
Compile tested on arm64 (W=1). I don't have the hardware.
---
drivers/iommu/arm/arm-smmu/qcom_iommu.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
index 96903cd9cfc2..52bcb8cf46b1 100644
--- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
+++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
@@ -898,8 +898,11 @@ static int __maybe_unused qcom_iommu_resume(struct device *dev)
if (ret < 0)
return ret;

- if (dev->pm_domain)
- return qcom_scm_restore_sec_cfg(qcom_iommu->sec_id, 0);
+ if (dev->pm_domain) {
+ ret = qcom_scm_restore_sec_cfg(qcom_iommu->sec_id, 0);
+ if (ret)
+ clk_bulk_disable_unprepare(CLK_NUM, qcom_iommu->clks);
+ }

return ret;
}