summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2015-06-12 15:06:26 +0200
committerJoerg Roedel <jroedel@suse.de>2015-06-16 10:59:36 +0200
commit7c3c9876d98a76b97d16c0f46cb108e95542b212 (patch)
treeec8a45ab84bc253a3d19ef9cc65d860c636f1b74 /drivers/iommu
parentaf3b358e48115588d905cc07a47b3f356e0d01d1 (diff)
downloadop-kernel-dev-7c3c9876d98a76b97d16c0f46cb108e95542b212.zip
op-kernel-dev-7c3c9876d98a76b97d16c0f46cb108e95542b212.tar.gz
iommu/vt-d: Make sure copied over IR entries are not reused
Walk over the copied entries and mark the present ones as allocated. Tested-by: ZhenHua Li <zhen-hual@hp.com> Tested-by: Baoquan He <bhe@redhat.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/intel_irq_remapping.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 2a90121..14e10de 100644
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -451,6 +451,7 @@ static int iommu_load_old_irte(struct intel_iommu *iommu)
{
struct irte *old_ir_table;
phys_addr_t irt_phys;
+ unsigned int i;
size_t size;
u64 irta;
@@ -481,6 +482,15 @@ static int iommu_load_old_irte(struct intel_iommu *iommu)
__iommu_flush_cache(iommu, iommu->ir_table->base, size);
+ /*
+ * Now check the table for used entries and mark those as
+ * allocated in the bitmap
+ */
+ for (i = 0; i < INTR_REMAP_TABLE_ENTRIES; i++) {
+ if (iommu->ir_table->base[i].present)
+ bitmap_set(iommu->ir_table->bitmap, i, 1);
+ }
+
return 0;
}
OpenPOWER on IntegriCloud