6 files changed, 25 insertions, 33 deletions

diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index 12b341d04f88..7a4bcc36303d 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -20,6 +20,7 @@ generic-y += param.h
 generic-y += percpu.h
 generic-y += poll.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += seccomp.h
 generic-y += segment.h
 generic-y += topology.h
diff --git a/arch/parisc/include/asm/scatterlist.h b/arch/parisc/include/asm/scatterlist.h
deleted file mode 100644
index 8bf1f0dd1f15..000000000000
--- a/arch/parisc/include/asm/scatterlist.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_PARISC_SCATTERLIST_H
-#define _ASM_PARISC_SCATTERLIST_H
-
-#include <asm/page.h>
-#include <asm/types.h>
-#include <asm-generic/scatterlist.h>
-
-#define sg_virt_addr(sg) ((unsigned long)sg_virt(sg))
-
-#endif /* _ASM_PARISC_SCATTERLIST_H */
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
index d87d1c476d85..ff834fd67478 100644
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
@@ -482,7 +482,7 @@ static int pa11_dma_map_sg(struct device *dev, struct scatterlist *sglist, int n
         BUG_ON(direction == DMA_NONE);
 
         for (i = 0; i < nents; i++, sglist++ ) {
-                unsigned long vaddr = sg_virt_addr(sglist);
+                unsigned long vaddr = (unsigned long)sg_virt(sglist);
                 sg_dma_address(sglist) = (dma_addr_t) virt_to_phys(vaddr);
                 sg_dma_len(sglist) = sglist->length;
                 flush_kernel_dcache_range(vaddr, sglist->length);
@@ -502,7 +502,7 @@ static void pa11_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, in
         /* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */
 
         for (i = 0; i < nents; i++, sglist++ )
-                flush_kernel_dcache_range(sg_virt_addr(sglist), sglist->length);
+                flush_kernel_vmap_range(sg_virt(sglist), sglist->length);
         return;
 }
 
@@ -527,7 +527,7 @@ static void pa11_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sgl
         /* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */
 
         for (i = 0; i < nents; i++, sglist++ )
-                flush_kernel_dcache_range(sg_virt_addr(sglist), sglist->length);
+                flush_kernel_vmap_range(sg_virt(sglist), sglist->length);
 }
 
 static void pa11_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)
@@ -537,7 +537,7 @@ static void pa11_dma_sync_sg_for_device(struct device *dev, struct scatterlist *
         /* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */
 
         for (i = 0; i < nents; i++, sglist++ )
-                flush_kernel_dcache_range(sg_virt_addr(sglist), sglist->length);
+                flush_kernel_vmap_range(sg_virt(sglist), sglist->length);
 }
 
 struct hppa_dma_ops pcxl_dma_ops = {
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 6bc16809c504..02ff84fcfa61 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -916,7 +916,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
         /* Fast path single entry scatterlists. */
         if (nents == 1) {
                 sg_dma_address(sglist) = ccio_map_single(dev,
-                                (void *)sg_virt_addr(sglist), sglist->length,
+                                sg_virt(sglist), sglist->length,
                                 direction);
                 sg_dma_len(sglist) = sglist->length;
                 return 1;
@@ -983,8 +983,8 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
         BUG_ON(!dev);
         ioc = GET_IOC(dev);
 
-        DBG_RUN_SG("%s() START %d entries,  %08lx,%x\n",
-                __func__, nents, sg_virt_addr(sglist), sglist->length);
+        DBG_RUN_SG("%s() START %d entries, %p,%x\n",
+                __func__, nents, sg_virt(sglist), sglist->length);
 
 #ifdef CCIO_COLLECT_STATS
         ioc->usg_calls++;
diff --git a/drivers/parisc/iommu-helpers.h b/drivers/parisc/iommu-helpers.h
index 8c33491b21fe..761e77bfce5d 100644
--- a/drivers/parisc/iommu-helpers.h
+++ b/drivers/parisc/iommu-helpers.h
@@ -30,9 +30,9 @@ iommu_fill_pdir(struct ioc *ioc, struct scatterlist *startsg, int nents,
                 unsigned long vaddr;
                 long size;
 
-                DBG_RUN_SG(" %d : %08lx/%05x %08lx/%05x\n", nents,
+                DBG_RUN_SG(" %d : %08lx/%05x %p/%05x\n", nents,
                            (unsigned long)sg_dma_address(startsg), cnt,
-                           sg_virt_addr(startsg), startsg->length
+                           sg_virt(startsg), startsg->length
                 );
 
 
@@ -66,7 +66,7 @@ iommu_fill_pdir(struct ioc *ioc, struct scatterlist *startsg, int nents,
                 
                 BUG_ON(pdirp == NULL);
                 
-                vaddr = sg_virt_addr(startsg);
+                vaddr = (unsigned long)sg_virt(startsg);
                 sg_dma_len(dma_sg) += startsg->length;
                 size = startsg->length + dma_offset;
                 dma_offset = 0;
@@ -113,7 +113,7 @@ iommu_coalesce_chunks(struct ioc *ioc, struct device *dev,
                 */
                 contig_sg = startsg;
                 dma_len = startsg->length;
-                dma_offset = sg_virt_addr(startsg) & ~IOVP_MASK;
+                dma_offset = startsg->offset;
 
                 /* PARANOID: clear entries */
                 sg_dma_address(startsg) = 0;
@@ -124,14 +124,13 @@ iommu_coalesce_chunks(struct ioc *ioc, struct device *dev,
                 ** it's always looking one "ahead".
                 */
                 while(--nents > 0) {
-                        unsigned long prevstartsg_end, startsg_end;
+                        unsigned long prev_end, sg_start;
 
-                        prevstartsg_end = sg_virt_addr(startsg) +
-                                startsg->length;
+                        prev_end = (unsigned long)sg_virt(startsg) +
+                                                        startsg->length;
 
                         startsg++;
-                        startsg_end = sg_virt_addr(startsg) + 
-                                startsg->length;
+                        sg_start = (unsigned long)sg_virt(startsg);
 
                         /* PARANOID: clear entries */
                         sg_dma_address(startsg) = 0;
@@ -150,10 +149,13 @@ iommu_coalesce_chunks(struct ioc *ioc, struct device *dev,
                                 break;
 
                         /*
-                        ** Next see if we can append the next chunk (i.e.
-                        ** it must end on one page and begin on another
+                        * Next see if we can append the next chunk (i.e.
+                        * it must end on one page and begin on another, or
+                        * it must start on the same address as the previous
+                        * entry ended.
                         */
-                        if (unlikely(((prevstartsg_end | sg_virt_addr(startsg)) & ~PAGE_MASK) != 0))
+                        if (unlikely((prev_end != sg_start) ||
+                                ((prev_end | sg_start) & ~PAGE_MASK)))
                                 break;
                         
                         dma_len += startsg->length;
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index f07471264689..f1441e466c06 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -278,7 +278,7 @@ sba_dump_sg( struct ioc *ioc, struct scatterlist *startsg, int nents)
                                 nents,
                                 (unsigned long) sg_dma_address(startsg),
                                 sg_dma_len(startsg),
-                                sg_virt_addr(startsg), startsg->length);
+                                sg_virt(startsg), startsg->length);
                 startsg++;
         }
 }
@@ -945,8 +945,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
 
         /* Fast path single entry scatterlists. */
         if (nents == 1) {
-                sg_dma_address(sglist) = sba_map_single(dev,
-                                                (void *)sg_virt_addr(sglist),
+                sg_dma_address(sglist) = sba_map_single(dev, sg_virt(sglist),
                                                 sglist->length, direction);
                 sg_dma_len(sglist)     = sglist->length;
                 return 1;
@@ -1025,7 +1024,7 @@ sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
 #endif
 
         DBG_RUN_SG("%s() START %d entries,  %p,%x\n",
-                __func__, nents, sg_virt_addr(sglist), sglist->length);
+                __func__, nents, sg_virt(sglist), sglist->length);
 
         ioc = GET_IOC(dev);