Linux IOMMU Development
 help / color / mirror / Atom feed
From: Yanfei Xu <yanfei.xu@intel.com>
To: dwmw2@infradead.org, baolu.lu@linux.intel.com, joro@8bytes.org,
	will@kernel.org, robin.murphy@arm.com
Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, yanfei.xu@intel.com
Subject: [PATCH v2 1/2] iommu/vt-d: Handle the failure case of dmar_reenable_qi()
Date: Fri,  2 Jun 2023 10:05:19 +0800	[thread overview]
Message-ID: <20230602020520.224465-2-yanfei.xu@intel.com> (raw)
In-Reply-To: <20230602020520.224465-1-yanfei.xu@intel.com>

dmar_reenable_qi() may not succeed. Check and return when it fails.

Signed-off-by: Yanfei Xu <yanfei.xu@intel.com>
---
 drivers/iommu/intel/iommu.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 8096273b034c..e9188d045609 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -2967,10 +2967,14 @@ static int init_iommu_hw(void)
 {
 	struct dmar_drhd_unit *drhd;
 	struct intel_iommu *iommu = NULL;
+	int ret;
 
-	for_each_active_iommu(iommu, drhd)
+	for_each_active_iommu(iommu, drhd) {
 		if (iommu->qi)
-			dmar_reenable_qi(iommu);
+			ret = dmar_reenable_qi(iommu);
+		if (ret)
+			return ret;
+	}
 
 	for_each_iommu(iommu, drhd) {
 		if (drhd->ignored) {
-- 
2.34.1


  reply	other threads:[~2023-06-02  2:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-02  2:05 [PATCH v2 0/2] Misc cleanup for iommu/vt-d Yanfei Xu
2023-06-02  2:05 ` Yanfei Xu [this message]
2023-06-02  9:27   ` [PATCH v2 1/2] iommu/vt-d: Handle the failure case of dmar_reenable_qi() Robin Murphy
2023-06-02 10:06     ` Yanfei Xu
2023-06-02  2:05 ` [PATCH v2 2/2] iommu/vt-d: Remove two WARN_ON in domain_context_mapping_one() Yanfei Xu

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=20230602020520.224465-2-yanfei.xu@intel.com \
    --to=yanfei.xu@intel.com \
    --cc=baolu.lu@linux.intel.com \
    --cc=dwmw2@infradead.org \
    --cc=iommu@lists.linux.dev \
    --cc=joro@8bytes.org \
    --cc=linux-kernel@vger.kernel.org \
    --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