diff options
| author | Jerry Snitselaar <jsnitsel@redhat.com> | 2019-12-10 11:56:06 -0700 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-12-17 11:45:17 +0100 |
| commit | d360211524bece6db9920f32c91808235290b51c (patch) | |
| tree | 8316f7c786af466a4b0b45d76b3bf59390c28108 | |
| parent | 75d18385394f56db76845d91a192532aba421875 (diff) | |
| download | linux-stable-d360211524bece6db9920f32c91808235290b51c.tar.gz linux-stable-d360211524bece6db9920f32c91808235290b51c.tar.bz2 linux-stable-d360211524bece6db9920f32c91808235290b51c.zip | |
iommu: set group default domain before creating direct mappings
iommu_group_create_direct_mappings uses group->default_domain, but
right after it is called, request_default_domain_for_dev calls
iommu_domain_free for the default domain, and sets the group default
domain to a different domain. Move the
iommu_group_create_direct_mappings call to after the group default
domain is set, so the direct mappings get associated with that domain.
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Lu Baolu <baolu.lu@linux.intel.com>
Cc: iommu@lists.linux-foundation.org
Cc: stable@vger.kernel.org
Fixes: 7423e01741dd ("iommu: Add API to request DMA domain for device")
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
| -rw-r--r-- | drivers/iommu/iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index db7bfd4f2d20..fa908179b80b 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2282,13 +2282,13 @@ request_default_domain_for_dev(struct device *dev, unsigned long type) goto out; } - iommu_group_create_direct_mappings(group, dev); - /* Make the domain the default for this group */ if (group->default_domain) iommu_domain_free(group->default_domain); group->default_domain = domain; + iommu_group_create_direct_mappings(group, dev); + dev_info(dev, "Using iommu %s mapping\n", type == IOMMU_DOMAIN_DMA ? "dma" : "direct"); |