Intel and AMD IOMMU drivers both reserve the x86 architectural MSI address window from normal IOVA mappings. Define the range in the common x86 IOMMU header and use it in both drivers.
Signed-off-by: Yu Zhang <[email protected]> --- arch/x86/include/asm/iommu.h | 3 +++ drivers/iommu/amd/iommu.c | 7 +++---- drivers/iommu/intel/iommu.c | 7 +++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h index 3be2451e7bc8..386db10ea909 100644 --- a/arch/x86/include/asm/iommu.h +++ b/arch/x86/include/asm/iommu.h @@ -6,6 +6,9 @@ #include <asm/e820/api.h> +#define X86_IOMMU_MSI_RANGE_START 0xfee00000 +#define X86_IOMMU_MSI_RANGE_END 0xfeefffff + extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_merge; diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 29dc18d3d22e..ead96acdb766 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -50,8 +50,6 @@ #define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28)) /* Reserved IOVA ranges */ -#define MSI_RANGE_START (0xfee00000) -#define MSI_RANGE_END (0xfeefffff) #define HT_RANGE_START (0xfd00000000ULL) #define HT_RANGE_END (0xffffffffffULL) @@ -3097,8 +3095,9 @@ static void amd_iommu_get_resv_regions(struct device *dev, list_add_tail(®ion->list, head); } - region = iommu_alloc_resv_region(MSI_RANGE_START, - MSI_RANGE_END - MSI_RANGE_START + 1, + region = iommu_alloc_resv_region(X86_IOMMU_MSI_RANGE_START, + X86_IOMMU_MSI_RANGE_END - + X86_IOMMU_MSI_RANGE_START + 1, 0, IOMMU_RESV_MSI, GFP_KERNEL); if (!region) return; diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 849d06dfe1ae..500f6fa5bf72 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -39,8 +39,6 @@ #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA) #define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e) -#define IOAPIC_RANGE_START (0xfee00000) -#define IOAPIC_RANGE_END (0xfeefffff) #define IOVA_START_ADDR (0x1000) #define DEFAULT_DOMAIN_ADDRESS_WIDTH 57 @@ -3432,8 +3430,9 @@ static void intel_iommu_get_resv_regions(struct device *device, } #endif /* CONFIG_INTEL_IOMMU_FLOPPY_WA */ - reg = iommu_alloc_resv_region(IOAPIC_RANGE_START, - IOAPIC_RANGE_END - IOAPIC_RANGE_START + 1, + reg = iommu_alloc_resv_region(X86_IOMMU_MSI_RANGE_START, + X86_IOMMU_MSI_RANGE_END - + X86_IOMMU_MSI_RANGE_START + 1, 0, IOMMU_RESV_MSI, GFP_KERNEL); if (!reg) return; -- 2.52.0
