mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
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: 7423e01741
("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>
This commit is contained in:
parent
75d1838539
commit
d360211524
1 changed files with 2 additions and 2 deletions
|
@ -2282,13 +2282,13 @@ request_default_domain_for_dev(struct device *dev, unsigned long type)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
iommu_group_create_direct_mappings(group, dev);
|
|
||||||
|
|
||||||
/* Make the domain the default for this group */
|
/* Make the domain the default for this group */
|
||||||
if (group->default_domain)
|
if (group->default_domain)
|
||||||
iommu_domain_free(group->default_domain);
|
iommu_domain_free(group->default_domain);
|
||||||
group->default_domain = domain;
|
group->default_domain = domain;
|
||||||
|
|
||||||
|
iommu_group_create_direct_mappings(group, dev);
|
||||||
|
|
||||||
dev_info(dev, "Using iommu %s mapping\n",
|
dev_info(dev, "Using iommu %s mapping\n",
|
||||||
type == IOMMU_DOMAIN_DMA ? "dma" : "direct");
|
type == IOMMU_DOMAIN_DMA ? "dma" : "direct");
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue