From 24c31eede658c30e4fcc93505589fd519c3aa4b8 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 17 Oct 2007 09:22:14 +0200 Subject: SPARC64: fix iommu sg chaining Commit 2c941a204070ab32d92d40318a3196a7fb994c00 looks incomplete. The helper functions like prepare_sg() need to support sg chaining too. Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe --- arch/sparc64/kernel/iommu.c | 1 - arch/sparc64/kernel/iommu_common.c | 51 ++++++++++++++++++++++---------------- arch/sparc64/kernel/iommu_common.h | 1 + arch/sparc64/kernel/pci_sun4v.c | 1 - 4 files changed, 31 insertions(+), 23 deletions(-) (limited to 'arch') diff --git a/arch/sparc64/kernel/iommu.c b/arch/sparc64/kernel/iommu.c index db3ffcf7a12..5d4e96dba41 100644 --- a/arch/sparc64/kernel/iommu.c +++ b/arch/sparc64/kernel/iommu.c @@ -10,7 +10,6 @@ #include #include #include -#include #ifdef CONFIG_PCI #include diff --git a/arch/sparc64/kernel/iommu_common.c b/arch/sparc64/kernel/iommu_common.c index 12c93a3eee2..d7ca900ec51 100644 --- a/arch/sparc64/kernel/iommu_common.c +++ b/arch/sparc64/kernel/iommu_common.c @@ -12,18 +12,22 @@ */ #ifdef VERIFY_SG -static int verify_lengths(struct scatterlist *sg, int nents, int npages) +static int verify_lengths(struct scatterlist *sglist, int nents, int npages) { int sg_len, dma_len; int i, pgcount; + struct scatterlist *sg; sg_len = 0; - for (i = 0; i < nents; i++) - sg_len += sg[i].length; + for_each_sg(sglist, sg, nents, i) + sg_len += sg->length; dma_len = 0; - for (i = 0; i < nents && sg[i].dma_length; i++) - dma_len += sg[i].dma_length; + for_each_sg(sglist, sg, nents, i) { + if (!sg->dma_length) + break; + dma_len += sg->dma_length; + } if (sg_len != dma_len) { printk("verify_lengths: Error, different, sg[%d] dma[%d]\n", @@ -32,13 +36,16 @@ static int verify_lengths(struct scatterlist *sg, int nents, int npages) } pgcount = 0; - for (i = 0; i < nents && sg[i].dma_length; i++) { + for_each_sg(sglist, sg, nents, i) { unsigned long start, end; - start = sg[i].dma_address; + if (!sg->dma_length) + break; + + start = sg->dma_address; start = start & IO_PAGE_MASK; - end = sg[i].dma_address + sg[i].dma_length; + end = sg->dma_address + sg->dma_length; end = (end + (IO_PAGE_SIZE - 1)) & IO_PAGE_MASK; pgcount += ((end - start) >> IO_PAGE_SHIFT); @@ -113,7 +120,7 @@ static int verify_one_map(struct scatterlist *dma_sg, struct scatterlist **__sg, if (dlen > 0 && ((daddr & ~IO_PAGE_MASK) == 0)) iopte++; - sg++; + sg = sg_next(sg); if (--nents <= 0) break; sgaddr = (unsigned long) (page_address(sg->page) + sg->offset); @@ -147,7 +154,7 @@ static int verify_maps(struct scatterlist *sg, int nents, iopte_t *iopte) nents = verify_one_map(dma_sg, &sg, nents, &iopte); if (nents <= 0) break; - dma_sg++; + dma_sg = sg_next(dma_sg); if (dma_sg->dma_length == 0) break; } @@ -169,22 +176,24 @@ static int verify_maps(struct scatterlist *sg, int nents, iopte_t *iopte) return 0; } -void verify_sglist(struct scatterlist *sg, int nents, iopte_t *iopte, int npages) +void verify_sglist(struct scatterlist *sglist, int nents, iopte_t *iopte, int npages) { - if (verify_lengths(sg, nents, npages) < 0 || - verify_maps(sg, nents, iopte) < 0) { + struct scatterlist *sg; + + if (verify_lengths(sglist, nents, npages) < 0 || + verify_maps(sglist, nents, iopte) < 0) { int i; printk("verify_sglist: Crap, messed up mappings, dumping, iodma at "); - printk("%016lx.\n", sg->dma_address & IO_PAGE_MASK); + printk("%016lx.\n", sglist->dma_address & IO_PAGE_MASK); - for (i = 0; i < nents; i++) { + for_each_sg(sglist, sg, nents, i) { printk("sg(%d): page_addr(%p) off(%x) length(%x) " - "dma_address[%016lx] dma_length[%016lx]\n", + "dma_address[%016x] dma_length[%016x]\n", i, - page_address(sg[i].page), sg[i].offset, - sg[i].length, - sg[i].dma_address, sg[i].dma_length); + page_address(sg->page), sg->offset, + sg->length, + sg->dma_address, sg->dma_length); } } @@ -205,12 +214,12 @@ unsigned long prepare_sg(struct scatterlist *sg, int nents) while (--nents) { unsigned long addr; - sg++; + sg = sg_next(sg); addr = (unsigned long) (page_address(sg->page) + sg->offset); if (! VCONTIG(prev, addr)) { dma_sg->dma_address = dent_addr; dma_sg->dma_length = dent_len; - dma_sg++; + dma_sg = sg_next(dma_sg); dent_addr = ((dent_addr + dent_len + diff --git a/arch/sparc64/kernel/iommu_common.h b/arch/sparc64/kernel/iommu_common.h index ad791014419..75b5a581452 100644 --- a/arch/sparc64/kernel/iommu_common.h +++ b/arch/sparc64/kernel/iommu_common.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c index cacacfae545..119f8efa03d 100644 --- a/arch/sparc64/kernel/pci_sun4v.c +++ b/arch/sparc64/kernel/pci_sun4v.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include -- cgit v1.2.3 From bdb02504f473be6a785741093913ea2acd05626f Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 17 Oct 2007 10:51:20 +0200 Subject: IA64: iommu uses sg_next with an invalid sg element sg list elements might not be continuous. Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe --- arch/ia64/hp/common/sba_iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch') diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 4338f4123f3..3c95f4184b9 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -1179,7 +1179,6 @@ sba_fill_pdir( u64 *pdirp = NULL; unsigned long dma_offset = 0; - dma_sg--; while (nents-- > 0) { int cnt = startsg->dma_length; startsg->dma_length = 0; @@ -1201,7 +1200,8 @@ sba_fill_pdir( u32 pide = startsg->dma_address & ~PIDE_FLAG; dma_offset = (unsigned long) pide & ~iovp_mask; startsg->dma_address = 0; - dma_sg = sg_next(dma_sg); + if (n_mappings) + dma_sg = sg_next(dma_sg); dma_sg->dma_address = pide | ioc->ibase; pdirp = &(ioc->pdir_base[pide >> iovp_shift]); n_mappings++; -- cgit v1.2.3 From 5804509e652fd26227f6da732d5445af444730d3 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 17 Oct 2007 04:08:48 -0700 Subject: Fix loop terminating conditions in fill_sg(). Signed-off-by: David S. Miller Signed-off-by: Jens Axboe --- arch/sparc64/kernel/iommu.c | 12 +++++++----- arch/sparc64/kernel/pci_sun4v.c | 15 ++++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'arch') diff --git a/arch/sparc64/kernel/iommu.c b/arch/sparc64/kernel/iommu.c index 5d4e96dba41..29af777d7ac 100644 --- a/arch/sparc64/kernel/iommu.c +++ b/arch/sparc64/kernel/iommu.c @@ -475,12 +475,11 @@ static void dma_4u_unmap_single(struct device *dev, dma_addr_t bus_addr, #define SG_ENT_PHYS_ADDRESS(SG) \ (__pa(page_address((SG)->page)) + (SG)->offset) -static inline void fill_sg(iopte_t *iopte, struct scatterlist *sg, - int nused, int nelems, - unsigned long iopte_protection) +static void fill_sg(iopte_t *iopte, struct scatterlist *sg, + int nused, int nelems, + unsigned long iopte_protection) { struct scatterlist *dma_sg = sg; - struct scatterlist *sg_end = sg_last(sg, nelems); int i; for (i = 0; i < nused; i++) { @@ -516,6 +515,7 @@ static inline void fill_sg(iopte_t *iopte, struct scatterlist *sg, break; } sg = sg_next(sg); + nelems--; } pteval = iopte_protection | (pteval & IOPTE_PAGE); @@ -529,18 +529,20 @@ static inline void fill_sg(iopte_t *iopte, struct scatterlist *sg, pteval = (pteval & IOPTE_PAGE) + len; sg = sg_next(sg); + nelems--; /* Skip over any tail mappings we've fully mapped, * adjusting pteval along the way. Stop when we * detect a page crossing event. */ - while (sg != sg_end && + while (nelems && (pteval << (64 - IO_PAGE_SHIFT)) != 0UL && (pteval == SG_ENT_PHYS_ADDRESS(sg)) && ((pteval ^ (SG_ENT_PHYS_ADDRESS(sg) + sg->length - 1UL)) >> IO_PAGE_SHIFT) == 0UL) { pteval += sg->length; sg = sg_next(sg); + nelems--; } if ((pteval << (64 - IO_PAGE_SHIFT)) == 0UL) pteval = ~0UL; diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c index 119f8efa03d..fe46ace3e59 100644 --- a/arch/sparc64/kernel/pci_sun4v.c +++ b/arch/sparc64/kernel/pci_sun4v.c @@ -368,12 +368,11 @@ static void dma_4v_unmap_single(struct device *dev, dma_addr_t bus_addr, #define SG_ENT_PHYS_ADDRESS(SG) \ (__pa(page_address((SG)->page)) + (SG)->offset) -static inline long fill_sg(long entry, struct device *dev, - struct scatterlist *sg, - int nused, int nelems, unsigned long prot) +static long fill_sg(long entry, struct device *dev, + struct scatterlist *sg, + int nused, int nelems, unsigned long prot) { struct scatterlist *dma_sg = sg; - struct scatterlist *sg_end = sg_last(sg, nelems); unsigned long flags; int i; @@ -414,6 +413,7 @@ static inline long fill_sg(long entry, struct device *dev, break; } sg = sg_next(sg); + nelems--; } pteval = (pteval & IOPTE_PAGE); @@ -432,19 +432,20 @@ static inline long fill_sg(long entry, struct device *dev, pteval = (pteval & IOPTE_PAGE) + len; sg = sg_next(sg); + nelems--; /* Skip over any tail mappings we've fully mapped, * adjusting pteval along the way. Stop when we * detect a page crossing event. */ - while ((pteval << (64 - IO_PAGE_SHIFT)) != 0UL && + while (nelems && + (pteval << (64 - IO_PAGE_SHIFT)) != 0UL && (pteval == SG_ENT_PHYS_ADDRESS(sg)) && ((pteval ^ (SG_ENT_PHYS_ADDRESS(sg) + sg->length - 1UL)) >> IO_PAGE_SHIFT) == 0UL) { pteval += sg->length; - if (sg == sg_end) - break; sg = sg_next(sg); + nelems--; } if ((pteval << (64 - IO_PAGE_SHIFT)) == 0UL) pteval = ~0UL; -- cgit v1.2.3