diff options
| author | Will Deacon <will@kernel.org> | 2020-12-08 14:56:53 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-12-08 14:56:53 +0000 |
| commit | 33f974dbaabf1cbe5cb6996bf3f6e395519c15fe (patch) | |
| tree | f005f98d2ffe060e9fe98d2d720f06cb4fef1cd1 /drivers/iommu/intel/iommu.c | |
| parent | 75c75adce44f59e6878117d47ad63682c5e5ff87 (diff) | |
| parent | 62c9917d9c1041ba175ccf1bc4c010efc0188a2e (diff) | |
Merge branch 'for-next/iommu/default-domains' into for-next/iommu/core
Support for changing the default domain type for singleton IOMMU groups
via sysfs when the constituent device is not already bound to a device
driver.
* for-next/iommu/default-domains:
iommu: Fix htmldocs warnings in sysfs-kernel-iommu_groups
iommu: Document usage of "/sys/kernel/iommu_groups/<grp_id>/type" file
iommu: Take lock before reading iommu group default domain type
iommu: Add support to change default domain of an iommu group
iommu: Move def_domain type check for untrusted device into core
Diffstat (limited to 'drivers/iommu/intel/iommu.c')
| -rw-r--r-- | drivers/iommu/intel/iommu.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 1b1ca63e6bbe..83674e32e58b 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -2916,13 +2916,6 @@ static int device_def_domain_type(struct device *dev) if (dev_is_pci(dev)) { struct pci_dev *pdev = to_pci_dev(dev); - /* - * Prevent any device marked as untrusted from getting - * placed into the statically identity mapping domain. - */ - if (pdev->untrusted) - return IOMMU_DOMAIN_DMA; - if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev)) return IOMMU_DOMAIN_IDENTITY; |