Commit b8205942 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller

sparc/iommu: pass a physical address to iommu_get_one

No need for the page structure, just the paddr / pfn.  This is
going to simplify fixes to the callers.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff5cbec0
...@@ -175,16 +175,17 @@ static void iommu_flush_iotlb(iopte_t *iopte, unsigned int niopte) ...@@ -175,16 +175,17 @@ static void iommu_flush_iotlb(iopte_t *iopte, unsigned int niopte)
} }
} }
static u32 iommu_get_one(struct device *dev, struct page *page, int npages) static u32 iommu_get_one(struct device *dev, phys_addr_t paddr, int npages)
{ {
struct iommu_struct *iommu = dev->archdata.iommu; struct iommu_struct *iommu = dev->archdata.iommu;
int ioptex; int ioptex;
iopte_t *iopte, *iopte0; iopte_t *iopte, *iopte0;
unsigned int busa, busa0; unsigned int busa, busa0;
unsigned long pfn = __phys_to_pfn(paddr);
int i; int i;
/* page color = pfn of page */ /* page color = pfn of page */
ioptex = bit_map_string_get(&iommu->usemap, npages, page_to_pfn(page)); ioptex = bit_map_string_get(&iommu->usemap, npages, pfn);
if (ioptex < 0) if (ioptex < 0)
panic("iommu out"); panic("iommu out");
busa0 = iommu->start + (ioptex << PAGE_SHIFT); busa0 = iommu->start + (ioptex << PAGE_SHIFT);
...@@ -193,11 +194,11 @@ static u32 iommu_get_one(struct device *dev, struct page *page, int npages) ...@@ -193,11 +194,11 @@ static u32 iommu_get_one(struct device *dev, struct page *page, int npages)
busa = busa0; busa = busa0;
iopte = iopte0; iopte = iopte0;
for (i = 0; i < npages; i++) { for (i = 0; i < npages; i++) {
iopte_val(*iopte) = MKIOPTE(page_to_pfn(page), IOPERM); iopte_val(*iopte) = MKIOPTE(pfn, IOPERM);
iommu_invalidate_page(iommu->regs, busa); iommu_invalidate_page(iommu->regs, busa);
busa += PAGE_SIZE; busa += PAGE_SIZE;
iopte++; iopte++;
page++; pfn++;
} }
iommu_flush_iotlb(iopte0, npages); iommu_flush_iotlb(iopte0, npages);
...@@ -215,7 +216,7 @@ static dma_addr_t __sbus_iommu_map_page(struct device *dev, struct page *page, ...@@ -215,7 +216,7 @@ static dma_addr_t __sbus_iommu_map_page(struct device *dev, struct page *page,
/* XXX So what is maxphys for us and how do drivers know it? */ /* XXX So what is maxphys for us and how do drivers know it? */
if (!len || len > 256 * 1024) if (!len || len > 256 * 1024)
return DMA_MAPPING_ERROR; return DMA_MAPPING_ERROR;
return iommu_get_one(dev, virt_to_page(vaddr), npages) + off; return iommu_get_one(dev, virt_to_phys(vaddr), npages) + off;
} }
static dma_addr_t sbus_iommu_map_page_gflush(struct device *dev, static dma_addr_t sbus_iommu_map_page_gflush(struct device *dev,
...@@ -268,7 +269,7 @@ static int __sbus_iommu_map_sg(struct device *dev, struct scatterlist *sgl, ...@@ -268,7 +269,7 @@ static int __sbus_iommu_map_sg(struct device *dev, struct scatterlist *sgl,
} }
} }
sg->dma_address = iommu_get_one(dev, sg_page(sg), n) + sg->offset; sg->dma_address = iommu_get_one(dev, sg_phys(sg), n) + sg->offset;
sg->dma_length = sg->length; sg->dma_length = sg->length;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment