Merge tag 'iommu-fixes-v4.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel:
 "Two fixes:

   - A fix for AMD IOMMU interrupt remapping code when IRQs are
     forwarded directly to KVM guests

   - Fixed check in the recently merged code to allow tboot with
     Intel VT-d disabled"

* tag 'iommu-fixes-v4.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Fix interrupt remapping when disable guest_mode
  iommu/vt-d: Correctly disable Intel IOMMU force on

2 files changed, 3 insertions, 5 deletions

diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index 4b1724059909..a4eb27918ceb 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -514,7 +514,7 @@ int tboot_force_iommu(void)
         if (!tboot_enabled())
                 return 0;
 
-        if (!intel_iommu_tboot_noforce)
+        if (intel_iommu_tboot_noforce)
                 return 1;
 
         if (no_iommu || swiotlb || dmar_disabled)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 63cacf5d6cf2..0f1219fa8561 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3879,11 +3879,9 @@ static void irte_ga_prepare(void *entry,
                             u8 vector, u32 dest_apicid, int devid)
 {
         struct irte_ga *irte = (struct irte_ga *) entry;
-        struct iommu_dev_data *dev_data = search_dev_data(devid);
 
         irte->lo.val                      = 0;
         irte->hi.val                      = 0;
-        irte->lo.fields_remap.guest_mode  = dev_data ? dev_data->use_vapic : 0;
         irte->lo.fields_remap.int_type    = delivery_mode;
         irte->lo.fields_remap.dm          = dest_mode;
         irte->hi.fields.vector            = vector;
@@ -3939,10 +3937,10 @@ static void irte_ga_set_affinity(void *entry, u16 devid, u16 index,
         struct irte_ga *irte = (struct irte_ga *) entry;
         struct iommu_dev_data *dev_data = search_dev_data(devid);
 
-        if (!dev_data || !dev_data->use_vapic) {
+        if (!dev_data || !dev_data->use_vapic ||
+            !irte->lo.fields_remap.guest_mode) {
                 irte->hi.fields.vector = vector;
                 irte->lo.fields_remap.destination = dest_apicid;
-                irte->lo.fields_remap.guest_mode = 0;
                 modify_irte_ga(devid, index, irte, NULL);
         }
 }