diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2011-07-06 17:14:44 +0200 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-08-01 13:55:03 -0700 |
| commit | 08b751d515c0f2745b3e3c6bc7ca5a3f2747fe28 (patch) | |
| tree | 1b7a599c36e0fa5772143374d19da7678a088cd0 | |
| parent | dd4e598f13dd3e9c871034dd22ace5977fa4c37a (diff) | |
| download | linux-stable-08b751d515c0f2745b3e3c6bc7ca5a3f2747fe28.tar.gz linux-stable-08b751d515c0f2745b3e3c6bc7ca5a3f2747fe28.tar.bz2 linux-stable-08b751d515c0f2745b3e3c6bc7ca5a3f2747fe28.zip | |
iommu/amd: Don't use MSI address range for DMA addresses
[ upstream commit 17f5b569e09cfa3488eaa663cbf9feada2e789f5 ]
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>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
| -rw-r--r-- | arch/x86/kernel/amd_iommu.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 4424c73ba01e..e26ac4035754 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c @@ -25,6 +25,7 @@ #include <linux/dma-mapping.h> #include <linux/iommu-helper.h> #include <linux/iommu.h> +#include <asm/msidef.h> #include <asm/proto.h> #include <asm/iommu.h> #include <asm/gart.h> @@ -1048,7 +1049,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; @@ -1084,8 +1085,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); + } + /* Intialize the exclusion range if necessary */ for_each_iommu(iommu) { if (iommu->exclusion_start && |