Commit f25b23bc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

sparc/iommu: merge iommu_release_one and sbus_iommu_unmap_page 



There is only one caller of iommu_release_one left, so merge it into
that one to clean things up a bit.

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 a7fce1f7

arch/sparc/mm/iommu.c

+7 −14
Original line number Diff line number Diff line
@@ -291,14 +291,17 @@ static int sbus_iommu_map_sg_pflush(struct device *dev, struct scatterlist *sgl, 
	return nents;

}



static void iommu_release_one(struct device *dev, u32 busa, int npages)

static void sbus_iommu_unmap_page(struct device *dev, dma_addr_t dma_addr,

		size_t len, enum dma_data_direction dir, unsigned long attrs)

{

	struct iommu_struct *iommu = dev->archdata.iommu;

	int ioptex;

	int i;

	unsigned int busa = dma_addr & PAGE_MASK;

	unsigned long off = dma_addr & ~PAGE_MASK;

	unsigned int npages = (off + len + PAGE_SIZE-1) >> PAGE_SHIFT;

	unsigned int ioptex = (busa - iommu->start) >> PAGE_SHIFT;

	unsigned int i;



	BUG_ON(busa < iommu->start);

	ioptex = (busa - iommu->start) >> PAGE_SHIFT;

	for (i = 0; i < npages; i++) {

		iopte_val(iommu->page_table[ioptex + i]) = 0;

		iommu_invalidate_page(iommu->regs, busa);
@@ -307,16 +310,6 @@ static void iommu_release_one(struct device *dev, u32 busa, int npages) 
	bit_map_clear(&iommu->usemap, ioptex, npages);

}



static void sbus_iommu_unmap_page(struct device *dev, dma_addr_t dma_addr,

		size_t len, enum dma_data_direction dir, unsigned long attrs)

{

	unsigned long off = dma_addr & ~PAGE_MASK;

	int npages;



	npages = (off + len + PAGE_SIZE-1) >> PAGE_SHIFT;

	iommu_release_one(dev, dma_addr & PAGE_MASK, npages);

}



static void sbus_iommu_unmap_sg(struct device *dev, struct scatterlist *sgl,

		int nents, enum dma_data_direction dir, unsigned long attrs)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE