1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 5619f264862d..a27d6cb1a793 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3865,8 +3865,7 @@ static int device_notifier(struct notifier_block *nb,
         if (iommu_dummy(dev))
                 return 0;
 
-        if (action != BUS_NOTIFY_UNBOUND_DRIVER &&
-            action != BUS_NOTIFY_DEL_DEVICE)
+        if (action != BUS_NOTIFY_REMOVED_DEVICE)
                 return 0;
 
         /*
@@ -4415,17 +4414,14 @@ static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain,
         return phys;
 }
 
-static int intel_iommu_domain_has_cap(struct iommu_domain *domain,
-                                      unsigned long cap)
+static bool intel_iommu_capable(enum iommu_cap cap)
 {
-        struct dmar_domain *dmar_domain = domain->priv;
-
         if (cap == IOMMU_CAP_CACHE_COHERENCY)
-                return dmar_domain->iommu_snooping;
+                return domain_update_iommu_snooping(NULL) == 1;
         if (cap == IOMMU_CAP_INTR_REMAP)
-                return irq_remapping_enabled;
+                return irq_remapping_enabled == 1;
 
-        return 0;
+        return false;
 }
 
 static int intel_iommu_add_device(struct device *dev)
@@ -4464,6 +4460,7 @@ static void intel_iommu_remove_device(struct device *dev)
 }
 
 static const struct iommu_ops intel_iommu_ops = {
+        .capable        = intel_iommu_capable,
         .domain_init    = intel_iommu_domain_init,
         .domain_destroy = intel_iommu_domain_destroy,
         .attach_dev     = intel_iommu_attach_device,
@@ -4471,7 +4468,6 @@ static const struct iommu_ops intel_iommu_ops = {
         .map            = intel_iommu_map,
         .unmap          = intel_iommu_unmap,
         .iova_to_phys   = intel_iommu_iova_to_phys,
-        .domain_has_cap = intel_iommu_domain_has_cap,
         .add_device     = intel_iommu_add_device,
         .remove_device  = intel_iommu_remove_device,
         .pgsize_bitmap  = INTEL_IOMMU_PGSIZES,