From: Michael Shavit <mshavit@google.com>
To: Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>
Cc: Michael Shavit <mshavit@google.com>,
jean-philippe@linaro.org, nicolinc@nvidia.com, jgg@nvidia.com,
baolu.lu@linux.intel.com, linux-arm-kernel@lists.infradead.org,
iommu@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH v3 13/13] iommu/arm-smmu-v3-sva: Add check when enabling sva
Date: Wed, 14 Jun 2023 23:42:05 +0800 [thread overview]
Message-ID: <20230614154304.2860121-14-mshavit@google.com> (raw)
In-Reply-To: <20230614154304.2860121-1-mshavit@google.com>
SVA domains can only be attached when the master's STEs have a stage 1
domain.
Signed-off-by: Michael Shavit <mshavit@google.com>
---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
index b615a85e6a54e..e2a91f20f0906 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
@@ -499,9 +499,15 @@ int arm_smmu_master_enable_sva(struct arm_smmu_master *master)
int ret;
mutex_lock(&sva_lock);
+
+ if (!master->s1_cfg) {
+ ret = -EBUSY;
+ goto unlock;
+ }
ret = arm_smmu_master_sva_enable_iopf(master);
if (!ret)
master->sva_enabled = true;
+unlock:
mutex_unlock(&sva_lock);
return ret;
--
2.41.0.162.gfafddb0af9-goog
prev parent reply other threads:[~2023-06-14 15:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-14 15:41 [PATCH v3 00/13] Add PASID support to SMMUv3 unmanaged domains Michael Shavit
2023-06-14 15:41 ` [PATCH v3 01/13] iommu/arm-smmu-v3: Move ctx_desc out of s1_cfg Michael Shavit
2023-06-14 15:41 ` [PATCH v3 02/13] iommu/arm-smmu-v3: Add smmu_s1_cfg to smmu_master Michael Shavit
2023-06-14 15:41 ` [PATCH v3 03/13] iommu/arm-smmu-v3: Refactor write_strtab_ent Michael Shavit
2023-06-14 15:41 ` [PATCH v3 04/13] iommu/arm-smmu-v3: Refactor write_ctx_desc Michael Shavit
2023-06-14 15:41 ` [PATCH v3 05/13] iommu/arm-smmu-v3: Use the master-owned s1_cfg Michael Shavit
2023-06-14 15:41 ` [PATCH v3 06/13] iommu/arm-smmu-v3: Simplify arm_smmu_enable_ats Michael Shavit
2023-06-14 15:41 ` [PATCH v3 07/13] iommu/arm-smmu-v3: Keep track of attached ssids Michael Shavit
2023-06-20 10:21 ` kernel test robot
2023-06-14 15:42 ` [PATCH v3 08/13] iommu/arm-smmu-v3: Add helper for atc invalidation Michael Shavit
2023-06-14 15:42 ` [PATCH v3 09/13] iommu/arm-smmu-v3: Implement set_dev_pasid Michael Shavit
2023-06-14 15:42 ` [PATCH v3 10/13] iommu/arm-smmu-v3-sva: Remove bond refcount Michael Shavit
2023-06-14 15:42 ` [PATCH v3 11/13] iommu/arm-smmu-v3-sva: Clean unused iommu_sva Michael Shavit
2023-06-14 15:42 ` [PATCH v3 12/13] iommu/arm-smmu-v3-sva: Remove arm_smmu_bond Michael Shavit
2023-06-14 15:42 ` Michael Shavit [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=20230614154304.2860121-14-mshavit@google.com \
--to=mshavit@google.com \
--cc=baolu.lu@linux.intel.com \
--cc=iommu@lists.linux.dev \
--cc=jean-philippe@linaro.org \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolinc@nvidia.com \
--cc=robin.murphy@arm.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;
as well as URLs for NNTP newsgroup(s).