From: Suyuan Wang via B4 Relay <devnull+shyckless.gmail.com@kernel.org>
To: joro@8bytes.org, will@kernel.org, robin.clark@oss.qualcomm.com
Cc: iommu@lists.linux.dev, robin.murphy@arm.com,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH] iommu/qcom: Disable clocks if restoring the secure config fails
Date: Sun, 22 Nov 2026 10:11:52 +0000 [thread overview]
Message-ID: <20261122-qcom-iommu-v1-1-ecb20a28871f@gmail.com> (raw)
From: Suyuan Wang <stevewong@hust.edu.cn>
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@vger.kernel.org
Co-developed-by: Kaixuan Li <kaixuan.li@ntu.edu.sg>
Signed-off-by: Kaixuan Li <kaixuan.li@ntu.edu.sg>
Signed-off-by: Suyuan Wang <stevewong@hust.edu.cn>
---
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;
}
reply other threads:[~2026-11-22 10:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261122-qcom-iommu-v1-1-ecb20a28871f@gmail.com \
--to=devnull+shyckless.gmail.com@kernel.org \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.clark@oss.qualcomm.com \
--cc=robin.murphy@arm.com \
--cc=shyckless@gmail.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox