redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

intel-iommu: Remove last use of PHYSICAL_PAGE_MASK, for reserving PCI BARs

Browse source 
This is fairly broken anyway -- it doesn't take hotplug into account.
We should probably be checking page_is_ram() instead.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2009-06-28 16:00:42 +01:00
parent 03d6a2461a
commit 1a4a45516d
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/pci/intel-iommu.c
View file

@ -62,9 +62,6 @@
#define DMA_32BIT_PFN IOVA_PFN(DMA_BIT_MASK(32)) #define DMA_32BIT_PFN IOVA_PFN(DMA_BIT_MASK(32))
#define DMA_64BIT_PFN IOVA_PFN(DMA_BIT_MASK(64)) #define DMA_64BIT_PFN IOVA_PFN(DMA_BIT_MASK(64))
#ifndef PHYSICAL_PAGE_MASK
#define PHYSICAL_PAGE_MASK PAGE_MASK
#endif
/* VT-d pages must always be _smaller_ than MM pages. Otherwise things /* VT-d pages must always be _smaller_ than MM pages. Otherwise things
are never going to work. */ are never going to work. */
@ -1307,7 +1304,6 @@ static void dmar_init_reserved_ranges(void)
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
struct iova *iova; struct iova *iova;
int i; int i;
u64 addr, size;
init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN); init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
@ -1330,12 +1326,9 @@ static void dmar_init_reserved_ranges(void)
r = &pdev->resource[i]; r = &pdev->resource[i];
if (!r->flags || !(r->flags & IORESOURCE_MEM)) if (!r->flags || !(r->flags & IORESOURCE_MEM))
continue; continue;
addr = r->start; iova = reserve_iova(&reserved_iova_list,
addr &= PHYSICAL_PAGE_MASK; IOVA_PFN(r->start),
size = r->end - addr; IOVA_PFN(r->end));
size = PAGE_ALIGN(size);
iova = reserve_iova(&reserved_iova_list, IOVA_PFN(addr),
IOVA_PFN(size + addr) - 1);
if (!iova) if (!iova)
printk(KERN_ERR "Reserve iova failed\n"); printk(KERN_ERR "Reserve iova failed\n");
} }