diff options
Diffstat (limited to 'drivers/pci/intel-iommu.c')
-rw-r--r-- | drivers/pci/intel-iommu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 09dc98b84553..fb3a3f3fca7a 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
@@ -56,7 +56,7 @@ | |||
56 | #define DOMAIN_MAX_ADDR(gaw) ((((u64)1) << gaw) - 1) | 56 | #define DOMAIN_MAX_ADDR(gaw) ((((u64)1) << gaw) - 1) |
57 | 57 | ||
58 | #define IOVA_PFN(addr) ((addr) >> PAGE_SHIFT) | 58 | #define IOVA_PFN(addr) ((addr) >> PAGE_SHIFT) |
59 | #define DMA_32BIT_PFN IOVA_PFN(DMA_32BIT_MASK) | 59 | #define DMA_32BIT_PFN IOVA_PFN(DMA_BIT_MASK(32)) |
60 | #define DMA_64BIT_PFN IOVA_PFN(DMA_BIT_MASK(64)) | 60 | #define DMA_64BIT_PFN IOVA_PFN(DMA_BIT_MASK(64)) |
61 | 61 | ||
62 | /* global iommu list, set NULL for ignored DMAR units */ | 62 | /* global iommu list, set NULL for ignored DMAR units */ |
@@ -2080,15 +2080,15 @@ __intel_alloc_iova(struct device *dev, struct dmar_domain *domain, | |||
2080 | struct pci_dev *pdev = to_pci_dev(dev); | 2080 | struct pci_dev *pdev = to_pci_dev(dev); |
2081 | struct iova *iova = NULL; | 2081 | struct iova *iova = NULL; |
2082 | 2082 | ||
2083 | if (dma_mask <= DMA_32BIT_MASK || dmar_forcedac) | 2083 | if (dma_mask <= DMA_BIT_MASK(32) || dmar_forcedac) |
2084 | iova = iommu_alloc_iova(domain, size, dma_mask); | 2084 | iova = iommu_alloc_iova(domain, size, dma_mask); |
2085 | else { | 2085 | else { |
2086 | /* | 2086 | /* |
2087 | * First try to allocate an io virtual address in | 2087 | * First try to allocate an io virtual address in |
2088 | * DMA_32BIT_MASK and if that fails then try allocating | 2088 | * DMA_BIT_MASK(32) and if that fails then try allocating |
2089 | * from higher range | 2089 | * from higher range |
2090 | */ | 2090 | */ |
2091 | iova = iommu_alloc_iova(domain, size, DMA_32BIT_MASK); | 2091 | iova = iommu_alloc_iova(domain, size, DMA_BIT_MASK(32)); |
2092 | if (!iova) | 2092 | if (!iova) |
2093 | iova = iommu_alloc_iova(domain, size, dma_mask); | 2093 | iova = iommu_alloc_iova(domain, size, dma_mask); |
2094 | } | 2094 | } |