From: Kevin Tian <kevin.tian@intel.com>
To: Lu Baolu <baolu.lu@linux.intel.com>,
Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>
Cc: Kevin Tian <kevin.tian@intel.com>, Joerg Roedel <jroedel@suse.de>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Ashok Raj <ashok.raj@intel.com>,
Chris Wright <chrisw@sous-sol.org>,
Jesse Barnes <jbarnes@virtuousgeek.org>,
Asit Mallick <asit.k.mallick@intel.com>,
iommu@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 7/9] iommu/vt-d: Remove the 'force_on' variable
Date: Thu, 4 Jun 2026 05:15:38 +0000 [thread overview]
Message-ID: <20260604051540.592925-8-kevin.tian@intel.com> (raw)
In-Reply-To: <20260604051540.592925-1-kevin.tian@intel.com>
The force_on variable is now redundant - same information captured
by "dmar_state == DMAR_ENABLED_FORCE". Replace all force_on checks
with dmar_is_force_on().
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
---
drivers/iommu/intel/iommu.c | 34 +++++++++++++++-------------------
drivers/iommu/intel/iommu.h | 5 +++++
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index ed227de6d0ba..d05ae36eda70 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -53,10 +53,9 @@ static int rwbf_quirk;
#define rwbf_required(iommu) (rwbf_quirk || cap_rwbf((iommu)->cap))
/*
- * set to 1 to panic kernel if can't successfully enable VT-d
+ * set to 1 to avoid kernel panic if can't successfully enable VT-d
* (used when kernel is launched w/ TXT)
*/
-static int force_on = 0;
int intel_iommu_tboot_noforce;
#define ROOT_ENTRY_NR (VTD_PAGE_SIZE/sizeof(struct root_entry))
@@ -1708,7 +1707,7 @@ static int __init init_dmars(void)
* we always have to disable PMRs or DMA may fail on
* this device
*/
- if (force_on)
+ if (dmar_is_force_on())
iommu_disable_protect_mem_regions(iommu);
continue;
}
@@ -1800,7 +1799,7 @@ static int init_iommu_hw(void)
* we always have to disable PMRs or DMA may fail on
* this device
*/
- if (force_on)
+ if (dmar_is_force_on())
iommu_disable_protect_mem_regions(iommu);
continue;
}
@@ -1861,7 +1860,7 @@ static void iommu_resume(void *data)
unsigned long flag;
if (init_iommu_hw()) {
- if (force_on)
+ if (dmar_is_force_on())
panic("tboot: IOMMU setup failed, DMAR can not resume!\n");
else
WARN(1, "IOMMU setup failed, DMAR can not resume!\n");
@@ -2129,7 +2128,7 @@ static int intel_iommu_add(struct dmar_drhd_unit *dmaru)
/*
* we always have to disable PMRs or DMA may fail on this device
*/
- if (force_on)
+ if (dmar_is_force_on())
iommu_disable_protect_mem_regions(iommu);
return 0;
}
@@ -2482,13 +2481,13 @@ static bool has_external_pci(void)
return false;
}
-static int __init platform_optin_force_iommu(void)
+static void __init platform_optin_force_iommu(void)
{
if (!dmar_platform_optin() || !dmar_can_force_on(DMAR_FORCEON_PLATFORM))
- return 0;
+ return;
if (!has_external_pci())
- return 0;
+ return;
/*
* If Intel-IOMMU is disabled by default, we will apply identity
@@ -2501,8 +2500,6 @@ static int __init platform_optin_force_iommu(void)
dmar_state = DMAR_ENABLED_FORCE;
dmar_disabled = 0;
-
- return 1;
}
static int __init probe_acpi_namespace_devices(void)
@@ -2542,10 +2539,10 @@ static int __init probe_acpi_namespace_devices(void)
return 0;
}
-static __init int tboot_force_iommu(void)
+static __init void tboot_force_iommu(void)
{
if (!tboot_enabled() || intel_iommu_tboot_noforce)
- return 0;
+ return;
if (!dmar_can_force_on(DMAR_FORCEON_TBOOT))
panic("tboot: Failed to force IOMMU on\n");
@@ -2556,8 +2553,6 @@ static __init int tboot_force_iommu(void)
dmar_state = DMAR_ENABLED_FORCE;
dmar_disabled = 0;
no_iommu = 0;
-
- return 1;
}
int __init intel_iommu_init(void)
@@ -2570,17 +2565,18 @@ int __init intel_iommu_init(void)
* Intel IOMMU is required for a TXT/tboot launch or platform
* opt in, so enforce that.
*/
- force_on = tboot_force_iommu() || platform_optin_force_iommu();
+ tboot_force_iommu();
+ platform_optin_force_iommu();
down_write(&dmar_global_lock);
if (dmar_table_init()) {
- if (force_on)
+ if (dmar_is_force_on())
panic("tboot: Failed to initialize DMAR table\n");
goto out_free_dmar;
}
if (dmar_dev_scope_init() < 0) {
- if (force_on)
+ if (dmar_is_force_on())
panic("tboot: Failed to initialize DMAR device scope\n");
goto out_free_dmar;
}
@@ -2634,7 +2630,7 @@ int __init intel_iommu_init(void)
ret = init_dmars();
if (ret) {
- if (force_on)
+ if (dmar_is_force_on())
panic("tboot: Failed to initialize DMARs\n");
pr_err("Initialization failed\n");
goto out_free_dmar;
diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
index 1acc393dafce..6b4e47f2f245 100644
--- a/drivers/iommu/intel/iommu.h
+++ b/drivers/iommu/intel/iommu.h
@@ -1383,6 +1383,11 @@ static inline bool dmar_is_disabled(void)
return dmar_state < 0;
}
+static inline bool dmar_is_force_on(void)
+{
+ return dmar_state == DMAR_ENABLED_FORCE;
+}
+
bool dmar_can_force_on(enum dmar_force_on force_on);
extern int dmar_disabled;
--
2.43.0
next prev parent reply other threads:[~2026-06-04 5:06 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-04 5:15 [PATCH 0/9] iommu/vt-d: Support a new DMAR flag Kevin Tian
2026-06-04 5:15 ` [PATCH 1/9] iommu/vt-d: Fix no_iommu to disable platform optin Kevin Tian
2026-06-04 5:15 ` [PATCH 2/9] iommu/vt-d: Force requesting ACS when tboot is enabled Kevin Tian
2026-06-04 5:15 ` [PATCH 3/9] iommu/vt-d: Remove dead code when CONFIG_INTEL_IOMMU is not set Kevin Tian
2026-06-04 5:15 ` [PATCH 4/9] iommu/vt-d: Consolidate dmar state management and force_on logic Kevin Tian
2026-06-12 11:08 ` Baolu Lu
2026-06-17 7:05 ` Tian, Kevin
2026-06-15 5:00 ` Baolu Lu
2026-06-17 7:14 ` Tian, Kevin
2026-06-21 1:45 ` Baolu Lu
2026-06-04 5:15 ` [PATCH 5/9] iommu/vt-d: Use dmar_can_force_on() for platform optin Kevin Tian
2026-06-12 13:16 ` Baolu Lu
2026-06-17 7:17 ` Tian, Kevin
2026-06-04 5:15 ` [PATCH 6/9] iommu/vt-d: Call dmar_can_force_on() for tboot optin Kevin Tian
2026-06-12 13:57 ` Baolu Lu
2026-06-17 7:19 ` Tian, Kevin
2026-06-21 1:53 ` Baolu Lu
2026-06-04 5:15 ` Kevin Tian [this message]
2026-06-12 14:16 ` [PATCH 7/9] iommu/vt-d: Remove the 'force_on' variable Baolu Lu
2026-06-17 7:22 ` Tian, Kevin
2026-06-04 5:15 ` [PATCH 8/9] iommu/vt-d: Remove dmar_disabled Kevin Tian
2026-06-12 14:26 ` Baolu Lu
2026-06-17 7:23 ` Tian, Kevin
2026-06-04 5:15 ` [PATCH 9/9] iommu/vt-d: Support the new DMA_REMAP_OPT_OUT flag bit Kevin Tian
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=20260604051540.592925-8-kevin.tian@intel.com \
--to=kevin.tian@intel.com \
--cc=ashok.raj@intel.com \
--cc=asit.k.mallick@intel.com \
--cc=baolu.lu@linux.intel.com \
--cc=chrisw@sous-sol.org \
--cc=iommu@lists.linux.dev \
--cc=jbarnes@virtuousgeek.org \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.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
all inboxes | Powered by JetHome®