github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-24 06:24:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

iommu/vt-d: Remove the 'force_on' variable

Browse Source 
The force_on variable is now redundant - same information captured
by "dmar_policy == DMAR_FORCE_ON". Replace all force_on checks
with dmar_policy_force_on().

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
Kevin Tian 2026-08-05 07:43:05 +08:00 committed by Joerg Roedel
parent 03ff2ad830
commit 124d249e71
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/iommu/intel/iommu.c
View File

@ -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
* (used when kernel is launched w/ TXT)
* Skip forcing iommu on and avoid tboot-related kernel panics during
* initialization when set to 1 (via intel_iommu=tboot_noforce).
*/
static int force_on = 0;
int intel_iommu_tboot_noforce;
#define ROOT_ENTRY_NR (VTD_PAGE_SIZE/sizeof(struct root_entry))
@ -1713,7 +1712,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_policy_force_on())
iommu_disable_protect_mem_regions(iommu);
continue;
}
@ -1805,7 +1804,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_policy_force_on())
iommu_disable_protect_mem_regions(iommu);
continue;
}
@ -1866,7 +1865,7 @@ static void iommu_resume(void *data)
unsigned long flag;
if (init_iommu_hw()) {
if (force_on)
if (dmar_policy_force_on())
panic("tboot: IOMMU setup failed, DMAR can not resume!\n");
else
WARN(1, "IOMMU setup failed, DMAR can not resume!\n");
@ -2134,7 +2133,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_policy_force_on())
iommu_disable_protect_mem_regions(iommu);
return 0;
}
@ -2487,13 +2486,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
@ -2507,8 +2506,6 @@ static int __init platform_optin_force_iommu(void)
/* No concurrent access to dmar_policy at this point. */
dmar_policy = DMAR_FORCE_ON;
dmar_disabled = 0;
return 1;
}
static int __init probe_acpi_namespace_devices(void)
@ -2548,10 +2545,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");
@ -2563,8 +2560,6 @@ static __init int tboot_force_iommu(void)
dmar_policy = DMAR_FORCE_ON;
dmar_disabled = 0;
no_iommu = 0;
return 1;
}
int __init intel_iommu_init(void)
@ -2577,17 +2572,19 @@ 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();
if (!dmar_policy_force_on())
platform_optin_force_iommu();
down_write(&dmar_global_lock);
if (dmar_table_init()) {
if (force_on)
if (dmar_policy_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_policy_force_on())
panic("tboot: Failed to initialize DMAR device scope\n");
goto out_free_dmar;
}
@ -2641,7 +2638,7 @@ int __init intel_iommu_init(void)
ret = init_dmars();
if (ret) {
if (force_on)
if (dmar_policy_force_on())
panic("tboot: Failed to initialize DMARs\n");
pr_err("Initialization failed\n");
goto out_free_dmar;

5
drivers/iommu/intel/iommu.h
View File

@ -1394,6 +1394,11 @@ static inline bool dmar_policy_off(void)
return dmar_policy < 0;
}
static inline bool dmar_policy_force_on(void)
{
return dmar_policy == DMAR_FORCE_ON;
}
bool dmar_can_force_on(enum dmar_force_on force_on);
extern int dmar_disabled;