diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-08-01 14:46:57 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-08-01 14:46:57 -0400 |
| commit | 9f7cda5ad176c666b27b6b0f36f2daa8860eb18c (patch) | |
| tree | c14c1e5946f18128e088ee5969269f97fb8b9e51 /drivers/iommu/amd_iommu.c | |
| parent | f9b8c53d3a2eac222ae3885319ede420792d3cfe (diff) | |
| parent | 9f86f302ec0e37e84617481c587e11c47a397e3f (diff) | |
| download | linux-rt-9f7cda5ad176c666b27b6b0f36f2daa8860eb18c.tar.gz | |
Merge tag 'v4.9.36' into v4.9-rt
This is the 4.9.36 stable release
Diffstat (limited to 'drivers/iommu/amd_iommu.c')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index baaed0ac274b..22c2a323c00b 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); } } |