From: Mohit Sharma <mohit.sharma@oss.qualcomm.com>
To: Srinivas Kandagatla <srini@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Mark Brown <broonie@kernel.org>
Cc: Ajay Kumar Nandam <ajay.nandam@oss.qualcomm.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Rob Clark <robin.clark@oss.qualcomm.com>,
Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>,
Konrad Dybcio <konradybcio@kernel.org>,
Abel Vesa <abelvesa@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org,
devicetree@vger.kernel.org, iommu@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Mohit Sharma <mohit.sharma@oss.qualcomm.com>
Subject: [PATCH 4/4] ASoC: qcom: q6apm-dai: allow the mDSP IOMMU path
Date: Thu, 19 Nov 2026 22:17:05 +0530 [thread overview]
Message-ID: <20261119164705.1594066-5-mohit.sharma@oss.qualcomm.com> (raw)
In-Reply-To: <20261119164705.1594066-1-mohit.sharma@oss.qualcomm.com>
The q6apm DAI currently selects SCM buffer assignment solely from the GPR
domain. This prevents an mDSP-backed DAI from using an IOMMU, even when
the device tree provides an iommus property for environments where the
mDSP stream is routed through the apps SMMU.
Use the parsed stream ID to distinguish the two memory access models. An
mDSP DAI without an IOMMU continues to use SCM-assigned buffers, while an
mDSP DAI with an IOMMU follows the existing DMA/IOMMU path. This also
avoids requiring SCM availability for the IOMMU configuration.
Fixes: bb8afd437d79 ("ASoC: qcom: q6apm-dai: add SCM buffer assignment for mDSP platforms")
Co-developed-by: Ajay Kumar Nandam <ajay.nandam@oss.qualcomm.com>
Signed-off-by: Ajay Kumar Nandam <ajay.nandam@oss.qualcomm.com>
Signed-off-by: Mohit Sharma <mohit.sharma@oss.qualcomm.com>
diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c
index c1f0af93e808..a29fe4241776 100644
--- a/sound/soc/qcom/qdsp6/q6apm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6apm-dai.c
@@ -1218,16 +1218,11 @@ static int q6apm_dai_probe(struct platform_device *pdev)
pdata->sid = args.args[0] & SID_MASK_DEFAULT;
if (apm && apm->gdev &&
- apm->gdev->domain_id == GPR_DOMAIN_ID_MODEM) {
+ apm->gdev->domain_id == GPR_DOMAIN_ID_MODEM &&
+ pdata->sid < 0) {
if (!qcom_scm_is_available())
return -EPROBE_DEFER;
- if (pdata->sid >= 0) {
- dev_err(dev,
- "iommus and mDSP SCM path are mutually exclusive\n");
- return -EINVAL;
- }
-
pdata->use_scm_assign = true;
rc = devm_add_action_or_reset(dev, q6apm_dai_scm_cleanup,
--
2.34.1
prev parent reply other threads:[~2026-11-19 16:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 16:47 [PATCH 0/4] Fix Shikra q6apm DAI under KVM/EL2 Mohit Sharma
2026-11-19 16:47 ` [PATCH 1/4] dt-bindings: sound: qcom,q6apm-dai: allow Shikra compatible Mohit Sharma
2026-11-19 16:47 ` [PATCH 2/4] iommu: arm-smmu-qcom: use identity domain for Shikra q6apm DAI Mohit Sharma
2026-11-19 16:47 ` [PATCH 3/4] arm64: dts: qcom: shikra: add q6apm DAI compatible Mohit Sharma
2026-11-19 16:47 ` Mohit Sharma [this message]
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=20261119164705.1594066-5-mohit.sharma@oss.qualcomm.com \
--to=mohit.sharma@oss.qualcomm.com \
--cc=abelvesa@kernel.org \
--cc=ajay.nandam@oss.qualcomm.com \
--cc=andersson@kernel.org \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=konradybcio@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=robh@kernel.org \
--cc=robin.clark@oss.qualcomm.com \
--cc=robin.murphy@arm.com \
--cc=srini@kernel.org \
--cc=tiwai@suse.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
all inboxes | Powered by JetHome®