iommu/amd: Allocate iova_domain for dma_ops_domain
Use it later for allocating the IO virtual addresses.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index b938a4a..e7825b25 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -39,6 +39,7 @@
#include <linux/dma-contiguous.h>
#include <linux/irqdomain.h>
#include <linux/percpu.h>
+#include <linux/iova.h>
#include <asm/irq_remapping.h>
#include <asm/io_apic.h>
#include <asm/apic.h>
@@ -57,6 +58,11 @@
#define LOOP_TIMEOUT 100000
+/* IO virtual address start page frame number */
+#define IOVA_START_PFN (1)
+#define IOVA_PFN(addr) ((addr) >> PAGE_SHIFT)
+#define DMA_32BIT_PFN IOVA_PFN(DMA_BIT_MASK(32))
+
/*
* This bitmap is used to advertise the page sizes our hardware support
* to the IOMMU core, which will then use this information to split
@@ -158,6 +164,9 @@
/* address space relevant data */
struct aperture_range *aperture[APERTURE_MAX_RANGES];
+
+ /* IOVA RB-Tree */
+ struct iova_domain iovad;
};
/****************************************************************************
@@ -1969,6 +1978,8 @@
if (!dom)
return;
+ put_iova_domain(&dom->iovad);
+
free_percpu(dom->next_index);
del_domain_from_list(&dom->domain);
@@ -2044,6 +2055,9 @@
for_each_possible_cpu(cpu)
*per_cpu_ptr(dma_dom->next_index, cpu) = 0;
+ init_iova_domain(&dma_dom->iovad, PAGE_SIZE,
+ IOVA_START_PFN, DMA_32BIT_PFN);
+
return dma_dom;
free_dma_dom:
@@ -2951,7 +2965,11 @@
int __init amd_iommu_init_api(void)
{
- int err = 0;
+ int ret, err = 0;
+
+ ret = iova_cache_get();
+ if (ret)
+ return ret;
err = bus_set_iommu(&pci_bus_type, &amd_iommu_ops);
if (err)