Skip to content

Commit

Permalink
Add global iommu list
Browse files Browse the repository at this point in the history
Signed-off-by: Weidong Han <weidong.han@intel.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
  • Loading branch information
Weidong Han authored and Joerg Roedel committed Jan 3, 2009
1 parent 3b5410e commit d9630fe
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions drivers/pci/intel-iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
#define DMA_32BIT_PFN IOVA_PFN(DMA_32BIT_MASK)
#define DMA_64BIT_PFN IOVA_PFN(DMA_64BIT_MASK)

/* global iommu list, set NULL for ignored DMAR units */
static struct intel_iommu **g_iommus;

/*
* 0: Present
* 1-11: Reserved
Expand Down Expand Up @@ -1153,6 +1156,17 @@ void free_dmar_iommu(struct intel_iommu *iommu)
kfree(iommu->domains);
kfree(iommu->domain_ids);

g_iommus[iommu->seq_id] = NULL;

/* if all iommus are freed, free g_iommus */
for (i = 0; i < g_num_of_iommus; i++) {
if (g_iommus[i])
break;
}

if (i == g_num_of_iommus)
kfree(g_iommus);

/* free context mapping */
free_context_table(iommu);
}
Expand Down Expand Up @@ -1794,9 +1808,18 @@ static int __init init_dmars(void)
*/
}

g_iommus = kcalloc(g_num_of_iommus, sizeof(struct intel_iommu *),
GFP_KERNEL);
if (!g_iommus) {
printk(KERN_ERR "Allocating global iommu array failed\n");
ret = -ENOMEM;
goto error;
}

deferred_flush = kzalloc(g_num_of_iommus *
sizeof(struct deferred_flush_tables), GFP_KERNEL);
if (!deferred_flush) {
kfree(g_iommus);
ret = -ENOMEM;
goto error;
}
Expand All @@ -1806,6 +1829,7 @@ static int __init init_dmars(void)
continue;

iommu = drhd->iommu;
g_iommus[iommu->seq_id] = iommu;

ret = iommu_init_domains(iommu);
if (ret)
Expand Down Expand Up @@ -1918,6 +1942,7 @@ static int __init init_dmars(void)
iommu = drhd->iommu;
free_iommu(iommu);
}
kfree(g_iommus);
return ret;
}

Expand Down

0 comments on commit d9630fe

Please sign in to comment.