Commit 27ab862a authored by Linus Torvalds's avatar Linus Torvalds

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
parents 4adc6b93 84a21dbd
...@@ -514,7 +514,7 @@ int tboot_force_iommu(void) ...@@ -514,7 +514,7 @@ int tboot_force_iommu(void)
if (!tboot_enabled()) if (!tboot_enabled())
return 0; return 0;
if (!intel_iommu_tboot_noforce) if (intel_iommu_tboot_noforce)
return 1; return 1;
if (no_iommu || swiotlb || dmar_disabled) if (no_iommu || swiotlb || dmar_disabled)
......
...@@ -3879,11 +3879,9 @@ static void irte_ga_prepare(void *entry, ...@@ -3879,11 +3879,9 @@ static void irte_ga_prepare(void *entry,
u8 vector, u32 dest_apicid, int devid) u8 vector, u32 dest_apicid, int devid)
{ {
struct irte_ga *irte = (struct irte_ga *) entry; struct irte_ga *irte = (struct irte_ga *) entry;
struct iommu_dev_data *dev_data = search_dev_data(devid);
irte->lo.val = 0; irte->lo.val = 0;
irte->hi.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.int_type = delivery_mode;
irte->lo.fields_remap.dm = dest_mode; irte->lo.fields_remap.dm = dest_mode;
irte->hi.fields.vector = vector; irte->hi.fields.vector = vector;
...@@ -3939,10 +3937,10 @@ static void irte_ga_set_affinity(void *entry, u16 devid, u16 index, ...@@ -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 irte_ga *irte = (struct irte_ga *) entry;
struct iommu_dev_data *dev_data = search_dev_data(devid); 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->hi.fields.vector = vector;
irte->lo.fields_remap.destination = dest_apicid; irte->lo.fields_remap.destination = dest_apicid;
irte->lo.fields_remap.guest_mode = 0;
modify_irte_ga(devid, index, irte, NULL); modify_irte_ga(devid, index, irte, NULL);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment