2019-08-26 04:49:49

by Tom Murphy

Subject: [PATCH] Remove wrong default domain comments

These comments are wrong. request_default_domain_for_dev doesn't just
handle direct mapped domains.

Signed-off-by: Tom Murphy <[email protected]>
---
drivers/iommu/iommu.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index ea95080372e7..3b6807e7a2d8 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -2179,7 +2179,6 @@ request_default_domain_for_dev(struct device *dev, unsigned long type)

mutex_lock(&group->mutex);

- /* Check if the default domain is already direct mapped */
ret = 0;
if (group->default_domain && group->default_domain->type == type)
goto out;
@@ -2189,7 +2188,6 @@ request_default_domain_for_dev(struct device *dev, unsigned long type)
if (iommu_group_device_count(group) != 1)
goto out;

- /* Allocate a direct mapped domain */
ret = -ENOMEM;
domain = __iommu_domain_alloc(dev->bus, type);
if (!domain)
@@ -2204,7 +2202,7 @@ request_default_domain_for_dev(struct device *dev, unsigned long type)

iommu_group_create_direct_mappings(group, dev);

- /* Make the direct mapped domain the default for this group */
+ /* Make the domain the default for this group */
if (group->default_domain)
iommu_domain_free(group->default_domain);
group->default_domain = domain;
--
2.20.1

2019-08-30 14:34:45

by Joerg Roedel

Subject: Re: [PATCH] Remove wrong default domain comments

On Mon, Aug 26, 2019 at 05:48:21AM +0100, Tom Murphy wrote:
> drivers/iommu/iommu.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)

Applied, thanks.