diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2011-07-06 17:14:44 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-07-06 17:14:44 +0200 |
| commit | 17f5b569e09cfa3488eaa663cbf9feada2e789f5 (patch) | |
| tree | 94442ee8d5132bb679cb144d5a47ea8cb0f2ffb6 /drivers/iommu | |
| parent | 801019d59d4e1d1523e5897949fd3b6843571bd0 (diff) | |
| download | kernel_samsung_smdk4412-17f5b569e09cfa3488eaa663cbf9feada2e789f5.zip kernel_samsung_smdk4412-17f5b569e09cfa3488eaa663cbf9feada2e789f5.tar.gz kernel_samsung_smdk4412-17f5b569e09cfa3488eaa663cbf9feada2e789f5.tar.bz2 | |
iommu/amd: Don't use MSI address range for DMA addresses
Reserve the MSI address range in the address allocator so
that MSI addresses are not handed out as dma handles.
Cc: stable@kernel.org
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 748eab0..a14f8dc 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -28,6 +28,7 @@ #include <linux/iommu.h> #include <linux/delay.h> #include <linux/amd-iommu.h> +#include <asm/msidef.h> #include <asm/proto.h> #include <asm/iommu.h> #include <asm/gart.h> @@ -1202,7 +1203,7 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom, { int index = dma_dom->aperture_size >> APERTURE_RANGE_SHIFT; struct amd_iommu *iommu; - unsigned long i; + unsigned long i, old_size; #ifdef CONFIG_IOMMU_STRESS populate = false; @@ -1238,8 +1239,21 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom, } } + old_size = dma_dom->aperture_size; dma_dom->aperture_size += APERTURE_RANGE_SIZE; + /* Reserve address range used for MSI messages */ + if (old_size < MSI_ADDR_BASE_LO && + dma_dom->aperture_size > MSI_ADDR_BASE_LO) { + unsigned long spage; + int pages; + + pages = iommu_num_pages(MSI_ADDR_BASE_LO, 0x10000, PAGE_SIZE); + spage = MSI_ADDR_BASE_LO >> PAGE_SHIFT; + + dma_ops_reserve_addresses(dma_dom, spage, pages); + } + /* Initialize the exclusion range if necessary */ for_each_iommu(iommu) { if (iommu->exclusion_start && |