UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iommu/vt-d: Unnecessary to handle default identity domain 

The iommu default domain framework has been designed to take
care of setting identity default domain type. It's unnecessary
to handle this again in the VT-d driver. Hence, remove it.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Lu Baolu 2020-01-15 11:03:59 +08:00 committed by Joerg Roedel
parent 9235cb13d7
commit b89b6605b8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/iommu/intel-iommu.c
View File

@ -387,7 +387,6 @@ static int intel_iommu_superpage = 1;
static int iommu_identity_mapping; static int iommu_identity_mapping;
static int intel_no_bounce; static int intel_no_bounce;
#define IDENTMAP_ALL 1
#define IDENTMAP_GFX 2 #define IDENTMAP_GFX 2
#define IDENTMAP_AZALIA 4 #define IDENTMAP_AZALIA 4
@ -3079,8 +3078,7 @@ static int device_def_domain_type(struct device *dev)
return IOMMU_DOMAIN_DMA; return IOMMU_DOMAIN_DMA;
} }
return (iommu_identity_mapping & IDENTMAP_ALL) ? return 0;
IOMMU_DOMAIN_IDENTITY : 0;
} }
static void intel_iommu_init_qi(struct intel_iommu *iommu) static void intel_iommu_init_qi(struct intel_iommu *iommu)
@ -3424,9 +3422,6 @@ static int __init init_dmars(void)
iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH); iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
} }
if (iommu_default_passthrough())
iommu_identity_mapping |= IDENTMAP_ALL;
#ifdef CONFIG_INTEL_IOMMU_BROKEN_GFX_WA #ifdef CONFIG_INTEL_IOMMU_BROKEN_GFX_WA
dmar_map_gfx = 0; dmar_map_gfx = 0;
#endif #endif
@ -5038,7 +5033,7 @@ static int __init platform_optin_force_iommu(void)
* map for all devices except those marked as being untrusted. * map for all devices except those marked as being untrusted.
*/ */
if (dmar_disabled) if (dmar_disabled)
iommu_identity_mapping |= IDENTMAP_ALL; iommu_set_default_passthrough(false);
dmar_disabled = 0; dmar_disabled = 0;
no_iommu = 0; no_iommu = 0;