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 1/2] iommu/vt-d: Remove the dead code in init_iommu_hw()
Date: Tue, 30 May 2023 17:25:02 +0800 [thread overview]
Message-ID: <20230530092503.152926-2-yanfei.xu@intel.com> (raw)
In-Reply-To: <20230530092503.152926-1-yanfei.xu@intel.com>
After 'commit 2a41ccee2fdc ("iommu/vt-d: Change
iommu_enable/disable_translation to return void")', init_iommu_hw() only
returns 0. If statement for return value of this function is meaningless.
Hence change init_iommu_hw() to return viod and remove the dead code of
if statement in init_iommu_hw()
Signed-off-by: Yanfei Xu <yanfei.xu@intel.com>
---
drivers/iommu/intel/iommu.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 8096273b034c..e98f1b122b49 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -2963,7 +2963,7 @@ static void __init init_no_remapping_devices(void)
}
#ifdef CONFIG_SUSPEND
-static int init_iommu_hw(void)
+static void init_iommu_hw(void)
{
struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu = NULL;
@@ -2988,8 +2988,6 @@ static int init_iommu_hw(void)
iommu_enable_translation(iommu);
iommu_disable_protect_mem_regions(iommu);
}
-
- return 0;
}
static void iommu_flush_all(void)
@@ -3051,13 +3049,7 @@ static void iommu_resume(void)
struct intel_iommu *iommu = NULL;
unsigned long flag;
- if (init_iommu_hw()) {
- if (force_on)
- panic("tboot: IOMMU setup failed, DMAR can not resume!\n");
- else
- WARN(1, "IOMMU setup failed, DMAR can not resume!\n");
- return;
- }
+ init_iommu_hw();
for_each_active_iommu(iommu, drhd) {
--
2.34.1
next prev parent reply other threads:[~2023-05-30 9:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 9:25 [PATCH 0/2] Misc cleanup for iommu/vt-d Yanfei Xu
2023-05-30 9:25 ` Yanfei Xu [this message]
2023-05-31 3:24 ` [PATCH 1/2] iommu/vt-d: Remove the dead code in init_iommu_hw() Baolu Lu
2023-05-31 6:55 ` Yanfei Xu
2023-06-01 1:15 ` Baolu Lu
2023-06-01 7:49 ` Yanfei Xu
2023-05-30 9:25 ` [PATCH 2/2] iommu/vt-d: Use BUG_ON to check NULL value of 'table' Yanfei Xu
2023-05-31 3:26 ` Baolu Lu
2023-05-31 7:09 ` Yanfei Xu
2023-06-01 1:23 ` Baolu Lu
2023-06-01 4:47 ` Yanfei Xu
2023-06-02 14:32 ` Jason Gunthorpe
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=20230530092503.152926-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