diff options
Diffstat (limited to 'meta-snowyowl/recipes-kernel/linux/files/0187-iommu-amd-Fix-interrupt-remapping-when-disable-guest.patch')
-rwxr-xr-x | meta-snowyowl/recipes-kernel/linux/files/0187-iommu-amd-Fix-interrupt-remapping-when-disable-guest.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/meta-snowyowl/recipes-kernel/linux/files/0187-iommu-amd-Fix-interrupt-remapping-when-disable-guest.patch b/meta-snowyowl/recipes-kernel/linux/files/0187-iommu-amd-Fix-interrupt-remapping-when-disable-guest.patch new file mode 100755 index 00000000..0afa767f --- /dev/null +++ b/meta-snowyowl/recipes-kernel/linux/files/0187-iommu-amd-Fix-interrupt-remapping-when-disable-guest.patch @@ -0,0 +1,59 @@ +From 59a13724c78977c316184ee4efbf00e82f70fe50 Mon Sep 17 00:00:00 2001 +From: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> +Date: Mon, 26 Jun 2017 04:28:04 -0500 +Subject: [PATCH 040/331] iommu/amd: Fix interrupt remapping when disable + guest_mode + +commit 84a21dbdef0b96d773599c33c2afbb002198d303 upstream. + +Pass-through devices to VM guest can get updated IRQ affinity +information via irq_set_affinity() when not running in guest mode. +Currently, AMD IOMMU driver in GA mode ignores the updated information +if the pass-through device is setup to use vAPIC regardless of guest_mode. +This could cause invalid interrupt remapping. + +Also, the guest_mode bit should be set and cleared only when +SVM updates posted-interrupt interrupt remapping information. + +Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> +Cc: Joerg Roedel <jroedel@suse.de> +Fixes: d98de49a53e48 ('iommu/amd: Enable vAPIC interrupt remapping mode by default') +Signed-off-by: Joerg Roedel <jroedel@suse.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com> +--- + drivers/iommu/amd_iommu.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c +index 11a13b5..41800b6 100644 +--- a/drivers/iommu/amd_iommu.c ++++ b/drivers/iommu/amd_iommu.c +@@ -3857,11 +3857,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; +@@ -3917,10 +3915,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); + } + } +-- +2.7.4 + |