From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>
Cc: Yanfei Xu <yanfei.xu@intel.com>, Suhui <suhui@nfschina.com>,
iommu@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] iommu/vt-d: Handle the failure case of dmar_reenable_qi()
Date: Wed, 14 Jun 2023 10:47:03 +0800 [thread overview]
Message-ID: <20230614024705.88878-3-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20230614024705.88878-1-baolu.lu@linux.intel.com>
From: Yanfei Xu <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>
Link: https://lore.kernel.org/r/20230605112659.308981-2-yanfei.xu@intel.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/iommu/intel/iommu.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 323fa1a93765..e83fe243680b 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -2967,10 +2967,15 @@ static int init_iommu_hw(void)
{
struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu = NULL;
+ int ret;
- for_each_active_iommu(iommu, drhd)
- if (iommu->qi)
- dmar_reenable_qi(iommu);
+ for_each_active_iommu(iommu, drhd) {
+ if (iommu->qi) {
+ ret = dmar_reenable_qi(iommu);
+ if (ret)
+ return ret;
+ }
+ }
for_each_iommu(iommu, drhd) {
if (drhd->ignored) {
--
2.34.1
next prev parent reply other threads:[~2023-06-14 2:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-14 2:47 [PATCH 0/4] [PULL REQUEST] Intel IOMMU updates for Linux v6.5 Lu Baolu
2023-06-14 2:47 ` [PATCH 1/4] iommu/vt-d: Remove unnecessary (void*) conversions Lu Baolu
2023-06-14 2:47 ` Lu Baolu [this message]
2023-06-14 2:47 ` [PATCH 3/4] iommu/vt-d: Remove two WARN_ON in domain_context_mapping_one() Lu Baolu
2023-06-14 2:47 ` [PATCH 4/4] iommu/vt-d: Remove commented-out code Lu Baolu
2023-06-16 14:38 ` [PATCH 0/4] [PULL REQUEST] Intel IOMMU updates for Linux v6.5 Joerg Roedel
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=20230614024705.88878-3-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=suhui@nfschina.com \
--cc=yanfei.xu@intel.com \
/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