]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
iommu/vt-d: Simplify check in identity_mapping()
authorJoerg Roedel <jroedel@suse.de>
Mon, 17 Feb 2020 16:29:55 +0000 (17:29 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Feb 2020 16:23:26 +0000 (17:23 +0100)
commit 1ddb32da4a629fa7f87873d0b6836c2e1feb7518 upstream.

The function only has one call-site and there it is never called with
dummy or deferred devices. Simplify the check in the function to
account for that.

Fixes: 1ee0186b9a12 ("iommu/vt-d: Refactor find_domain() helper")
Cc: stable@vger.kernel.org # v5.5
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iommu/intel-iommu.c

index 820d2fd48abc3e388caa3a2a96d66fa70005a17f..e7fc9e928788c65caec3768de37ae391c47a79be 100644 (file)
@@ -2799,7 +2799,7 @@ static int identity_mapping(struct device *dev)
        struct device_domain_info *info;
 
        info = dev->archdata.iommu;
-       if (info && info != DUMMY_DEVICE_DOMAIN_INFO && info != DEFER_DEVICE_DOMAIN_INFO)
+       if (info)
                return (info->domain == si_domain);
 
        return 0;