diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-07-15 14:21:45 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-07-15 14:21:45 +0200 |
| commit | d7f913b8de206464f2a18e4c6d20886d32483de3 (patch) | |
| tree | f3cf84f02bbd2f7685f12ea967afa141dce13f23 /xen/include/asm-x86 | |
| parent | 99321e0e6cf818adcb56db23779605aaab016cc5 (diff) | |
| download | xen-d7f913b8de206464f2a18e4c6d20886d32483de3.tar.gz xen-d7f913b8de206464f2a18e4c6d20886d32483de3.tar.bz2 xen-d7f913b8de206464f2a18e4c6d20886d32483de3.zip | |
AMD IOMMU: use ioremap()
There's no point in using the fixmap here, and it gets
map_iommu_mmio_region() in line with unmap_iommu_mmio_region(), which
was already using iounmap() (thus crashing if actually used).
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Diffstat (limited to 'xen/include/asm-x86')
| -rw-r--r-- | xen/include/asm-x86/fixmap.h | 2 | ||||
| -rw-r--r-- | xen/include/asm-x86/hvm/svm/amd-iommu-defs.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 9ef3f980dd..029dc3ef26 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -60,8 +60,6 @@ enum fixed_addresses { FIX_KEXEC_BASE_0, FIX_KEXEC_BASE_END = FIX_KEXEC_BASE_0 \ + ((KEXEC_XEN_NO_PAGES >> 1) * KEXEC_IMAGE_NR) - 1, - FIX_IOMMU_MMIO_BASE_0, - FIX_IOMMU_MMIO_END = FIX_IOMMU_MMIO_BASE_0 + IOMMU_PAGES -1, FIX_TBOOT_SHARED_BASE, FIX_MSIX_IO_RESERV_BASE, FIX_MSIX_IO_RESERV_END = FIX_MSIX_IO_RESERV_BASE + FIX_MSIX_MAX_PAGES -1, diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h index a88d9826fc..ab842ef69f 100644 --- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h @@ -464,10 +464,7 @@ #define IOMMU_CONTROL_DISABLED 0 #define IOMMU_CONTROL_ENABLED 1 -#define MMIO_PAGES_PER_IOMMU (IOMMU_MMIO_REGION_LENGTH / PAGE_SIZE_4K) -#define IOMMU_PAGES (MMIO_PAGES_PER_IOMMU * MAX_AMD_IOMMUS) #define DEFAULT_DOMAIN_ADDRESS_WIDTH 48 -#define MAX_AMD_IOMMUS 32 /* interrupt remapping table */ #define INT_REMAP_INDEX_DM_MASK 0x1C00 |