aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parisc/sba_iommu.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2008-03-04 17:29:28 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-04 19:35:17 -0500
commit7c8cda625acd9b704100994626fb6d2fb4ffb9c2 (patch)
treef938f445d90db32a634102aabd47521bc00d3d6a /drivers/parisc/sba_iommu.c
parent3715863aa142c4f4c5208f5f3e5e9bac06006d2f (diff)
iommu: parisc: pass struct device to iommu_alloc_range
This adds struct device argument to sba_alloc_range and ccio_alloc_range, a preparation for modifications to fix the IOMMU segment boundary problem. This change enables ccio_alloc_range to access to LLD's segment boundary limits. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: Kyle McMartin <kyle@parisc-linux.org> Cc: Matthew Wilcox <matthew@wil.cx> Cc: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/parisc/sba_iommu.c')
-rw-r--r--drivers/parisc/sba_iommu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index d06627c3f353..7d58bd2019b9 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -404,7 +404,7 @@ sba_search_bitmap(struct ioc *ioc, unsigned long bits_wanted)
404 * resource bit map. 404 * resource bit map.
405 */ 405 */
406static int 406static int
407sba_alloc_range(struct ioc *ioc, size_t size) 407sba_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
408{ 408{
409 unsigned int pages_needed = size >> IOVP_SHIFT; 409 unsigned int pages_needed = size >> IOVP_SHIFT;
410#ifdef SBA_COLLECT_STATS 410#ifdef SBA_COLLECT_STATS
@@ -710,7 +710,7 @@ sba_map_single(struct device *dev, void *addr, size_t size,
710 ioc->msingle_calls++; 710 ioc->msingle_calls++;
711 ioc->msingle_pages += size >> IOVP_SHIFT; 711 ioc->msingle_pages += size >> IOVP_SHIFT;
712#endif 712#endif
713 pide = sba_alloc_range(ioc, size); 713 pide = sba_alloc_range(ioc, dev, size);
714 iovp = (dma_addr_t) pide << IOVP_SHIFT; 714 iovp = (dma_addr_t) pide << IOVP_SHIFT;
715 715
716 DBG_RUN("%s() 0x%p -> 0x%lx\n", 716 DBG_RUN("%s() 0x%p -> 0x%lx\n",