Chaining sg lists for big IO commands v6
Subsystems (36)
cover Chaining sg lists for big IO commands v6
(please ignore last posting, git send-email got hold of the wrong directory...)
Hi,
Round 6 of the sg chaining patch set. Changes since v5:
- Support for more architectures. It should now run and work on i386, x86-64, sparc, sparc64, ia64, and ppc (32 and 64-bit). I have only tested i386/x86-64/ppc64 myself.
- Large command support is now automatically enabled by the SCSI mid layer, if the arch supports sg chaining. The debug queue entry in /sys/block/<dev>/queue/max_segments still exists if you want to tweak it further. The default limit is now 2048 entries, or at least 8mb ios. Remember that you still need to tweak the soft limit to allow the block layer to build large commands, that is the max_sectors_kb variable in the same directory.
- Add kerneldoc documentation to scatterlist.h
It's solid here, so please give it a spin. I'd like to get some performance results as well, if someone feels inclined to do so.
arch/ia64/hp/common/sba_iommu.c | 14 - arch/ia64/hp/sim/simscsi.c | 23 +- arch/ia64/sn/pci/pci_dma.c | 11 - arch/powerpc/kernel/dma_64.c | 5 arch/powerpc/kernel/ibmebus.c | 11 - arch/powerpc/kernel/iommu.c | 18 + arch/powerpc/platforms/ps3/system-bus.c | 5 arch/sparc/kernel/ioport.c | 25 +- arch/sparc/mm/io-unit.c | 12 - arch/sparc/mm/iommu.c | 10 arch/sparc/mm/sun4c.c | 10 arch/sparc64/kernel/pci_iommu.c | 39 ++- arch/sparc64/kernel/pci_sun4v.c | 32 +- arch/sparc64/kernel/sbus.c | 44 ++-- arch/x86_64/kernel/pci-calgary.c | 25 +- arch/x86_64/kernel/pci-gart.c | 60 ++--- arch/x86_64/kernel/pci-nommu.c | 5 block/ll_rw_blk.c | 42 +++ crypto/digest.c | 2 crypto/scatterwalk.c | 2 crypto/scatterwalk.h | 2 drivers/ata/libata-core.c | 30 +- drivers/ide/cris/ide-cris.c | 3 drivers/ide/ide-dma.c | 2 drivers/ide/ide-taskfile.c | 17 + drivers/ide/mips/au1xxx-ide.c | 2 drivers/ide/pci/sgiioc4.c | 2 drivers/ide/ppc/pmac.c | 2 drivers/infiniband/hw/ipath/ipath_dma.c | 9 drivers/infiniband/ulp/iser/iser_memory.c | 75 +++--- drivers/infiniband/ulp/srp/ib_srp.c | 22 +- drivers/message/fusion/mptscsih.c | 4 drivers/scsi/3w-9xxx.c | 8 drivers/scsi/3w-xxxx.c | 8 drivers/scsi/53c700.c | 16 - drivers/scsi/BusLogic.c | 7 drivers/scsi/NCR53c406a.c | 18 - drivers/scsi/a100u2w.c | 9 drivers/scsi/aacraid/aachba.c | 29 +- drivers/scsi/advansys.c | 21 - drivers/scsi/aha1542.c | 21 - drivers/scsi/aha1740.c | 8 drivers/scsi/aic7xxx/aic79xx_osm.c | 3 drivers/scsi/aic7xxx/aic7xxx_osm.c | 12 - drivers/scsi/aic94xx/aic94xx_task.c | 6 drivers/scsi/arcmsr/arcmsr_hba.c | 11 - drivers/scsi/dc395x.c | 7 drivers/scsi/dpt_i2o.c | 13 - drivers/scsi/eata.c | 8 drivers/scsi/esp_scsi.c | 5 drivers/scsi/gdth.c | 45 ++-- drivers/scsi/hptiop.c | 8 drivers/scsi/ibmmca.c | 11 - drivers/scsi/ibmvscsi/ibmvscsi.c | 4 drivers/scsi/ide-scsi.c | 31 +- drivers/scsi/initio.c | 12 - drivers/scsi/ipr.c | 9 drivers/scsi/ips.c | 74 +++--- drivers/scsi/iscsi_tcp.c | 43 ++- drivers/scsi/jazz_esp.c | 27 +- drivers/scsi/lpfc/lpfc_scsi.c | 9 drivers/scsi/mac53c94.c | 9 drivers/scsi/megaraid.c | 13 - drivers/scsi/megaraid/megaraid_mbox.c | 7 drivers/scsi/megaraid/megaraid_sas.c | 16 - drivers/scsi/mesh.c | 12 - drivers/scsi/ncr53c8xx.c | 7 drivers/scsi/nsp32.c | 9 drivers/scsi/pcmcia/sym53c500_cs.c | 18 - drivers/scsi/qla1280.c | 66 +++--- drivers/scsi/qla2xxx/qla_iocb.c | 9 drivers/scsi/qla4xxx/ql4_iocb.c | 8 drivers/scsi/qlogicfas408.c | 9 drivers/scsi/qlogicpti.c | 15 - drivers/scsi/scsi_debug.c | 29 +- drivers/scsi/scsi_lib.c | 239 ++++++++++++++++------ drivers/scsi/scsi_tgt_lib.c | 4 drivers/scsi/sg.c | 16 - drivers/scsi/sym53c416.c | 9 drivers/scsi/sym53c8xx_2/sym_glue.c | 7 drivers/scsi/u14-34f.c | 10 drivers/scsi/ultrastor.c | 10 drivers/scsi/wd7000.c | 7 drivers/usb/storage/alauda.c | 16 - drivers/usb/storage/datafab.c | 10 drivers/usb/storage/jumpshot.c | 10 drivers/usb/storage/protocol.c | 20 + drivers/usb/storage/protocol.h | 2 drivers/usb/storage/sddr09.c | 16 - drivers/usb/storage/sddr55.c | 16 - drivers/usb/storage/shuttle_usbat.c | 17 - include/asm-i386/dma-mapping.h | 13 - include/asm-i386/scatterlist.h | 2 include/asm-ia64/dma-mapping.h | 1 include/asm-ia64/scatterlist.h | 2 include/asm-powerpc/dma-mapping.h | 2 include/asm-powerpc/scatterlist.h | 2 include/asm-sparc/scatterlist.h | 2 include/asm-sparc64/scatterlist.h | 2 include/asm-x86_64/dma-mapping.h | 3 include/asm-x86_64/scatterlist.h | 2 include/linux/i2o.h | 2 include/linux/ide.h | 2 include/linux/libata.h | 16 - include/linux/scatterlist.h | 84 +++++++ include/scsi/scsi.h | 7 include/scsi/scsi_cmnd.h | 3 lib/swiotlb.c | 19 + 108 files changed, 1104 insertions(+), 744 deletions(-)
PATCH 1/19 crypto: don't pollute the global namespace with sg_next()
It's a subsystem function, prefix it as such.
--- crypto/digest.c | 2 +- crypto/scatterwalk.c | 2 +- crypto/scatterwalk.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
crypto/digest.c +1 -1
@@ -77,7 +77,7 @@ static int update2(struct hash_desc *desc,if (!nbytes)break ; - sg =sg_next (sg); + sg =scatterwalk_sg_next (sg); }return 0 ;
crypto/scatterwalk.c +1 -1
@@ -70,7 +70,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out, walk->offset +=PAGE_SIZE -1 ; walk->offset &=PAGE_MASK ;if (walk->offset >= walk->sg->offset + walk->sg->length) -scatterwalk_start (walk,sg_next (walk->sg)); +scatterwalk_start (walk,scatterwalk_sg_next (walk->sg)); } }
crypto/scatterwalk.h +1 -1
@@ -20,7 +20,7 @@#include "internal.h" -static inline struct scatterlist *sg_next (struct scatterlist *sg) +static inline struct scatterlist *scatterwalk_sg_next (struct scatterlist *sg) {return (++sg)->length ? sg : (void *)sg->page; }
Signature · 1 line
1.5.2.rc1
PATCH 2/19 Add sg helpers for iterating over a scatterlist table
In reply to Jens AxboeFirst step to being able to change the scatterlist setup without having to modify drivers (a lot :-)
--- include/linux/scatterlist.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
include/linux/scatterlist.h +9 -0
@@ -20,4 +20,13 @@ static inline void sg_init_one(struct scatterlist *sg, const void *buf, sg_set_buf(sg, buf, buflen); } +#define sg_next (sg) ((sg) + 1) +#define sg_last (sg, nents) (&(sg[(nents) - 1])) + +/* +* Loop over each sg element, following the pointer to a new list if necessary +*/ +#define for_each_sg (sglist, sg, nr, __i) \ + for (__i = 0, sg = (sglist); __i < (nr); __i++, sg = sg_next(sg)) +#endif /* _LINUX_SCATTERLIST_H */
Signature · 1 line
1.5.2.rc1
PATCH 3/19 libata: convert to using sg helpers
In reply to Jens AxboeThis converts libata to using the sg helpers for looking up sg elements, instead of doing it manually.
--- drivers/ata/libata-core.c | 30 ++++++++++++++++-------------- include/linux/libata.h | 16 ++++++++++------ 2 files changed, 26 insertions(+), 20 deletions(-)
drivers/ata/libata-core.c +16 -14
@@ -1376,7 +1376,7 @@ static void ata_qc_complete_internal(struct ata_queued_cmd *qc)*/ unsigned ata_exec_internal_sg (struct ata_device *dev,struct ata_taskfile *tf,const u8 *cdb, -int dma_dir,struct scatterlist *sg, +int dma_dir,struct scatterlist *sgl,unsigned int n_elem) {struct ata_port *ap = dev->ap;
@@ -1434,11 +1434,12 @@ unsigned ata_exec_internal_sg(struct ata_device *dev, qc->dma_dir = dma_dir;if (dma_dir !=DMA_NONE ) {unsigned int i, buflen =0 ; +struct scatterlist *sg; -for (i =0 ; i < n_elem; i++) - buflen += sg[i].length; +for_each_sg (sgl, sg, n_elem, i) + buflen += sg->length; -ata_sg_init (qc, sg, n_elem); +ata_sg_init (qc, sgl, n_elem); qc->nbytes = buflen; }
@@ -4008,7 +4009,7 @@ void ata_sg_clean(struct ata_queued_cmd *qc)if (qc->n_elem)dma_unmap_sg (ap->dev, sg, qc->n_elem, dir);/* restore last sg */ - sg[qc->orig_n_elem -1 ].length += qc->pad_len; +sg_last (sg, qc->orig_n_elem)->length += qc->pad_len;if (pad_buf) {struct scatterlist *psg = &qc->pad_sgent;void *addr =kmap_atomic (psg->page,KM_IRQ0 );
@@ -4167,6 +4168,7 @@ void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen) qc->orig_n_elem =1 ; qc->buf_virt = buf; qc->nbytes = buflen; + qc->cursg = qc->__sg;sg_init_one (&qc->sgent, buf, buflen); }
@@ -4192,6 +4194,7 @@ void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg, qc->__sg = sg; qc->n_elem = n_elem; qc->orig_n_elem = n_elem; + qc->cursg = qc->__sg; }/**
@@ -4281,7 +4284,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc) {struct ata_port *ap = qc->ap;struct scatterlist *sg = qc->__sg; -struct scatterlist *lsg = &sg[qc->n_elem -1 ]; +struct scatterlist *lsg =sg_last (qc->__sg, qc->n_elem);int n_elem, pre_n_elem, dir, trim_sg =0 ;VPRINTK ("ENTER, ata%u\n" , ap->print_id);
@@ -4445,7 +4448,6 @@ void ata_data_xfer_noirq(struct ata_device *adev, unsigned char *buf,static void ata_pio_sector (struct ata_queued_cmd *qc) {int do_write = (qc->tf.flags &ATA_TFLAG_WRITE ); -struct scatterlist *sg = qc->__sg;struct ata_port *ap = qc->ap;struct page *page;unsigned int offset;
@@ -4454,8 +4456,8 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)if (qc->curbytes == qc->nbytes - qc->sect_size) ap->hsm_task_state =HSM_ST_LAST ; - page = sg[qc->cursg].page; - offset = sg[qc->cursg].offset + qc->cursg_ofs; + page = qc->cursg->page; + offset = qc->cursg->offset + qc->cursg_ofs;/* get the current page and offset */ page =nth_page (page, (offset >>PAGE_SHIFT ));
@@ -4483,8 +4485,8 @@ static void ata_pio_sector(struct ata_queued_cmd *qc) qc->curbytes += qc->sect_size; qc->cursg_ofs += qc->sect_size; -if (qc->cursg_ofs == (&sg[qc->cursg])->length) { - qc->cursg++; +if (qc->cursg_ofs == qc->cursg->length) { + qc->cursg =sg_next (qc->cursg); qc->cursg_ofs =0 ; } }
@@ -4577,7 +4579,7 @@ static void __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes) ap->hsm_task_state =HSM_ST_LAST ; next_sg: -if (unlikely (qc->cursg >= qc->n_elem)) { +if (unlikely (qc->cursg ==sg_last (qc->__sg, qc->n_elem))) {/* * The end of qc->sg is reached and the device expects * more data to transfer. In order not to overrun qc->sg
@@ -4600,7 +4602,7 @@ next_sg:return ; } - sg = &qc->__sg[qc->cursg]; + sg = qc->cursg; page = sg->page; offset = sg->offset + qc->cursg_ofs;
@@ -4639,7 +4641,7 @@ next_sg: qc->cursg_ofs += count;if (qc->cursg_ofs == sg->length) { - qc->cursg++; + qc->cursg =sg_next (qc->cursg); qc->cursg_ofs =0 ; }
include/linux/libata.h +10 -6
@@ -30,7 +30,7 @@#include <linux/interrupt.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/io.h> #include <linux/ata.h> #include <linux/workqueue.h>
@@ -380,6 +380,7 @@ struct ata_queued_cmd {unsigned long flags;/* ATA_QCFLAG_xxx */ unsigned int tag;unsigned int n_elem; +unsigned int n_iter;unsigned int orig_n_elem;int dma_dir;
@@ -390,7 +391,7 @@ struct ata_queued_cmd {unsigned int nbytes;unsigned int curbytes; -unsigned int cursg; +struct scatterlist *cursg;unsigned int cursg_ofs;struct scatterlist sgent;
@@ -925,7 +926,7 @@ ata_sg_is_last(struct scatterlist *sg, struct ata_queued_cmd *qc)return 1 ;if (qc->pad_len)return 0 ; -if (((sg - qc->__sg) +1 ) == qc->n_elem) +if (qc->n_iter == qc->n_elem)return 1 ;return 0 ; }
@@ -933,6 +934,7 @@ ata_sg_is_last(struct scatterlist *sg, struct ata_queued_cmd *qc)static inline struct scatterlist *ata_qc_first_sg (struct ata_queued_cmd *qc) { + qc->n_iter =0 ;if (qc->n_elem)return qc->__sg;if (qc->pad_len)
@@ -945,8 +947,8 @@ ata_qc_next_sg(struct scatterlist *sg, struct ata_queued_cmd *qc) {if (sg == &qc->pad_sgent)return NULL ; -if (++sg - qc->__sg < qc->n_elem) -return sg; +if (++qc->n_iter < qc->n_elem) +return sg_next (sg);if (qc->pad_len)return &qc->pad_sgent;return NULL ;
@@ -1142,9 +1144,11 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc) qc->dma_dir =DMA_NONE ; qc->__sg =NULL ; qc->flags =0 ; - qc->cursg = qc->cursg_ofs =0 ; + qc->cursg =NULL ; + qc->cursg_ofs =0 ; qc->nbytes = qc->curbytes =0 ; qc->n_elem =0 ; + qc->n_iter =0 ; qc->err_mask =0 ; qc->pad_len =0 ; qc->sect_size =ATA_SECT_SIZE ;
Signature · 1 line
1.5.2.rc1
PATCH 4/19 block: convert to using sg helpers
In reply to Jens AxboeConvert the main rq mapper (blk_rq_map_sg()) to the sg helper setup.
--- block/ll_rw_blk.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-)
block/ll_rw_blk.c +12 -7
@@ -30,6 +30,7 @@#include <linux/cpu.h> #include <linux/blktrace_api.h> #include <linux/fault-inject.h> +#include <linux/scatterlist.h> /* * for max sense size
@@ -1307,9 +1308,11 @@ static int blk_hw_contig_segment(request_queue_t *q, struct bio *bio,* map a request to scatterlist, return number of sg entries setup. Caller * must make sure sg can hold rq->nr_phys_segments entries */ -int blk_rq_map_sg (request_queue_t *q,struct request *rq,struct scatterlist *sg) +int blk_rq_map_sg (request_queue_t *q,struct request *rq, +struct scatterlist *sglist) {struct bio_vec *bvec, *bvprv; +struct scatterlist *next_sg, *sg;struct bio *bio;int nsegs, i, cluster;
@@ -1320,6 +1323,7 @@ int blk_rq_map_sg(request_queue_t *q, struct request *rq, struct scatterlist *sg* for each bio in rq */ bvprv =NULL ; + sg = next_sg = &sglist[0 ];rq_for_each_bio (bio, rq) {/* * for each segment in bio
@@ -1328,7 +1332,7 @@ int blk_rq_map_sg(request_queue_t *q, struct request *rq, struct scatterlist *sgint nbytes = bvec->bv_len;if (bvprv && cluster) { -if (sg[nsegs -1 ].length + nbytes > q->max_segment_size) +if (sg->length + nbytes > q->max_segment_size) goto new_segment;if (!BIOVEC_PHYS_MERGEABLE (bvprv, bvec))
@@ -1336,14 +1340,15 @@ int blk_rq_map_sg(request_queue_t *q, struct request *rq, struct scatterlist *sgif (!BIOVEC_SEG_BOUNDARY (q, bvprv, bvec)) goto new_segment; - sg[nsegs -1 ].length += nbytes; + sg->length += nbytes; }else { new_segment: -memset (&sg[nsegs],0 ,sizeof (struct scatterlist )); - sg[nsegs].page = bvec->bv_page; - sg[nsegs].length = nbytes; - sg[nsegs].offset = bvec->bv_offset; + sg = next_sg; + next_sg =sg_next (sg); + sg->page = bvec->bv_page; + sg->length = nbytes; + sg->offset = bvec->bv_offset; nsegs++; } bvprv = bvec;
Signature · 1 line
1.5.2.rc1
PATCH 5/19 scsi: convert to using sg helpers
In reply to Jens AxboeThis converts the SCSI mid layer to using the sg helpers for looking up sg elements, instead of doing it manually.
--- drivers/scsi/scsi_lib.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-)
drivers/scsi/scsi_lib.c +11 -9
@@ -302,14 +302,15 @@ static int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl,struct request_queue *q = rq->q;int nr_pages = (bufflen + sgl[0 ].offset +PAGE_SIZE -1 ) >>PAGE_SHIFT ;unsigned int data_len =0 , len, bytes, off; +struct scatterlist *sg;struct page *page;struct bio *bio =NULL ;int i, err, nr_vecs =0 ; -for (i =0 ; i < nsegs; i++) { - page = sgl[i].page; - off = sgl[i].offset; - len = sgl[i].length; +for_each_sg (sgl, sg, nsegs, i) { + page = sg->page; + off = sg->offset; + len = sg->length; data_len += len;while (len >0 ) {
@@ -2240,18 +2241,19 @@ EXPORT_SYMBOL_GPL(scsi_target_unblock);* * Returns virtual address of the start of the mapped page */ -void *scsi_kmap_atomic_sg (struct scatterlist *sg,int sg_count, +void *scsi_kmap_atomic_sg (struct scatterlist *sgl,int sg_count,size_t *offset,size_t *len) {int i;size_t sg_len =0 , len_complete =0 ; +struct scatterlist *sg;struct page *page;WARN_ON (!irqs_disabled ()); -for (i =0 ; i < sg_count; i++) { +for_each_sg (sgl, sg, sg_count, i) { len_complete = sg_len;/* Complete sg-entries */ - sg_len += sg[i].length; + sg_len += sg->length;if (sg_len > *offset)break ; }
@@ -2265,10 +2267,10 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count, }/* Offset starting from the beginning of first page in this sg-entry */ - *offset = *offset - len_complete + sg[i].offset; + *offset = *offset - len_complete + sg->offset;/* Assumption: contiguous pages can be accessed as "page + i" */ - page =nth_page (sg[i].page, (*offset >>PAGE_SHIFT )); + page =nth_page (sg->page, (*offset >>PAGE_SHIFT )); *offset &= ~PAGE_MASK ;/* Bytes in this sg-entry from *offset to the end of the page */
Signature · 1 line
1.5.2.rc1
Re: [PATCH 5/19] scsi: convert to using sg helpers
Quoted 7 lines · Jens Axboe
This converts the SCSI mid layer to using the sg helpers for looking up sg elements, instead of doing it manually.
Signed-off-by Jens Axboe <[email protected]>--- drivers/scsi/scsi_lib.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-)
This needs to include linux/scatterlist.h (other architectures seem to pull this header in via other routes, but e.g. s390 doesn't).
--- drivers/scsi/scsi_lib.c | 1 + 1 files changed, 1 insertion(+)
drivers/scsi/scsi_lib.c +1 -0
@@ -17,6 +17,7 @@#include <linux/pci.h> #include <linux/delay.h> #include <linux/hardirq.h> +#include <linux/scatterlist.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h>
Re: [PATCH 5/19] scsi: convert to using sg helpers
Quoted 21 lines · Cornelia Huck
Quoted 7 lines · Jens Axboe
This converts the SCSI mid layer to using the sg helpers for looking up sg elements, instead of doing it manually.
Signed-off-by Jens Axboe <[email protected]>--- drivers/scsi/scsi_lib.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-)This needs to include
linux/scatterlist.h(other architectures seem to pull this header in via other routes, but e.g. s390 doesn't).--- drivers/scsi/scsi_lib.c | 1 + 1 files changed, 1 insertion(+)
drivers/scsi/scsi_lib.c line 23
Quoted 7 lines
drivers/scsi/scsi_lib.c +1
-0@@ -17,6 +17,7 @@#include <linux/pci.h> #include <linux/delay.h> #include <linux/hardirq.h> +#include <linux/scatterlist.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h>
Patch 17 does that, so the end result should work. But I'll move it to patch 5, that is the correct spot to do it. Thanks!
Signature · 1 line
Jens Axboe
PATCH 6/19 Add chained sg support to linux/scatterlist.h
In reply to Jens AxboeThe core of the patch - allow the last sg element in a scatterlist table to point to the start of a new table. We overload the LSB of the page pointer to indicate whether this is a valid sg entry, or merely a link to the next list.
--- include/linux/scatterlist.h | 79 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 2 deletions(-)
include/linux/scatterlist.h +77 -2
@@ -20,8 +20,36 @@ static inline void sg_init_one(struct scatterlist *sg, const void *buf,sg_set_buf (sg, buf, buflen); } -#define sg_next (sg) ((sg) + 1) -#define sg_last (sg, nents) (&(sg[(nents) - 1])) +/* +* We overload the LSB of the page pointer to indicate whether it's +* a valid sg entry, or whether it points to the start of a new scatterlist. +* Those low bits are there for everyone! (thanks mason :-) +*/ +#define sg_is_chain (sg) ((unsigned long) (sg)->page & 0x01) +#define sg_chain_ptr (sg) \ + ((struct scatterlist *) ((unsigned long) (sg)->page & ~0x01)) + +/** +* sg_next - return the next scatterlist entry in a list +* @sg: The current sg entry +* +* Usually the next entry will be @sg@ + 1, but if this sg element is part +* of a chained scatterlist, it could jump to the start of a new +* scatterlist array. +* +* Note that the caller must ensure that there are further entries after +* the current entry, this function will NOT return NULL for an end-of-list. +* +*/ +static inline struct scatterlist *sg_next (struct scatterlist *sg) +{ + sg++; + +if (unlikely (sg_is_chain (sg))) + sg =sg_chain_ptr (sg); + +return sg; +}/* * Loop over each sg element, following the pointer to a new list if necessary
@@ -29,4 +57,51 @@ static inline void sg_init_one(struct scatterlist *sg, const void *buf,#define for_each_sg (sglist, sg, nr, __i) \ for (__i = 0, sg = (sglist); __i < (nr); __i++, sg = sg_next(sg)) +/** +* sg_last - return the last scatterlist entry in a list +* @sgl: First entry in the scatterlist +* @nents: Number of entries in the scatterlist +* +* Should only be used casually, it (currently) scan the entire list +* to get the last entry. +* +* Note that the @sgl@ pointer passed in need not be the first one, +* the important bit is that @nents@ denotes the number of entries that +* exist from @sgl@. +* +*/ +static inline struct scatterlist *sg_last (struct scatterlist *sgl, +unsigned int nents) +{ +#ifdef ARCH_HAS_SG_CHAIN +struct scatterlist *ret = &sgl[nents -1 ]; +#else +struct scatterlist *sg, *ret =NULL ; +int i; + +for_each_sg (sgl, sg, nents, i) + ret = sg; + +#endif +return ret; +} + +/** +* sg_chain - Chain two sglists together +* @prv: First scatterlist +* @prv_nents: Number of entries in prv +* @sgl: Second scatterlist +* +* Links @prv@ and @sgl@ together, to form a longer scatterlist. +* +*/ +static inline void sg_chain (struct scatterlist *prv,unsigned int prv_nents, +struct scatterlist *sgl) +{ +#ifndef ARCH_HAS_SG_CHAIN +BUG (); +#endif + prv[prv_nents -1 ].page = (struct page *) ((unsigned long ) sgl |0x01 ); +} +#endif /* _LINUX_SCATTERLIST_H */
Signature · 1 line
1.5.2.rc1
PATCH 7/19 i386 dma_map_sg: convert to using sg helpers
In reply to Jens AxboeThe dma mapping helpers need to be converted to using sg helpers as well, so they will work with a chained sglist setup.
--- include/asm-i386/dma-mapping.h | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
include/asm-i386/dma-mapping.h +7 -6
@@ -2,10 +2,10 @@#define _ASM_I386_DMA_MAPPING_H#include <linux/mm.h> +#include <linux/scatterlist.h> #include <asm/cache.h> #include <asm/io.h> -#include <asm/scatterlist.h> #include <asm/bug.h> #define dma_alloc_noncoherent (d, s, h, f) dma_alloc_coherent(d, s, h, f)
@@ -35,18 +35,19 @@ dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, }static inline int -dma_map_sg (struct device *dev,struct scatterlist *sg,int nents, +dma_map_sg (struct device *dev,struct scatterlist *sglist,int nents,enum dma_data_direction direction) { +struct scatterlist *sg;int i;BUG_ON (!valid_dma_direction (direction)); -WARN_ON (nents ==0 || sg[0 ].length ==0 ); +WARN_ON (nents ==0 || sglist[0 ].length ==0 ); -for (i =0 ; i < nents; i++ ) { -BUG_ON (!sg[i].page); +for_each_sg (sglist, sg, nents, i) { +BUG_ON (!sg->page); - sg[i].dma_address =page_to_phys (sg[i].page) + sg[i].offset; + sg->dma_address =page_to_phys (sg->page) + sg->offset; }flush_write_buffers ();
Signature · 1 line
1.5.2.rc1
PATCH 8/19 i386: enable sg chaining
In reply to Jens AxboeWe don't need to do more on x86, there's no iommu to be worried about.
--- include/asm-i386/scatterlist.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
include/asm-i386/scatterlist.h +2 -0
@@ -10,6 +10,8 @@ struct scatterlist {unsigned int length; }; +#define ARCH_HAS_SG_CHAIN +/* These macros should be used after a pci_map_sg call has been done * to get bus addresses of each of the SG entries and their lengths. * You should only work with the number of sg entries pci_map_sg
Signature · 1 line
1.5.2.rc1
PATCH 9/19 swiotlb: sg chaining support
In reply to Jens Axboe--- lib/swiotlb.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-)
lib/swiotlb.c +12 -7
@@ -673,16 +673,17 @@ swiotlb_sync_single_range_for_device(struct device *hwdev, dma_addr_t dev_addr,* same here. */ int -swiotlb_map_sg (struct device *hwdev,struct scatterlist *sg,int nelems, +swiotlb_map_sg (struct device *hwdev,struct scatterlist *sgl,int nelems,int dir) { +struct scatterlist *sg;void *addr;dma_addr_t dev_addr;int i;BUG_ON (dir ==DMA_NONE ); -for (i =0 ; i < nelems; i++, sg++) { +for_each_sg (sgl, sg, nelems, i) { addr =SG_ENT_VIRT_ADDRESS (sg); dev_addr =virt_to_bus (addr);if (swiotlb_force ||address_needs_mapping (hwdev, dev_addr)) {
@@ -692,7 +693,7 @@ swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nelems,to do proper error handling. */ swiotlb_full (hwdev, sg->length, dir,0 );swiotlb_unmap_sg (hwdev, sg - i, i, dir); - sg[0 ].dma_length =0 ; + sgl[0 ].dma_length =0 ;return 0 ; } sg->dma_address =virt_to_bus (map);
@@ -708,19 +709,21 @@ swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nelems,* concerning calls here are the same as for swiotlb_unmap_single() above. */ void -swiotlb_unmap_sg (struct device *hwdev,struct scatterlist *sg,int nelems, +swiotlb_unmap_sg (struct device *hwdev,struct scatterlist *sgl,int nelems,int dir) { +struct scatterlist *sg;int i;BUG_ON (dir ==DMA_NONE ); -for (i =0 ; i < nelems; i++, sg++) +for_each_sg (sgl, sg, nelems, i) {if (sg->dma_address !=SG_ENT_PHYS_ADDRESS (sg))unmap_single (hwdev,bus_to_virt (sg->dma_address), sg->dma_length, dir);else if (dir ==DMA_FROM_DEVICE )dma_mark_clean (SG_ENT_VIRT_ADDRESS (sg), sg->dma_length); + } }/*
@@ -731,19 +734,21 @@ swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nelems,* and usage. */ static void -swiotlb_sync_sg (struct device *hwdev,struct scatterlist *sg, +swiotlb_sync_sg (struct device *hwdev,struct scatterlist *sgl,int nelems,int dir,int target) { +struct scatterlist *sg;int i;BUG_ON (dir ==DMA_NONE ); -for (i =0 ; i < nelems; i++, sg++) +for_each_sg (sgl, sg, nelems, i) {if (sg->dma_address !=SG_ENT_PHYS_ADDRESS (sg))sync_single (hwdev,bus_to_virt (sg->dma_address), sg->dma_length, dir, target);else if (dir ==DMA_FROM_DEVICE )dma_mark_clean (SG_ENT_VIRT_ADDRESS (sg), sg->dma_length); + } }void
Signature · 1 line
1.5.2.rc1
PATCH 10/19 x86-64: update iommu/dma mapping functions to sg helpers
In reply to Jens AxboeThis prepares x86-64 for sg chaining support.
Additional improvements/fixups for pci-gart from
Benny Halevy <[email protected]>
--- arch/x86_64/kernel/pci-calgary.c | 25 +++++++++------- arch/x86_64/kernel/pci-gart.c | 60 ++++++++++++++++++++----------------- arch/x86_64/kernel/pci-nommu.c | 5 ++- 3 files changed, 49 insertions(+), 41 deletions(-)
arch/x86_64/kernel/pci-calgary.c +14 -11
@@ -35,6 +35,7 @@#include <linux/pci_ids.h> #include <linux/pci.h> #include <linux/delay.h> +#include <linux/scatterlist.h> #include <asm/proto.h> #include <asm/calgary.h> #include <asm/tce.h>
@@ -341,17 +342,19 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,static void __calgary_unmap_sg (struct iommu_table *tbl,struct scatterlist *sglist,int nelems,int direction) { -while (nelems--) { +struct scatterlist *s; +int i; + +for_each_sg (sglist, s, nelems, i) {unsigned int npages; -dma_addr_t dma = sglist->dma_address; -unsigned int dmalen = sglist->dma_length; +dma_addr_t dma = s->dma_address; +unsigned int dmalen = s->dma_length;if (dmalen ==0 )break ; npages =num_dma_pages (dma, dmalen);__iommu_free (tbl, dma, npages); - sglist++; } }
@@ -374,10 +377,10 @@ void calgary_unmap_sg(struct device *dev, struct scatterlist *sglist,static int calgary_nontranslate_map_sg (struct device * dev,struct scatterlist *sg,int nelems,int direction) { +struct scatterlist *s;int i; -for (i =0 ; i < nelems; i++ ) { -struct scatterlist *s = &sg[i]; +for_each_sg (sg, s, nelems, i) {BUG_ON (!s->page); s->dma_address =virt_to_bus (page_address (s->page) +s->offset); s->dma_length = s->length;
@@ -389,6 +392,7 @@ int calgary_map_sg(struct device *dev, struct scatterlist *sg, int nelems, int direction) {struct iommu_table *tbl =to_pci_dev (dev)->bus->self->sysdata; +struct scatterlist *s;unsigned long flags;unsigned long vaddr;unsigned int npages;
@@ -400,8 +404,7 @@ int calgary_map_sg(struct device *dev, struct scatterlist *sg,spin_lock_irqsave (&tbl->it_lock, flags); -for (i =0 ; i < nelems; i++ ) { -struct scatterlist *s = &sg[i]; +for_each_sg (sg, s, nelems, i) {BUG_ON (!s->page); vaddr = (unsigned long )page_address (s->page) + s->offset;
@@ -428,9 +431,9 @@ int calgary_map_sg(struct device *dev, struct scatterlist *sg,return nelems; error:__calgary_unmap_sg (tbl, sg, nelems, direction); -for (i =0 ; i < nelems; i++) { - sg[i].dma_address = bad_dma_address; - sg[i].dma_length =0 ; +for_each_sg (sg, s, nelems, i) { + s->dma_address = bad_dma_address; + s->dma_length =0 ; }spin_unlock_irqrestore (&tbl->it_lock, flags);return 0 ;
arch/x86_64/kernel/pci-gart.c +32 -28
153 lines not on this page · raw message
arch/x86_64/kernel/pci-nommu.c +3 -2
@@ -5,6 +5,7 @@#include <linux/pci.h> #include <linux/string.h> #include <linux/dma-mapping.h> +#include <linux/scatterlist.h> #include <asm/proto.h> #include <asm/processor.h>
@@ -57,10 +58,10 @@ void nommu_unmap_single(struct device *dev, dma_addr_t addr,size_t size,int nommu_map_sg (struct device *hwdev,struct scatterlist *sg,int nents,int direction) { +struct scatterlist *s;int i; -for (i =0 ; i < nents; i++ ) { -struct scatterlist *s = &sg[i]; +for_each_sg (sg, s, nents, i) {BUG_ON (!s->page); s->dma_address =virt_to_bus (page_address (s->page) +s->offset);if (!check_addr ("map_sg" , hwdev, s->dma_address, s->length))
Signature · 1 line
1.5.2.rc1
PATCH 11/19 x86-64: enable sg chaining
In reply to Jens Axboe--- include/asm-x86_64/dma-mapping.h | 3 +-- include/asm-x86_64/scatterlist.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)
include/asm-x86_64/dma-mapping.h +1 -2
@@ -6,8 +6,7 @@* documentation. */ - -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/swiotlb.h>
include/asm-x86_64/scatterlist.h +2 -0
@@ -11,6 +11,8 @@ struct scatterlist {unsigned int dma_length; }; +#define ARCH_HAS_SG_CHAIN +#define ISA_DMA_THRESHOLD (0x00ffffff)/* These macros should be used after a pci_map_sg call has been done
Signature · 1 line
1.5.2.rc1
PATCH 12/19 IA64: sg chaining support
In reply to Jens AxboeThis updates the ia64 iommu/pci dma mappers to sg chaining.
--- arch/ia64/hp/common/sba_iommu.c | 14 +++++++------- arch/ia64/sn/pci/pci_dma.c | 11 ++++++----- include/asm-ia64/dma-mapping.h | 1 + include/asm-ia64/scatterlist.h | 2 ++ 4 files changed, 16 insertions(+), 12 deletions(-)
arch/ia64/hp/common/sba_iommu.c +7 -7
@@ -393,7 +393,7 @@ sba_dump_sg( struct ioc *ioc, struct scatterlist *startsg, int nents)printk (KERN_DEBUG " %d : DMA %08lx/%05x CPU %p\n" , nents, startsg->dma_address, startsg->dma_length,sba_sg_address (startsg)); - startsg++; + startsg =sg_next (startsg); } }
@@ -406,7 +406,7 @@ sba_check_sg( struct ioc *ioc, struct scatterlist *startsg, int nents)while (the_nents-- >0 ) {if (sba_sg_address (the_sg) ==0x0UL )sba_dump_sg (NULL , startsg, nents); - the_sg++; + the_sg =sg_next (the_sg); } }
@@ -1198,7 +1198,7 @@ sba_fill_pdir(u32 pide = startsg->dma_address & ~PIDE_FLAG ; dma_offset = (unsigned long ) pide & ~iovp_mask; startsg->dma_address =0 ; - dma_sg++; + dma_sg =sg_next (dma_sg); dma_sg->dma_address = pide | ioc->ibase; pdirp = &(ioc->pdir_base[pide >> iovp_shift]); n_mappings++;
@@ -1225,7 +1225,7 @@ sba_fill_pdir( pdirp++; }while (cnt >0 ); } - startsg++; + startsg =sg_next (startsg); }/* force pdir update */ wmb ();
@@ -1294,7 +1294,7 @@ sba_coalesce_chunks( struct ioc *ioc,while (--nents >0 ) {unsigned long vaddr;/* tmp */ - startsg++; + startsg =sg_next (startsg);/* PARANOID */ startsg->dma_address = startsg->dma_length =0 ;
@@ -1404,7 +1404,7 @@ int sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents, int di#ifdef ALLOW_IOV_BYPASS_SG ASSERT (to_pci_dev (dev)->dma_mask);if (likely ((ioc->dma_mask & ~to_pci_dev (dev)->dma_mask) ==0 )) { -for (sg = sglist ; filled < nents ; filled++, sg++){ +for_each_sg (sglist, sg, nents, filled) { sg->dma_length = sg->length; sg->dma_address =virt_to_phys (sba_sg_address (sg)); }
@@ -1498,7 +1498,7 @@ void sba_unmap_sg (struct device *dev, struct scatterlist *sglist, int nents, inwhile (nents && sglist->dma_length) {sba_unmap_single (dev, sglist->dma_address, sglist->dma_length, dir); - sglist++; + sglist =sg_next (sglist); nents--; }
arch/ia64/sn/pci/pci_dma.c +6 -5
@@ -218,16 +218,17 @@ EXPORT_SYMBOL(sn_dma_unmap_single);* * Unmap a set of streaming mode DMA translations. */ -void sn_dma_unmap_sg (struct device *dev,struct scatterlist *sg, +void sn_dma_unmap_sg (struct device *dev,struct scatterlist *sgl,int nhwentries,int direction) {int i;struct pci_dev *pdev =to_pci_dev (dev);struct sn_pcibus_provider *provider =SN_PCIDEV_BUSPROVIDER (pdev); +struct scatterlist *sg;BUG_ON (dev->bus != &pci_bus_type); -for (i =0 ; i < nhwentries; i++, sg++) { +for_each_sg (sgl, sg, nhwentries, i) { provider->dma_unmap (pdev, sg->dma_address, direction); sg->dma_address = (dma_addr_t )NULL ; sg->dma_length =0 ;
@@ -244,11 +245,11 @@ EXPORT_SYMBOL(sn_dma_unmap_sg);* * Maps each entry of @sg for DMA. */ -int sn_dma_map_sg (struct device *dev,struct scatterlist *sg,int nhwentries, +int sn_dma_map_sg (struct device *dev,struct scatterlist *sgl,int nhwentries,int direction) {unsigned long phys_addr; -struct scatterlist *saved_sg = sg; +struct scatterlist *saved_sg = sgl, *sg;struct pci_dev *pdev =to_pci_dev (dev);struct sn_pcibus_provider *provider =SN_PCIDEV_BUSPROVIDER (pdev);int i;
@@ -258,7 +259,7 @@ int sn_dma_map_sg(struct device *dev, struct scatterlist *sg, int nhwentries,/* * Setup a DMA address for each entry in the scatterlist. */ -for (i =0 ; i < nhwentries; i++, sg++) { +for_each_sg (sgl, sg, nhwentries, i) { phys_addr =SG_ENT_PHYS_ADDRESS (sg); sg->dma_address = provider->dma_map(pdev, phys_addr, sg->length,
include/asm-ia64/dma-mapping.h +1 -0
@@ -5,6 +5,7 @@* Copyright (C) 2003-2004 Hewlett-Packard Co * David Mosberger-Tang <[email protected]> */ +#include <linux/scatterlist.h> #include <asm/machvec.h> #define dma_alloc_coherent platform_dma_alloc_coherent
include/asm-ia64/scatterlist.h +2 -0
@@ -30,4 +30,6 @@ struct scatterlist {#define sg_dma_len (sg) ((sg)->dma_length)#define sg_dma_address (sg) ((sg)->dma_address) +#define ARCH_HAS_SG_CHAIN +#endif /* _ASM_IA64_SCATTERLIST_H */
Signature · 1 line
1.5.2.rc1
PATCH 13/19 PPC: sg chaining support
In reply to Jens AxboeThis updates the ppc iommu/pci dma mappers to sg chaining.
--- arch/powerpc/kernel/dma_64.c | 5 +++-- arch/powerpc/kernel/ibmebus.c | 11 ++++++----- arch/powerpc/kernel/iommu.c | 18 +++++++++++------- arch/powerpc/platforms/ps3/system-bus.c | 5 +++-- include/asm-powerpc/dma-mapping.h | 2 +- include/asm-powerpc/scatterlist.h | 2 ++ 6 files changed, 26 insertions(+), 17 deletions(-)
arch/powerpc/kernel/dma_64.c +3 -2
@@ -154,12 +154,13 @@ static void dma_direct_unmap_single(struct device *dev, dma_addr_t dma_addr, { } -static int dma_direct_map_sg (struct device *dev,struct scatterlist *sg, +static int dma_direct_map_sg (struct device *dev,struct scatterlist *sgl,int nents,enum dma_data_direction direction) { +struct scatterlist *sg;int i; -for (i =0 ; i < nents; i++, sg++) { +for_each_sg (sgl, sg, nents, i) { sg->dma_address = (page_to_phys (sg->page) + sg->offset) | dma_direct_offset; sg->dma_length = sg->length;
arch/powerpc/kernel/ibmebus.c +6 -5
@@ -87,15 +87,16 @@ static void ibmebus_unmap_single(struct device *dev, }static int ibmebus_map_sg (struct device *dev, -struct scatterlist *sg, +struct scatterlist *sgl,int nents,enum dma_data_direction direction) { +struct scatterlist *sg;int i; -for (i =0 ; i < nents; i++) { - sg[i].dma_address = (dma_addr_t )page_address (sg[i].page) - + sg[i].offset; - sg[i].dma_length = sg[i].length; +for_each_sg (sgl, sg, nents, i) { + sg->dma_address = (dma_addr_t )page_address (sg->page) + + sg->offset; + sg->dma_length = sg->length; }return nents;
arch/powerpc/kernel/iommu.c +11 -7
@@ -278,7 +278,7 @@ int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist,dma_addr_t dma_next =0 , dma_addr;unsigned long flags;struct scatterlist *s, *outs, *segstart; -int outcount, incount; +int outcount, incount, i;unsigned long handle;BUG_ON (direction ==DMA_NONE );
@@ -298,7 +298,7 @@ int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist,spin_lock_irqsave (&(tbl->it_lock), flags); -for (s = outs; nelems; nelems--, s++) { +for_each_sg (sglist, s, nelems, i) {unsigned long vaddr, npages, entry, slen; slen = s->length;
@@ -386,7 +386,7 @@ int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist,return outcount; failure: -for (s = &sglist[0 ]; s <= outs; s++) { +for_each_sg (sglist, s, nelems, i) {if (s->dma_length !=0 ) {unsigned long vaddr, npages;
@@ -396,6 +396,8 @@ int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist, s->dma_address =DMA_ERROR_CODE ; s->dma_length =0 ; } +if (s == outs) +break ; }spin_unlock_irqrestore (&(tbl->it_lock), flags);return 0 ;
@@ -405,6 +407,7 @@ int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist,void iommu_unmap_sg (struct iommu_table *tbl,struct scatterlist *sglist,int nelems,enum dma_data_direction direction) { +struct scatterlist *sg;unsigned long flags;BUG_ON (direction ==DMA_NONE );
@@ -414,15 +417,16 @@ void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,spin_lock_irqsave (&(tbl->it_lock), flags); + sg = sglist;while (nelems--) {unsigned int npages; -dma_addr_t dma_handle = sglist->dma_address; +dma_addr_t dma_handle = sg->dma_address; -if (sglist->dma_length ==0 ) +if (sg->dma_length ==0 )break ; - npages =iommu_num_pages (dma_handle,sglist->dma_length); + npages =iommu_num_pages (dma_handle, sg->dma_length);__iommu_free (tbl, dma_handle, npages); - sglist++; + sg =sg_next (sg); }/* Flush/invalidate TLBs if necessary. As for iommu_free(), we
arch/powerpc/platforms/ps3/system-bus.c +3 -2
@@ -271,7 +271,7 @@ static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr, } } -static int ps3_map_sg (struct device *_dev,struct scatterlist *sg,int nents, +static int ps3_map_sg (struct device *_dev,struct scatterlist *sgl,int nents,enum dma_data_direction direction) {#if defined(CONFIG_PS3_DYNAMIC_DMA )
@@ -279,9 +279,10 @@ static int ps3_map_sg(struct device *_dev, struct scatterlist *sg, int nents,return -EPERM ;#else struct ps3_system_bus_device *dev =to_ps3_system_bus_device (_dev); +struct scatterlist *sg;int i; -for (i =0 ; i < nents; i++, sg++) { +for_each_sg (sgl, sg, nents, i) {int result =ps3_dma_map (dev->d_region,page_to_phys (sg->page) + sg->offset, sg->length, &sg->dma_address);
include/asm-powerpc/dma-mapping.h +1 -1
@@ -12,7 +12,7 @@#include <linux/cache.h> /* need struct page definitions */ #include <linux/mm.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <asm/io.h> #define DMA_ERROR_CODE (~(dma_addr_t)0x0)
include/asm-powerpc/scatterlist.h +2 -0
@@ -41,5 +41,7 @@ struct scatterlist {#define ISA_DMA_THRESHOLD (~0UL)#endif +#define ARCH_HAS_SG_CHAIN +#endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_SCATTERLIST_H */
Signature · 1 line
1.5.2.rc1
PATCH 14/19 SPARC: sg chaining support
In reply to Jens AxboeThis updates the sparc iommu/pci dma mappers to sg chaining.
--- arch/sparc/kernel/ioport.c | 25 +++++++++++++------------ arch/sparc/mm/io-unit.c | 12 +++++++----- arch/sparc/mm/iommu.c | 10 +++++----- arch/sparc/mm/sun4c.c | 10 ++++++---- include/asm-sparc/scatterlist.h | 2 ++ 5 files changed, 33 insertions(+), 26 deletions(-)
arch/sparc/kernel/ioport.c +13 -12
@@ -35,6 +35,7 @@#include <linux/slab.h> #include <linux/pci.h> /* struct pci_dev */ #include <linux/proc_fs.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/vaddrs.h>
@@ -717,19 +718,19 @@ void pci_unmap_page(struct pci_dev *hwdev,* Device ownership issues as mentioned above for pci_map_single are * the same here. */ -int pci_map_sg (struct pci_dev *hwdev,struct scatterlist *sg,int nents, +int pci_map_sg (struct pci_dev *hwdev,struct scatterlist *sgl,int nents,int direction) { +struct scatterlist *sg;int n;BUG_ON (direction ==PCI_DMA_NONE );/* IIep is write-through, not flushing. */ -for (n =0 ; n < nents; n++) { +for_each_sg (sgl, sg, nents, n) {BUG_ON (page_address (sg->page) ==NULL ); sg->dvma_address =virt_to_phys (page_address (sg->page)) + sg->offset; sg->dvma_length = sg->length; - sg++; }return nents; }
@@ -738,19 +739,19 @@ int pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nents,* Again, cpu read rules concerning calls here are the same as for * pci_unmap_single() above. */ -void pci_unmap_sg (struct pci_dev *hwdev,struct scatterlist *sg,int nents, +void pci_unmap_sg (struct pci_dev *hwdev,struct scatterlist *sgl,int nents,int direction) { +struct scatterlist *sg;int n;BUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) { -for (n =0 ; n < nents; n++) { +for_each_sg (sgl, sg, nents, n) {BUG_ON (page_address (sg->page) ==NULL );mmu_inval_dma_area ( (unsigned long )page_address (sg->page), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); - sg++; } } }
@@ -789,34 +790,34 @@ void pci_dma_sync_single_for_device(struct pci_dev *hwdev, dma_addr_t ba, size_t* The same as pci_dma_sync_single_* but for a scatter-gather list, * same rules and usage. */ -void pci_dma_sync_sg_for_cpu (struct pci_dev *hwdev,struct scatterlist *sg,int nents,int direction) +void pci_dma_sync_sg_for_cpu (struct pci_dev *hwdev,struct scatterlist *sgl,int nents,int direction) { +struct scatterlist *sg;int n;BUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) { -for (n =0 ; n < nents; n++) { +for_each_sg (sgl, sg, nents, n) {BUG_ON (page_address (sg->page) ==NULL );mmu_inval_dma_area ( (unsigned long )page_address (sg->page), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); - sg++; } } } -void pci_dma_sync_sg_for_device (struct pci_dev *hwdev,struct scatterlist *sg,int nents,int direction) +void pci_dma_sync_sg_for_device (struct pci_dev *hwdev,struct scatterlist *sgl,int nents,int direction) { +struct scatterlist *sg;int n;BUG_ON (direction ==PCI_DMA_NONE );if (direction !=PCI_DMA_TODEVICE ) { -for (n =0 ; n < nents; n++) { +for_each_sg (sgl, sg, nents, n) {BUG_ON (page_address (sg->page) ==NULL );mmu_inval_dma_area ( (unsigned long )page_address (sg->page), (sg->length +PAGE_SIZE -1 ) &PAGE_MASK ); - sg++; } } }
arch/sparc/mm/io-unit.c +7 -5
@@ -11,8 +11,8 @@#include <linux/mm.h> #include <linux/highmem.h> /* pte_offset_map => kmap_atomic */ #include <linux/bitops.h> +#include <linux/scatterlist.h> -#include <asm/scatterlist.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> #include <asm/sbus.h>
@@ -144,8 +144,9 @@ static void iounit_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_busspin_lock_irqsave (&iounit->lock, flags);while (sz !=0 ) { --sz; - sg[sz].dvma_address =iounit_get_area (iounit, (unsigned long )page_address (sg[sz].page) + sg[sz].offset, sg[sz].length); - sg[sz].dvma_length = sg[sz].length; + sg->dvma_address =iounit_get_area (iounit, (unsigned long )page_address (sg->page) + sg->offset, sg->length); + sg->dvma_length = sg->length; + sg =sg_next (sg); }spin_unlock_irqrestore (&iounit->lock, flags); }
@@ -173,11 +174,12 @@ static void iounit_release_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_spin_lock_irqsave (&iounit->lock, flags);while (sz !=0 ) { --sz; - len = ((sg[sz].dvma_address & ~PAGE_MASK ) + sg[sz].length + (PAGE_SIZE -1 )) >>PAGE_SHIFT ; - vaddr = (sg[sz].dvma_address -IOUNIT_DMA_BASE ) >>PAGE_SHIFT ; + len = ((sg->dvma_address & ~PAGE_MASK ) + sg->length + (PAGE_SIZE -1 )) >>PAGE_SHIFT ; + vaddr = (sg->dvma_address -IOUNIT_DMA_BASE ) >>PAGE_SHIFT ;IOD (("iounit_release %08lx-%08lx\n" , (long )vaddr, (long )len+vaddr));for (len += vaddr; vaddr < len; vaddr++)clear_bit (vaddr, iounit->bmap); + sg =sg_next (sg); }spin_unlock_irqrestore (&iounit->lock, flags); }
arch/sparc/mm/iommu.c +5 -5
@@ -12,8 +12,8 @@#include <linux/mm.h> #include <linux/slab.h> #include <linux/highmem.h> /* pte_offset_map => kmap_atomic */ +#include <linux/scatterlist.h> -#include <asm/scatterlist.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> #include <asm/sbus.h>
@@ -240,7 +240,7 @@ static void iommu_get_scsi_sgl_noflush(struct scatterlist *sg, int sz, struct sb n = (sg->length + sg->offset +PAGE_SIZE -1 ) >>PAGE_SHIFT ; sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; - sg++; + sg =sg_next (sg); } }
@@ -254,7 +254,7 @@ static void iommu_get_scsi_sgl_gflush(struct scatterlist *sg, int sz, struct sbu n = (sg->length + sg->offset +PAGE_SIZE -1 ) >>PAGE_SHIFT ; sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; - sg++; + sg =sg_next (sg); } }
@@ -285,7 +285,7 @@ static void iommu_get_scsi_sgl_pflush(struct scatterlist *sg, int sz, struct sbu sg->dvma_address =iommu_get_one (sg->page, n, sbus) + sg->offset; sg->dvma_length = (__u32 ) sg->length; - sg++; + sg =sg_next (sg); } }
@@ -325,7 +325,7 @@ static void iommu_release_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_b n = (sg->length + sg->offset +PAGE_SIZE -1 ) >>PAGE_SHIFT ;iommu_release_one (sg->dvma_address &PAGE_MASK , n, sbus); sg->dvma_address =0x21212121 ; - sg++; + sg =sg_next (sg); } }
arch/sparc/mm/sun4c.c +6 -4
@@ -17,8 +17,8 @@#include <linux/highmem.h> #include <linux/fs.h> #include <linux/seq_file.h> +#include <linux/scatterlist.h> -#include <asm/scatterlist.h> #include <asm/page.h> #include <asm/pgalloc.h> #include <asm/pgtable.h>
@@ -1229,8 +1229,9 @@ static void sun4c_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus * {while (sz !=0 ) { --sz; - sg[sz].dvma_address = (__u32 )sun4c_lockarea (page_address (sg[sz].page) + sg[sz].offset, sg[sz].length); - sg[sz].dvma_length = sg[sz].length; + sg->dvma_address = (__u32 )sun4c_lockarea (page_address (sg->page) + sg->offset, sg->length); + sg->dvma_length = sg->length; + sg =sg_next (sg); } }
@@ -1245,7 +1246,8 @@ static void sun4c_release_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_b {while (sz !=0 ) { --sz; -sun4c_unlockarea ((char *)sg[sz].dvma_address, sg[sz].length); +sun4c_unlockarea ((char *)sg->dvma_address, sg->length); + sg =sg_next (sg); } }
include/asm-sparc/scatterlist.h +2 -0
@@ -19,4 +19,6 @@ struct scatterlist {#define ISA_DMA_THRESHOLD (~0UL) +#define ARCH_HAS_SG_CHAIN +#endif /* !(_SPARC_SCATTERLIST_H) */
Signature · 1 line
1.5.2.rc1
PATCH 15/19 SPARC64: sg chaining support
In reply to Jens AxboeThis updates the sparc64 iommu/pci dma mappers to sg chaining.
--- arch/sparc64/kernel/pci_iommu.c | 39 +++++++++++++++++++++----------- arch/sparc64/kernel/pci_sun4v.c | 32 ++++++++++++++++----------- arch/sparc64/kernel/sbus.c | 44 ++++++++++++++++++++++-------------- include/asm-sparc64/scatterlist.h | 2 + 4 files changed, 73 insertions(+), 44 deletions(-)
arch/sparc64/kernel/pci_iommu.c +25 -14
@@ -9,6 +9,7 @@#include <linux/mm.h> #include <linux/delay.h> #include <linux/pci.h> +#include <linux/scatterlist.h> #include <asm/oplib.h>
@@ -470,7 +471,7 @@ static inline 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 + nelems; +struct scatterlist *sg_end =sg_last (sg, nelems);int i;for (i =0 ; i < nused; i++) {
@@ -505,7 +506,7 @@ static inline void fill_sg(iopte_t *iopte, struct scatterlist *sg, len -= (IO_PAGE_SIZE - (tmp & (IO_PAGE_SIZE -1UL )));break ; } - sg++; + sg =sg_next (sg); } pteval = iopte_protection | (pteval &IOPTE_PAGE );
@@ -518,7 +519,7 @@ static inline void fill_sg(iopte_t *iopte, struct scatterlist *sg, } pteval = (pteval &IOPTE_PAGE ) + len; - sg++; + sg =sg_next (sg);/* Skip over any tail mappings we've fully mapped, * adjusting pteval along the way. Stop when we
@@ -530,12 +531,12 @@ static inline void fill_sg(iopte_t *iopte, struct scatterlist *sg, ((pteval ^ (SG_ENT_PHYS_ADDRESS(sg) + sg->length - 1UL)) >> IO_PAGE_SHIFT) == 0UL) { pteval += sg->length; - sg++; + sg =sg_next (sg); }if ((pteval << (64 -IO_PAGE_SHIFT )) ==0UL ) pteval = ~0UL ; }while (dma_npages !=0 ); - dma_sg++; + dma_sg =sg_next (dma_sg); } }
@@ -599,7 +600,7 @@ static int pci_4u_map_sg(struct pci_dev *pdev, struct scatterlist *sglist, int n sgtmp = sglist;while (used && sgtmp->dma_length) { sgtmp->dma_address += dma_base; - sgtmp++; + sgtmp =sg_next (sgtmp); used--; } used = nelems - used;
@@ -635,6 +636,7 @@ static void pci_4u_unmap_sg(struct pci_dev *pdev, struct scatterlist *sglist, instruct strbuf *strbuf;iopte_t *base;unsigned long flags, ctx, i, npages; +struct scatterlist *sg, *sgprv;u32 bus_addr;if (unlikely (direction ==PCI_DMA_NONE )) {
@@ -647,11 +649,15 @@ static void pci_4u_unmap_sg(struct pci_dev *pdev, struct scatterlist *sglist, in bus_addr = sglist->dma_address &IO_PAGE_MASK ; -for (i =1 ; i < nelems; i++) -if (sglist[i].dma_length ==0 ) + sgprv =NULL ; +for_each_sg (sglist, sg, nelems, i) { +if (sg->dma_length ==0 )break ; - i--; - npages = (IO_PAGE_ALIGN (sglist[i].dma_address + sglist[i].dma_length) - + + sgprv = sg; + } + + npages = (IO_PAGE_ALIGN (sgprv->dma_address + sgprv->dma_length) - bus_addr) >>IO_PAGE_SHIFT ; base = iommu->page_table +
@@ -730,6 +736,7 @@ static void pci_4u_dma_sync_sg_for_cpu(struct pci_dev *pdev, struct scatterliststruct iommu *iommu;struct strbuf *strbuf;unsigned long flags, ctx, npages, i; +struct scatterlist *sg, *sgprv;u32 bus_addr; iommu = pdev->dev.archdata.iommu;
@@ -753,11 +760,15 @@ static void pci_4u_dma_sync_sg_for_cpu(struct pci_dev *pdev, struct scatterlist/* Step 2: Kick data out of streaming buffers. */ bus_addr = sglist[0 ].dma_address &IO_PAGE_MASK ; -for (i =1 ; i < nelems; i++) -if (!sglist[i].dma_length) + sgprv =NULL ; +for_each_sg (sglist, sg, nelems, i) { +if (sg->dma_length ==0 )break ; - i--; - npages = (IO_PAGE_ALIGN (sglist[i].dma_address + sglist[i].dma_length) + + sgprv = sg; + } + + npages = (IO_PAGE_ALIGN (sgprv->dma_address + sgprv->dma_length) - bus_addr) >>IO_PAGE_SHIFT ;pci_strbuf_flush (strbuf, iommu, bus_addr, ctx, npages, direction);
arch/sparc64/kernel/pci_sun4v.c +19 -13
@@ -12,6 +12,7 @@#include <linux/percpu.h> #include <linux/irq.h> #include <linux/msi.h> +#include <linux/scatterlist.h> #include <asm/iommu.h> #include <asm/irq.h>
@@ -364,7 +365,7 @@ static inline long fill_sg(long entry, struct pci_dev *pdev, int nused, int nelems, unsigned long prot) { struct scatterlist *dma_sg = sg; -struct scatterlist *sg_end = sg + nelems; +struct scatterlist *sg_end =sg_last (sg, nelems);unsigned long flags;int i;
@@ -404,7 +405,7 @@ static inline long fill_sg(long entry, struct pci_dev *pdev, len -= (IO_PAGE_SIZE - (tmp & (IO_PAGE_SIZE -1UL )));break ; } - sg++; + sg =sg_next (sg); } pteval = (pteval &IOPTE_PAGE );
@@ -422,24 +423,25 @@ static inline long fill_sg(long entry, struct pci_dev *pdev, } pteval = (pteval &IOPTE_PAGE ) + len; - sg++; + sg =sg_next (sg);/* 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 && - (pteval << (64 -IO_PAGE_SHIFT )) !=0UL && +while ((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++; +if (sg == sg_end) +break ; + sg =sg_next (sg); }if ((pteval << (64 -IO_PAGE_SHIFT )) ==0UL ) pteval = ~0UL ; }while (dma_npages !=0 ); - dma_sg++; + dma_sg =sg_next (dma_sg); }if (unlikely (pci_iommu_batch_end () <0L ))
@@ -499,7 +501,7 @@ static int pci_4v_map_sg(struct pci_dev *pdev, struct scatterlist *sglist, int n sgtmp = sglist;while (used && sgtmp->dma_length) { sgtmp->dma_address += dma_base; - sgtmp++; + sgtmp =sg_next (sgtmp); used--; } used = nelems - used;
@@ -533,6 +535,7 @@ static void pci_4v_unmap_sg(struct pci_dev *pdev, struct scatterlist *sglist, instruct pci_pbm_info *pbm;struct iommu *iommu;unsigned long flags, i, npages; +struct scatterlist *sg, *sgprv;long entry;u32 devhandle, bus_addr;
@@ -546,12 +549,15 @@ static void pci_4v_unmap_sg(struct pci_dev *pdev, struct scatterlist *sglist, in devhandle = pbm->devhandle; bus_addr = sglist->dma_address &IO_PAGE_MASK ; - -for (i =1 ; i < nelems; i++) -if (sglist[i].dma_length ==0 ) + sgprv =NULL ; +for_each_sg (sglist, sg, nelems, i) { +if (sg->dma_length ==0 )break ; - i--; - npages = (IO_PAGE_ALIGN (sglist[i].dma_address + sglist[i].dma_length) - + + sgprv = sg; + } + + npages = (IO_PAGE_ALIGN (sgprv->dma_address + sgprv->dma_length) - bus_addr) >>IO_PAGE_SHIFT ; entry = ((bus_addr - iommu->page_table_map_base) >>IO_PAGE_SHIFT );
arch/sparc64/kernel/sbus.c +27 -17
114 lines not on this page · raw message
include/asm-sparc64/scatterlist.h +2 -0
@@ -20,4 +20,6 @@ struct scatterlist {#define ISA_DMA_THRESHOLD (~0UL) +#define ARCH_HAS_SG_CHAIN +#endif /* !(_SPARC64_SCATTERLIST_H) */
Signature · 1 line
1.5.2.rc1
PATCH 16/19 scsi: simplify scsi_free_sgtable()
In reply to Jens AxboeJust pass in the command, no point in passing in the scatterlist and scatterlist pool index seperately.
--- drivers/scsi/scsi_lib.c | 9 +++++---- drivers/scsi/scsi_tgt_lib.c | 4 ++-- include/scsi/scsi_cmnd.h | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-)
drivers/scsi/scsi_lib.c +5 -4
@@ -745,13 +745,14 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)EXPORT_SYMBOL (scsi_alloc_sgtable); -void scsi_free_sgtable (struct scatterlist *sgl,int index) +void scsi_free_sgtable (struct scsi_cmnd *cmd) { +struct scatterlist *sgl = cmd->request_buffer;struct scsi_host_sg_pool *sgp; -BUG_ON (index >=SG_MEMPOOL_NR ); +BUG_ON (cmd->sglist_len >=SG_MEMPOOL_NR ); - sgp = scsi_sg_pools + index; + sgp = scsi_sg_pools + cmd->sglist_len;mempool_free (sgl, sgp->pool); }
@@ -777,7 +778,7 @@ EXPORT_SYMBOL(scsi_free_sgtable);static void scsi_release_buffers (struct scsi_cmnd *cmd) {if (cmd->use_sg) -scsi_free_sgtable (cmd->request_buffer, cmd->sglist_len); +scsi_free_sgtable (cmd);/* * Zero these out. They now point to freed memory, and it is
drivers/scsi/scsi_tgt_lib.c +2 -2
@@ -329,7 +329,7 @@ static void scsi_tgt_cmd_done(struct scsi_cmnd *cmd)scsi_tgt_uspace_send_status (cmd, tcmd->tag);if (cmd->request_buffer) -scsi_free_sgtable (cmd->request_buffer, cmd->sglist_len); +scsi_free_sgtable (cmd);queue_work (scsi_tgtd, &tcmd->work); }
@@ -370,7 +370,7 @@ static int scsi_tgt_init_cmd(struct scsi_cmnd *cmd, gfp_t gfp_mask) }eprintk ("cmd %p cnt %d\n" , cmd, cmd->use_sg); -scsi_free_sgtable (cmd->request_buffer, cmd->sglist_len); +scsi_free_sgtable (cmd);return -EINVAL ; }
include/scsi/scsi_cmnd.h +1 -1
@@ -133,6 +133,6 @@ extern void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count,extern void scsi_kunmap_atomic_sg (void *virt);extern struct scatterlist *scsi_alloc_sgtable (struct scsi_cmnd *,gfp_t ); -extern void scsi_free_sgtable (struct scatterlist *,int ); +extern void scsi_free_sgtable (struct scsi_cmnd *);#endif /* _SCSI_SCSI_CMND_H */
Signature · 1 line
1.5.2.rc1
PATCH 17/19 SCSI: support for allocating large scatterlists
In reply to Jens AxboeThis is what enables large commands. If we need to allocate an sgtable that doesn't fit in a single page, allocate several SCSI_MAX_SG_SEGMENTS sized tables and chain them together.
SCSI defaults to large chained sg tables, if the arch supports it.
--- drivers/scsi/scsi_lib.c | 210 +++++++++++++++++++++++++++++++++++---------- include/scsi/scsi.h | 7 -- include/scsi/scsi_cmnd.h | 1 + 3 files changed, 164 insertions(+), 54 deletions(-)
drivers/scsi/scsi_lib.c +163 -47
@@ -29,39 +29,26 @@#include "scsi_priv.h" #include "scsi_logging.h" +#include <linux/scatterlist.h> #define SG_MEMPOOL_NR ARRAY_SIZE(scsi_sg_pools)#define SG_MEMPOOL_SIZE 2struct scsi_host_sg_pool {size_t size; -char *name; +char *name;struct kmem_cache *slab;mempool_t *pool; }; -#if (SCSI_MAX_PHYS_SEGMENTS <32 ) -#error SCSI_MAX_PHYS_SEGMENTS is too small -#endif - -#define SP (x) { x, "sgpool-" #x } +#define SP (x) { x, "sgpool-" #x }static struct scsi_host_sg_pool scsi_sg_pools[] = {SP (8 ),SP (16 ),SP (32 ), -#if (SCSI_MAX_PHYS_SEGMENTS > 32)SP (64 ), -#if (SCSI_MAX_PHYS_SEGMENTS > 64)SP (128 ), -#if (SCSI_MAX_PHYS_SEGMENTS > 128) - SP(256), -#if (SCSI_MAX_PHYS_SEGMENTS > 256) -#error SCSI_MAX_PHYS_SEGMENTS is too large -#endif -#endif -#endif -#endif -}; +};#undef SPstatic void scsi_run_queue (struct request_queue *q);
@@ -702,45 +689,126 @@ static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int uptodate,return NULL ; } -struct scatterlist *scsi_alloc_sgtable (struct scsi_cmnd *cmd,gfp_t gfp_mask) -{ -struct scsi_host_sg_pool *sgp; -struct scatterlist *sgl; +/* +* The maximum number of SG segments that we will put inside a scatterlist +* (unless chaining is used). Should ideally fit inside a single page, to +* avoid a higher order allocation. +*/ +#define SCSI_MAX_SG_SEGMENTS 128 -BUG_ON (!cmd->use_sg); +/* +* Like SCSI_MAX_SG_SEGMENTS, but for archs that have sg chaining. This limit +* is totally arbitrary, a setting of 2048 will get you at least 8mb ios. +*/ +#define SCSI_MAX_SG_CHAIN_SEGMENTS 2048 -switch (cmd->use_sg) { +static inline unsigned int scsi_sgtable_index (unsigned short nents) +{ +unsigned int index; + +switch (nents) { case 1 ... 8: - cmd->sglist_len =0 ; + index =0 ;break ; case 9 ... 16: - cmd->sglist_len =1 ; + index =1 ;break ; case 17 ... 32: - cmd->sglist_len =2 ; + index =2 ;break ; -#if (SCSI_MAX_PHYS_SEGMENTS >32 ) case 33 ... 64: - cmd->sglist_len =3 ; -break ; -#if (SCSI_MAX_PHYS_SEGMENTS >64 ) - case 65 ... 128: - cmd->sglist_len =4 ; + index =3 ;break ; -#if (SCSI_MAX_PHYS_SEGMENTS >128 ) - case 129 ... 256: - cmd->sglist_len =5 ; + case 65 ... SCSI_MAX_SG_SEGMENTS: + index =4 ;break ; -#endif -#endif -#endif default : -return NULL ; +printk (KERN_ERR "scsi: bad segment count=%d\n" , nents); +BUG (); } - sgp = scsi_sg_pools + cmd->sglist_len; - sgl =mempool_alloc (sgp->pool, gfp_mask); -return sgl; +return index; +} + +struct scatterlist *scsi_alloc_sgtable (struct scsi_cmnd *cmd,gfp_t gfp_mask) +{ +struct scsi_host_sg_pool *sgp; +struct scatterlist *sgl, *prev, *ret; +unsigned int index; +int this, left; + +BUG_ON (!cmd->use_sg); + + left = cmd->use_sg; + ret = prev =NULL ; +do { + this = left; +if (this >SCSI_MAX_SG_SEGMENTS ) { + this =SCSI_MAX_SG_SEGMENTS -1 ; + index =SG_MEMPOOL_NR -1 ; + }else + index =scsi_sgtable_index (this); + + left -= this; + + sgp = scsi_sg_pools + index; + + sgl =mempool_alloc (sgp->pool, gfp_mask); +if (unlikely (!sgl)) + goto enomem; + +memset (sgl,0 ,sizeof (*sgl) * sgp->size); + +/* +* first loop through, set initial index and return value +*/ +if (!ret) { + cmd->sglist_len = index; + ret = sgl; + } + +/* +* chain previous sglist, if any. we know the previous +* sglist must be the biggest one, or we would not have +* ended up doing another loop. +*/ +if (prev) +sg_chain (prev,SCSI_MAX_SG_SEGMENTS , sgl); + +/* +* don't allow subsequent mempool allocs to sleep, it would +* violate the mempool principle. +*/ + gfp_mask &= ~__GFP_WAIT; + gfp_mask |= __GFP_HIGH; + prev = sgl; + }while (left); + +/* +* ->use_sg may get modified after dma mapping has potentially +* shrunk the number of segments, so keep a copy of it for free. +*/ + cmd->__use_sg = cmd->use_sg; +return ret; +enomem: +if (ret) { +/* +* Free entries chained off ret. Since we were trying to +* allocate another sglist, we know that all entries are of +* the max size. +*/ + sgp = scsi_sg_pools +SG_MEMPOOL_NR -1 ; + prev = ret; + ret = &ret[SCSI_MAX_SG_SEGMENTS -1 ]; + +while ((sgl =sg_chain_ptr (ret)) !=NULL ) { + ret = &sgl[SCSI_MAX_SG_SEGMENTS -1 ]; +mempool_free (sgl, sgp->pool); + } + +mempool_free (prev, sgp->pool); + } +return NULL ; }EXPORT_SYMBOL (scsi_alloc_sgtable);
@@ -752,6 +820,42 @@ void scsi_free_sgtable(struct scsi_cmnd *cmd)BUG_ON (cmd->sglist_len >=SG_MEMPOOL_NR ); +/* +* if this is the biggest size sglist, check if we have +* chained parts we need to free +*/ +if (cmd->__use_sg >SCSI_MAX_SG_SEGMENTS ) { +unsigned short this, left; +struct scatterlist *next; +unsigned int index; + + left = cmd->__use_sg - (SCSI_MAX_SG_SEGMENTS -1 ); + next =sg_chain_ptr (&sgl[SCSI_MAX_SG_SEGMENTS -1 ]); +do { + sgl = next; + this = left; +if (this >SCSI_MAX_SG_SEGMENTS ) { + this =SCSI_MAX_SG_SEGMENTS -1 ; + index =SG_MEMPOOL_NR -1 ; + }else + index =scsi_sgtable_index (this); + + left -= this; + + sgp = scsi_sg_pools + index; + +if (left) + next =sg_chain_ptr (&sgl[sgp->size -1 ]); + +mempool_free (sgl, sgp->pool); + }while (left); + +/* +* Restore original, will be freed below +*/ + sgl = cmd->request_buffer; + } + sgp = scsi_sg_pools + cmd->sglist_len;mempool_free (sgl, sgp->pool); }
@@ -993,7 +1097,6 @@ EXPORT_SYMBOL(scsi_io_completion);static int scsi_init_io (struct scsi_cmnd *cmd) {struct request *req = cmd->request; -struct scatterlist *sgpnt;int count;/*
@@ -1006,14 +1109,13 @@ static int scsi_init_io(struct scsi_cmnd *cmd)/* * If sg table allocation fails, requeue request later. */ - sgpnt =scsi_alloc_sgtable (cmd,GFP_ATOMIC ); -if (unlikely (!sgpnt)) { + cmd->request_buffer =scsi_alloc_sgtable (cmd,GFP_ATOMIC ); +if (unlikely (!cmd->request_buffer)) {scsi_unprep_request (req);return BLKPREP_DEFER ; } req->buffer =NULL ; - cmd->request_buffer = (char *) sgpnt;if (blk_pc_request (req)) cmd->request_bufflen = req->data_len;else
@@ -1577,8 +1679,22 @@ struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost,if (!q)return NULL ; +/* +* this limit is imposed by hardware restrictions +*/ blk_queue_max_hw_segments (q, shost->sg_tablesize); -blk_queue_max_phys_segments (q,SCSI_MAX_PHYS_SEGMENTS ); + +/* +* In the future, sg chaining support will be mandatory and this +* ifdef can then go away. Right now we don't have all archs +* converted, so better keep it safe. +*/ +#ifdef ARCH_HAS_SG_CHAIN +blk_queue_max_phys_segments (q,SCSI_MAX_SG_CHAIN_SEGMENTS ); +#else +blk_queue_max_phys_segments (q,SCSI_MAX_SG_SEGMENTS ); +#endif +blk_queue_max_sectors (q, shost->max_sectors);blk_queue_bounce_limit (q,scsi_calculate_bounce_limit (shost));blk_queue_segment_boundary (q, shost->dma_boundary);
include/scsi/scsi.h +0 -7
@@ -11,13 +11,6 @@#include <linux/types.h> /* -* The maximum sg list length SCSI can cope with -* (currently must be a power of 2 between 32 and 256) -*/ -#define SCSI_MAX_PHYS_SEGMENTS MAX_PHYS_SEGMENTS - - -/* * SCSI command lengths */
include/scsi/scsi_cmnd.h +1 -0
@@ -72,6 +72,7 @@ struct scsi_cmnd {/* These elements define the operation we ultimately want to perform */ unsigned short use_sg;/* Number of pieces of scatter-gather */ unsigned short sglist_len;/* size of malloc'd scatter-gather list */ +unsigned short __use_sg;unsigned underflow;/* Return error if less than this amount is transferred */
Signature · 1 line
1.5.2.rc1
PATCH 18/19 ll_rw_blk: temporarily enable max_segments tweaking
In reply to Jens AxboeExpose this setting for now, so that users can play with enabling large commands without defaulting it to on globally. This is a debug patch, it will be dropped for the final versions.
--- block/ll_rw_blk.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-)
block/ll_rw_blk.c +23 -0
@@ -3980,7 +3980,23 @@ static ssize_t queue_max_hw_sectors_show(struct request_queue *q, char *page)return queue_var_show (max_hw_sectors_kb, (page)); } +static ssize_t queue_max_segments_show (struct request_queue *q,char *page) +{ +return queue_var_show (q->max_phys_segments, page); +} + +static ssize_t queue_max_segments_store (struct request_queue *q, +const char *page,size_t count) +{ +unsigned long segments; +ssize_t ret =queue_var_store (&segments, page, count); +spin_lock_irq (q->queue_lock); + q->max_phys_segments = segments; +spin_unlock_irq (q->queue_lock); + +return ret; +}static struct queue_sysfs_entry queue_requests_entry = { .attr = {.name ="nr_requests" , .mode =S_IRUGO |S_IWUSR }, .show = queue_requests_show,
@@ -4004,6 +4020,12 @@ static struct queue_sysfs_entry queue_max_hw_sectors_entry = { .show = queue_max_hw_sectors_show, }; +static struct queue_sysfs_entry queue_max_segments_entry = { + .attr = {.name ="max_segments" , .mode =S_IRUGO |S_IWUSR }, + .show = queue_max_segments_show, + .store = queue_max_segments_store, +}; +static struct queue_sysfs_entry queue_iosched_entry = { .attr = {.name ="scheduler" , .mode =S_IRUGO |S_IWUSR }, .show = elv_iosched_show,
@@ -4015,6 +4037,7 @@ static struct attribute *default_attrs[] = { &queue_ra_entry.attr, &queue_max_hw_sectors_entry.attr, &queue_max_sectors_entry.attr, + &queue_max_segments_entry.attr, &queue_iosched_entry.attr, NULL, };
Signature · 1 line
1.5.2.rc1
PATCH 19/19 drivers: sg chaining support
In reply to Jens AxboeThis converts SCSI/IDE/etc drivers to sg chaining support. The patches exist as seperate entities in the #sglist branch of the block git repo, but collated here to avoid a huge thread.
arch/ia64/hp/sim/simscsi.c +14 -9
@@ -173,7 +173,7 @@ simscsi_sg_readwrite (struct scsi_cmnd *sc, int mode, unsigned long offset)return ; } offset += sl->length; - sl++; + sl =sg_next (sl); list_len--; } sc->result =GOOD ;
@@ -239,18 +239,23 @@ simscsi_readwrite10 (struct scsi_cmnd *sc, int mode)static void simscsi_fillresult (struct scsi_cmnd *sc,char *buf,unsigned len) { -int scatterlen = sc->use_sg; -struct scatterlist *slp; +int scatterlen = sc->use_sg, i; +struct scatterlist *slp, *sg;if (scatterlen ==0 )memcpy (sc->request_buffer, buf, len); -else for (slp = (struct scatterlist *)sc->request_buffer; - scatterlen-- >0 && len >0 ; slp++) { -unsigned thislen =min (len, slp->length); +else { + slp = sc->request_buffer; +for_each_sg (slp, sg, scatterlen, i) { +unsigned thislen; -memcpy (page_address (slp->page) + slp->offset, buf, thislen); - slp++; - len -= thislen; +if (len <=0 ) +break ; + + thislen =min (len, slp->length); +memcpy (page_address (sg->page) + sg->offset, buf, thislen); + len -= thislen; + } } }
drivers/ide/cris/ide-cris.c +2 -1
@@ -951,7 +951,8 @@ static int cris_ide_build_dmatable (ide_drive_t *drive)/* group sequential buffers into one large buffer */ addr =page_to_phys (sg->page) + sg->offset; size =sg_dma_len (sg); -while (sg++, --i) { +while (--i) { + sg =sg_next (sg);if ((addr + size) !=page_to_phys (sg->page) + sg->offset)break ; size +=sg_dma_len (sg);
drivers/ide/ide-dma.c +1 -1
@@ -292,7 +292,7 @@ int ide_build_dmatable (ide_drive_t *drive, struct request *rq) } } - sg++; + sg =sg_next (sg); i--; }
drivers/ide/ide-taskfile.c +13 -4
@@ -259,6 +259,7 @@ static void ide_pio_sector(ide_drive_t *drive, unsigned int write) {ide_hwif_t *hwif = drive->hwif;struct scatterlist *sg = hwif->sg_table; +struct scatterlist *cursg = hwif->cursg;struct page *page;#ifdef CONFIG_HIGHMEM unsigned long flags;
@@ -266,8 +267,14 @@ static void ide_pio_sector(ide_drive_t *drive, unsigned int write)unsigned int offset;u8 *buf; - page = sg[hwif->cursg].page; - offset = sg[hwif->cursg].offset + hwif->cursg_ofs *SECTOR_SIZE ; + cursg = hwif->cursg; +if (!cursg) { + cursg = sg; + hwif->cursg = sg; + } + + page = cursg->page; + offset = cursg->offset + hwif->cursg_ofs *SECTOR_SIZE ;/* get the current page and offset */ page =nth_page (page, (offset >>PAGE_SHIFT ));
@@ -281,8 +288,8 @@ static void ide_pio_sector(ide_drive_t *drive, unsigned int write) hwif->nleft--; hwif->cursg_ofs++; -if ((hwif->cursg_ofs *SECTOR_SIZE ) == sg[hwif->cursg].length) { - hwif->cursg++; +if ((hwif->cursg_ofs *SECTOR_SIZE ) == cursg->length) { + hwif->cursg =sg_next (hwif->cursg); hwif->cursg_ofs =0 ; }
@@ -363,6 +370,8 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq,static void task_end_request (ide_drive_t *drive,struct request *rq,u8 stat) { +HWIF (drive)->cursg =NULL ; +if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE ) {ide_task_t *task = rq->special;
drivers/ide/mips/au1xxx-ide.c +1 -1
@@ -324,7 +324,7 @@ static int auide_build_dmatable(ide_drive_t *drive) cur_addr += tc; cur_len -= tc; } - sg++; + sg =sg_next (sg); i--; }
drivers/ide/pci/sgiioc4.c +1 -1
@@ -531,7 +531,7 @@ sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir) } } - sg++; + sg =sg_next (sg); i--; }
drivers/ide/ppc/pmac.c +1 -1
@@ -1648,7 +1648,7 @@ pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq) cur_len -= tc; ++table; } - sg++; + sg =sg_next (sg); i--; }
drivers/infiniband/hw/ipath/ipath_dma.c +5 -4
@@ -96,17 +96,18 @@ static void ipath_dma_unmap_page(struct ib_device *dev,BUG_ON (!valid_dma_direction (direction)); } -static int ipath_map_sg (struct ib_device *dev,struct scatterlist *sg,int nents, -enum dma_data_direction direction) +static int ipath_map_sg (struct ib_device *dev,struct scatterlist *sgl, +int nents,enum dma_data_direction direction) { +struct scatterlist *sg;u64 addr;int i;int ret = nents;BUG_ON (!valid_dma_direction (direction)); -for (i =0 ; i < nents; i++) { - addr = (u64 )page_address (sg[i].page); +for_each_sg (sgl, sg, nents, i) { + addr = (u64 )page_address (sg->page);/* TODO: handle highmem pages */ if (!addr) { ret =0 ;
drivers/infiniband/ulp/iser/iser_memory.c +40 -35
157 lines not on this page · raw message
drivers/infiniband/ulp/srp/ib_srp.c +12 -10
@@ -595,6 +595,7 @@ static int srp_map_fmr(struct srp_target_port *target, struct scatterlist *scat,int ret;struct srp_device *dev = target->srp_host->dev;struct ib_device *ibdev = dev->dev; +struct scatterlist *sg;if (!dev->fmr_pool)return -ENODEV ;
@@ -604,16 +605,16 @@ static int srp_map_fmr(struct srp_target_port *target, struct scatterlist *scat,return -EINVAL ; len = page_cnt =0 ; -for (i =0 ; i < sg_cnt; ++i) { -unsigned int dma_len =ib_sg_dma_len (ibdev, &scat[i]); +for_each_sg (scat, sg, sg_cnt, i) { +unsigned int dma_len =ib_sg_dma_len (ibdev, sg); -if (ib_sg_dma_address (ibdev, &scat[i]) & ~dev->fmr_page_mask) { +if (ib_sg_dma_address (ibdev, sg) & ~dev->fmr_page_mask) {if (i >0 )return -EINVAL ;else ++page_cnt; } -if ((ib_sg_dma_address (ibdev, &scat[i]) + dma_len) & +if ((ib_sg_dma_address (ibdev, sg) + dma_len) & ~dev->fmr_page_mask) {if (i < sg_cnt -1 )return -EINVAL ;
@@ -633,12 +634,12 @@ static int srp_map_fmr(struct srp_target_port *target, struct scatterlist *scat,return -ENOMEM ; page_cnt =0 ; -for (i =0 ; i < sg_cnt; ++i) { -unsigned int dma_len =ib_sg_dma_len (ibdev, &scat[i]); +for_each_sg (scat, sg, sg_cnt, i) { +unsigned int dma_len =ib_sg_dma_len (ibdev, sg);for (j =0 ; j < dma_len; j += dev->fmr_page_size) dma_pages[page_cnt++] = - (ib_sg_dma_address (ibdev, &scat[i]) & + (ib_sg_dma_address (ibdev, sg) & dev->fmr_page_mask) + j; }
@@ -724,6 +725,7 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,* descriptor. */ struct srp_indirect_buf *buf = (void *) cmd->add_data; +struct scatterlist *sg;u32 datalen =0 ;int i;
@@ -732,11 +734,11 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,sizeof (struct srp_indirect_buf ) + count *sizeof (struct srp_direct_buf ); -for (i =0 ; i < count; ++i) { -unsigned int dma_len =ib_sg_dma_len (ibdev, &scat[i]); +for_each_sg (scat, sg, count, i) { +unsigned int dma_len =ib_sg_dma_len (ibdev, sg); buf->desc_list[i].va = -cpu_to_be64 (ib_sg_dma_address (ibdev, &scat[i])); +cpu_to_be64 (ib_sg_dma_address (ibdev, sg)); buf->desc_list[i].key =cpu_to_be32 (dev->mr->rkey); buf->desc_list[i].len =cpu_to_be32 (dma_len);
drivers/message/fusion/mptscsih.c +2 -2
@@ -315,7 +315,7 @@ nextSGEset: v2 =sg_dma_address (sg);mptscsih_add_sge (psge, sgflags | thisxfer, v2); - sg++;/* Get next SG element from the OS */ + sg =sg_next (sg);/* Get next SG element from the OS */ psge += (sizeof (u32) +sizeof (dma_addr_t)); sgeOffset += (sizeof (u32) +sizeof (dma_addr_t)); sg_done++;
@@ -336,7 +336,7 @@ nextSGEset: v2 =sg_dma_address (sg);mptscsih_add_sge (psge, sgflags | thisxfer, v2);/* -sg++; +sg = sg_next(sg); psge += (sizeof(u32) + sizeof(dma_addr_t)); */ sgeOffset += (sizeof (u32) +sizeof (dma_addr_t));
drivers/scsi/3w-9xxx.c +4 -4
@@ -1815,7 +1815,7 @@ static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,u32 num_sectors =0x0 ;int i, sg_count;struct scsi_cmnd *srb =NULL ; -struct scatterlist *sglist =NULL ; +struct scatterlist *sglist =NULL , *sg;dma_addr_t buffaddr =0x0 ;int retval =1 ;
@@ -1893,9 +1893,9 @@ static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,if (sg_count ==0 ) goto out; -for (i =0 ; i < sg_count; i++) { - command_packet->sg_list[i].address =TW_CPU_TO_SGL (sg_dma_address (&sglist[i])); - command_packet->sg_list[i].length =cpu_to_le32 (sg_dma_len (&sglist[i])); +for_each_sg (sglist, sg, sg_count, i) { + command_packet->sg_list[i].address =TW_CPU_TO_SGL (sg_dma_address (sg)); + command_packet->sg_list[i].length =cpu_to_le32 (sg_dma_len (sg));if (command_packet->sg_list[i].address &TW_CPU_TO_SGL (TW_ALIGNMENT_9000_SGL )) {TW_PRINTK (tw_dev->host,TW_DRIVER ,0x2e ,"Found unaligned sgl address during execute scsi" ); goto out;
drivers/scsi/3w-xxxx.c +4 -4
@@ -1767,7 +1767,7 @@ static int tw_scsiop_read_write(TW_Device_Extension *tw_dev, int request_id)u32 lba =0x0 , num_sectors =0x0 , buffaddr =0x0 ;int i, use_sg;struct scsi_cmnd *srb; -struct scatterlist *sglist; +struct scatterlist *sglist, *sg;dprintk (KERN_NOTICE "3w-xxxx: tw_scsiop_read_write()\n" );
@@ -1837,9 +1837,9 @@ static int tw_scsiop_read_write(TW_Device_Extension *tw_dev, int request_id)if (use_sg ==0 )return 1 ; -for (i=0 ;i<use_sg; i++) { - command_packet->byte8.io.sgl[i].address =sg_dma_address (&sglist[i]); - command_packet->byte8.io.sgl[i].length =sg_dma_len (&sglist[i]); +for_each_sg (sglist, sg, use_sg, i) { + command_packet->byte8.io.sgl[i].address =sg_dma_address (sg); + command_packet->byte8.io.sgl[i].length =sg_dma_len (sg); command_packet->size+=2 ; } }
drivers/scsi/53c700.c +7 -9
@@ -1887,6 +1887,7 @@ NCR_700_queuecommand(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *))int i;int sg_count;dma_addr_t vPtr =0 ; +struct scatterlist *sgl, *sg;__u32 count =0 ;if (SCp->use_sg) {
@@ -1902,15 +1903,12 @@ NCR_700_queuecommand(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)) slot->dma_handle = vPtr; sg_count =1 ; } - - -for (i =0 ; i < sg_count; i++) { - -if (SCp->use_sg) { -struct scatterlist *sg = SCp->request_buffer; - - vPtr =sg_dma_address (&sg[i]); - count =sg_dma_len (&sg[i]); + + sgl = SCp->request_buffer; +for_each_sg (sgl, sg, sg_count, i) { +if (SCp->use_sg) { + vPtr =sg_dma_address (sg); + count =sg_dma_len (sg); } slot->SG[i].ins =bS_to_host (move_ins | count);
drivers/scsi/BusLogic.c +4 -3
@@ -2862,6 +2862,7 @@ static int BusLogic_QueueCommand(struct scsi_cmnd *Command, void (*CompletionRou Command->sc_data_direction); }else if (SegmentCount !=0 ) {struct scatterlist *ScatterList = (struct scatterlist *) BufferPointer; +struct scatterlist *sg;int Segment, Count; Count = pci_map_sg(HostAdapter->PCI_Device, ScatterList, SegmentCount,
@@ -2872,9 +2873,9 @@ static int BusLogic_QueueCommand(struct scsi_cmnd *Command, void (*CompletionRouCCB ->DataPointer = (unsigned int )CCB ->DMA_Handle + ((unsigned long ) &CCB ->ScatterGatherList - (unsigned long )CCB ); else CCB->DataPointer = Virtual_to_32Bit_Virtual(CCB->ScatterGatherList); -for (Segment =0 ; Segment < Count; Segment++) { -CCB ->ScatterGatherList[Segment].SegmentByteCount =sg_dma_len (ScatterList + Segment); -CCB ->ScatterGatherList[Segment].SegmentDataPointer =sg_dma_address (ScatterList + Segment); +for_each_sg (ScatterList, sg, Count, Segment) { +CCB ->ScatterGatherList[Segment].SegmentByteCount =sg_dma_len (sg); +CCB ->ScatterGatherList[Segment].SegmentDataPointer =sg_dma_address (sg); } }else {CCB ->Opcode = BusLogic_InitiatorCCB;
drivers/scsi/NCR53c406a.c +10 -8
@@ -875,12 +875,13 @@ static void NCR53c406a_intr(void *dev_id)if (!current_SC->use_sg)/* Don't use scatter-gather */ NCR53c406a_pio_write (current_SC->request_buffer, current_SC->request_bufflen);else {/* use scatter-gather */ +struct scatterlist *sg; +int i; + sgcount = current_SC->use_sg; sglist = current_SC->request_buffer; -while (sgcount--) { -NCR53c406a_pio_write (page_address (sglist->page) + sglist->offset, sglist->length); - sglist++; - } +for_each_sg (sglist, sg, sgcount, i) +NCR53c406a_pio_write (page_address (sg->page) + sg->offset, sg->length); }REG0 ;#endif /* USE_PIO */
@@ -902,12 +903,13 @@ static void NCR53c406a_intr(void *dev_id)if (!current_SC->use_sg)/* Don't use scatter-gather */ NCR53c406a_pio_read (current_SC->request_buffer, current_SC->request_bufflen);else {/* Use scatter-gather */ +struct scatterlist *sg; +int i; + sgcount = current_SC->use_sg; sglist = current_SC->request_buffer; -while (sgcount--) { -NCR53c406a_pio_read (page_address (sglist->page) + sglist->offset, sglist->length); - sglist++; - } +for_each_sg (sglist, sg, sgcount, i) +NCR53c406a_pio_read (page_address (sg->page) + sg->offset, sg->length); }REG0 ;#endif /* USE_PIO */
drivers/scsi/a100u2w.c +5 -4
@@ -796,7 +796,7 @@ static void orc_interrupt(*****************************************************************************/ static void inia100BuildSCB (ORC_HCS * pHCB,ORC_SCB * pSCB,struct scsi_cmnd * SCpnt) {/* Create corresponding SCB */ -struct scatterlist *pSrbSG; +struct scatterlist *pSrbSG, *sg;ORC_SG *pSG;/* Pointer to SG list */ int i, count_sg;ESCB *pEScb;
@@ -820,9 +820,10 @@ static void inia100BuildSCB(ORC_HCS * pHCB, ORC_SCB * pSCB, struct scsi_cmnd * S count_sg =pci_map_sg (pHCB->pdev, pSrbSG, SCpnt->use_sg, SCpnt->sc_data_direction); pSCB->SCB_SGLen = (U32 ) (count_sg *8 ); -for (i =0 ; i < count_sg; i++, pSG++, pSrbSG++) { - pSG->SG_Ptr = (U32 )sg_dma_address (pSrbSG); - pSG->SG_Len = (U32 )sg_dma_len (pSrbSG); +for_each_sg (pSrbSG, sg, count_sg, i) { + pSG->SG_Ptr = (U32 )sg_dma_address (sg); + pSG->SG_Len = (U32 )sg_dma_len (sg); + pSG++; } }else if (SCpnt->request_bufflen !=0 ) {/* Non SG */ pSCB->SCB_SGLen =0x8 ;
drivers/scsi/aacraid/aachba.c +13 -16
@@ -2347,7 +2347,7 @@ static unsigned long aac_build_sg(struct scsi_cmnd* scsicmd, struct sgmap* psg) psg->sg[0 ].addr =0 ; psg->sg[0 ].count =0 ;if (scsicmd->use_sg) { -struct scatterlist *sg; +struct scatterlist *sg, *s;int i;int sg_count; sg = (struct scatterlist *) scsicmd->request_buffer;
@@ -2356,11 +2356,10 @@ static unsigned long aac_build_sg(struct scsi_cmnd* scsicmd, struct sgmap* psg) scsicmd->sc_data_direction); psg->count =cpu_to_le32 (sg_count); -for (i =0 ; i < sg_count; i++) { - psg->sg[i].addr =cpu_to_le32 (sg_dma_address (sg)); - psg->sg[i].count =cpu_to_le32 (sg_dma_len (sg)); - byte_count +=sg_dma_len (sg); - sg++; +for_each_sg (sg, s, sg_count, i) { + psg->sg[i].addr =cpu_to_le32 (sg_dma_address (s)); + psg->sg[i].count =cpu_to_le32 (sg_dma_len (s)); + byte_count +=sg_dma_len (s); }/* hba wants the size to be exact */ if (byte_count > scsicmd->request_bufflen){
@@ -2404,7 +2403,7 @@ static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* p psg->sg[0 ].addr[1 ] =0 ; psg->sg[0 ].count =0 ;if (scsicmd->use_sg) { -struct scatterlist *sg; +struct scatterlist *sg, *s;int i;int sg_count; sg = (struct scatterlist *) scsicmd->request_buffer;
@@ -2412,14 +2411,13 @@ static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* p sg_count =pci_map_sg (dev->pdev, sg, scsicmd->use_sg, scsicmd->sc_data_direction); -for (i =0 ; i < sg_count; i++) { -int count =sg_dma_len (sg); - addr =sg_dma_address (sg); +for_each_sg (sg, s, sg_count, i) { +int count =sg_dma_len (s); + addr =sg_dma_address (s); psg->sg[i].addr[0 ] =cpu_to_le32 (addr &0xffffffff ); psg->sg[i].addr[1 ] =cpu_to_le32 (addr>>32 ); psg->sg[i].count =cpu_to_le32 (count); byte_count += count; - sg++; } psg->count =cpu_to_le32 (sg_count);/* hba wants the size to be exact */
@@ -2465,7 +2463,7 @@ static unsigned long aac_build_sgraw(struct scsi_cmnd* scsicmd, struct sgmapraw* psg->sg[0 ].count =0 ; psg->sg[0 ].flags =0 ;if (scsicmd->use_sg) { -struct scatterlist *sg; +struct scatterlist *sg, *s;int i;int sg_count; sg = (struct scatterlist *) scsicmd->request_buffer;
@@ -2473,9 +2471,9 @@ static unsigned long aac_build_sgraw(struct scsi_cmnd* scsicmd, struct sgmapraw* sg_count =pci_map_sg (dev->pdev, sg, scsicmd->use_sg, scsicmd->sc_data_direction); -for (i =0 ; i < sg_count; i++) { -int count =sg_dma_len (sg); -u64 addr =sg_dma_address (sg); +for_each_sg (sg, s, sg_count, i) { +int count =sg_dma_len (s); +u64 addr =sg_dma_address (s); psg->sg[i].next =0 ; psg->sg[i].prev =0 ; psg->sg[i].addr[1 ] =cpu_to_le32 ((u32)(addr>>32 ));
@@ -2483,7 +2481,6 @@ static unsigned long aac_build_sgraw(struct scsi_cmnd* scsicmd, struct sgmapraw* psg->sg[i].count =cpu_to_le32 (count); psg->sg[i].flags =0 ; byte_count += count; - sg++; } psg->count =cpu_to_le32 (sg_count);/* hba wants the size to be exact */
drivers/scsi/advansys.c +10 -11
@@ -6468,7 +6468,7 @@ asc_build_req(asc_board_t *boardp, struct scsi_cmnd *scp)*/ int sgcnt;int use_sg; -struct scatterlist *slp; +struct scatterlist *slp, *sg; slp = (struct scatterlist *)scp->request_buffer; use_sg =dma_map_sg (dev, slp, scp->use_sg, scp->sc_data_direction);
@@ -6502,10 +6502,10 @@ asc_build_req(asc_board_t *boardp, struct scsi_cmnd *scp)/* * Convert scatter-gather list into ASC_SG_HEAD list. */ -for (sgcnt =0 ; sgcnt < use_sg; sgcnt++, slp++) { - asc_sg_head.sg_list[sgcnt].addr =cpu_to_le32 (sg_dma_address (slp)); - asc_sg_head.sg_list[sgcnt].bytes =cpu_to_le32 (sg_dma_len (slp)); -ASC_STATS_ADD (scp->device->host, sg_xfer,ASC_CEILING (sg_dma_len (slp),512 )); +for_each_sg (slp, sg, use_sg, sgcnt) { + asc_sg_head.sg_list[sgcnt].addr =cpu_to_le32 (sg_dma_address (sg)); + asc_sg_head.sg_list[sgcnt].bytes =cpu_to_le32 (sg_dma_len (sg)); +ASC_STATS_ADD (scp->device->host, sg_xfer,ASC_CEILING (sg_dma_len (sg),512 )); } }
@@ -6700,7 +6700,7 @@ adv_get_sglist(asc_board_t *boardp, adv_req_t *reqp, struct scsi_cmnd *scp, int {adv_sgblk_t *sgblkp;ADV_SCSI_REQ_Q *scsiqp; -struct scatterlist *slp; +struct scatterlist *slp, *sg;int sg_elem_cnt;ADV_SG_BLOCK *sg_block, *prev_sg_block;ADV_PADDR sg_block_paddr;
@@ -6778,11 +6778,11 @@ adv_get_sglist(asc_board_t *boardp, adv_req_t *reqp, struct scsi_cmnd *scp, int } } -for (i =0 ; i <NO_OF_SG_PER_BLOCK ; i++) +for_each_sg (slp, sg,NO_OF_SG_PER_BLOCK , i) { - sg_block->sg_list[i].sg_addr =cpu_to_le32 (sg_dma_address (slp)); - sg_block->sg_list[i].sg_count =cpu_to_le32 (sg_dma_len (slp)); -ASC_STATS_ADD (scp->device->host, sg_xfer,ASC_CEILING (sg_dma_len (slp),512 )); + sg_block->sg_list[i].sg_addr =cpu_to_le32 (sg_dma_address (sg)); + sg_block->sg_list[i].sg_count =cpu_to_le32 (sg_dma_len (sg)); +ASC_STATS_ADD (scp->device->host, sg_xfer,ASC_CEILING (sg_dma_len (sg),512 ));if (--sg_elem_cnt ==0 ) {/* Last ADV_SG_BLOCK and scatter-gather entry. */
@@ -6790,7 +6790,6 @@ adv_get_sglist(asc_board_t *boardp, adv_req_t *reqp, struct scsi_cmnd *scp, int sg_block->sg_ptr =0L ;/* Last ADV_SG_BLOCK in list. */ return ADV_SUCCESS ; } - slp++; } sg_block->sg_cnt =NO_OF_SG_PER_BLOCK ; prev_sg_block = sg_block;
drivers/scsi/aha1542.c +10 -11
@@ -691,7 +691,7 @@ static int aha1542_queuecommand(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))memcpy (ccb[mbo].cdb, cmd, ccb[mbo].cdblen);if (SCpnt->use_sg) { -struct scatterlist *sgpnt; +struct scatterlist *sgpnt, *sg;struct chain *cptr;#ifdef DEBUG unsigned char *ptr;
@@ -706,16 +706,15 @@ static int aha1542_queuecommand(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))HOSTDATA (SCpnt->device->host)->SCint[mbo] =NULL ;return SCSI_MLQUEUE_HOST_BUSY ; } -for (i =0 ; i < SCpnt->use_sg; i++) { -if (sgpnt[i].length ==0 || SCpnt->use_sg >16 || - (((int ) sgpnt[i].offset) &1 ) || (sgpnt[i].length &1 )) { +for_each_sg (sgpnt, sg, SCpnt->use_sg, i) { +if (sg->length ==0 || SCpnt->use_sg >16 || + (((int ) sg->offset) &1 ) || (sg->length &1 )) {unsigned char *ptr;printk (KERN_CRIT "Bad segment list supplied to aha1542.c (%d, %d)\n" , SCpnt->use_sg, i); -for (i =0 ; i < SCpnt->use_sg; i++) { +for_each_sg (sgpnt, sg, SCpnt->use_sg, i) {printk (KERN_CRIT "%d: %p %d\n" , i, - (page_address (sgpnt[i].page) + - sgpnt[i].offset), - sgpnt[i].length); + (page_address (sg->page) + + sg->offset), sg->length); };printk (KERN_CRIT "cptr %x: " , (unsigned int ) cptr); ptr = (unsigned char *) &cptr[i];
@@ -723,10 +722,10 @@ static int aha1542_queuecommand(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))printk ("%02x " , ptr[i]);panic ("Foooooooood fight!" ); }; -any2scsi (cptr[i].dataptr,SCSI_SG_PA (&sgpnt[i])); -if (SCSI_SG_PA (&sgpnt[i]) + sgpnt[i].length -1 >ISA_DMA_THRESHOLD ) +any2scsi (cptr[i].dataptr,SCSI_SG_PA (sg)); +if (SCSI_SG_PA (sg) + sg->length -1 >ISA_DMA_THRESHOLD )BAD_SG_DMA (SCpnt, sgpnt, SCpnt->use_sg, i); -any2scsi (cptr[i].datalen, sgpnt[i].length); +any2scsi (cptr[i].datalen, sg->length); };any2scsi (ccb[mbo].datalen, SCpnt->use_sg *sizeof (struct chain ));any2scsi (ccb[mbo].dataptr,SCSI_BUF_PA (cptr));
drivers/scsi/aha1740.c +4 -4
@@ -425,7 +425,7 @@ static int aha1740_queuecommand(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *)) sgptr->sg_dma_addr = sg_dma;if (SCpnt->use_sg) { -struct scatterlist * sgpnt; +struct scatterlist * sgpnt, * sg;struct aha1740_chain * cptr;int i, count; DEB(unsigned char * ptr);
@@ -436,9 +436,9 @@ static int aha1740_queuecommand(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *)) cptr = sgptr->sg_chain; count =dma_map_sg (&host->edev->dev, sgpnt, SCpnt->use_sg, SCpnt->sc_data_direction); -for (i=0 ; i < count; i++) { - cptr[i].datalen =sg_dma_len (sgpnt + i); - cptr[i].dataptr =sg_dma_address (sgpnt + i); +for_each_sg (sgpnt, sg, count, i) { + cptr[i].datalen =sg_dma_len (sg); + cptr[i].dataptr =sg_dma_address (sg); } host->ecb[ecbno].datalen = count*sizeof (struct aha1740_chain ); host->ecb[ecbno].dataptr = sg_dma;
drivers/scsi/aic7xxx/aic79xx_osm.c +2 -1
@@ -1505,7 +1505,7 @@ ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev, nseg =pci_map_sg (ahd->dev_softc, cur_seg, cmd->use_sg, dir); scb->platform_data->xfer_len =0 ; -for (sg = scb->sg_list; nseg >0 ; nseg--, cur_seg++) { +for (sg = scb->sg_list; nseg >0 ; nseg--) {dma_addr_t addr;bus_size_t len;
@@ -1514,6 +1514,7 @@ ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev, scb->platform_data->xfer_len += len; sg =ahd_sg_setup (ahd, scb, sg, addr, len,/*last*/ nseg ==1 ); + cur_seg =sg_next (cur_seg); } }else if (cmd->request_bufflen !=0 ) {void *sg;
drivers/scsi/aic7xxx/aic7xxx_osm.c +5 -7
@@ -1475,20 +1475,19 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev,if (cmd->use_sg !=0 ) {struct ahc_dma_seg *sg;struct scatterlist *cur_seg; -struct scatterlist *end_seg; -int nseg; +struct scatterlist *sgl; +int nseg, i; - cur_seg = (struct scatterlist *)cmd->request_buffer; - nseg =pci_map_sg (ahc->dev_softc, cur_seg, cmd->use_sg, + sgl = (struct scatterlist *)cmd->request_buffer; + nseg =pci_map_sg (ahc->dev_softc, sgl, cmd->use_sg, cmd->sc_data_direction); - end_seg = cur_seg + nseg;/* Copy the segments into the SG list. */ sg = scb->sg_list;/* * The sg_count may be larger than nseg if * a transfer crosses a 32bit page. */ -while (cur_seg < end_seg) { +for_each_sg (sgl, cur_seg, nseg, i) {dma_addr_t addr;bus_size_t len;int consumed;
@@ -1499,7 +1498,6 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev, sg, addr, len); sg += consumed; scb->sg_count += consumed; - cur_seg++; } sg--; sg->len |=ahc_htole32 (AHC_DMA_LAST_SEG );
drivers/scsi/aic94xx/aic94xx_task.c +3 -3
@@ -89,7 +89,7 @@ static inline int asd_map_scatterlist(struct sas_task *task, res = -ENOMEM ; goto err_unmap; } -for (sc = task->scatter, i =0 ; i < num_sg; i++, sc++) { +for_each_sg (task->scatter, sc, num_sg, i) {struct sg_el *sg = &((struct sg_el *)ascb->sg_arr->vaddr)[i]; sg->bus_addr =cpu_to_le64 ((u64 )sg_dma_address (sc));
@@ -98,7 +98,7 @@ static inline int asd_map_scatterlist(struct sas_task *task, sg->flags |=ASD_SG_EL_LIST_EOL ; } -for (sc = task->scatter, i =0 ; i <2 ; i++, sc++) { +for_each_sg (task->scatter, sc,2 , i) { sg_arr[i].bus_addr =cpu_to_le64 ((u64 )sg_dma_address (sc)); sg_arr[i].size =cpu_to_le32 ((u32 )sg_dma_len (sc));
@@ -110,7 +110,7 @@ static inline int asd_map_scatterlist(struct sas_task *task, sg_arr[2 ].bus_addr=cpu_to_le64 ((u64 )ascb->sg_arr->dma_handle); }else {int i; -for (sc = task->scatter, i =0 ; i < num_sg; i++, sc++) { +for_each_sg (task->scatter, sc, num_sg, i) { sg_arr[i].bus_addr =cpu_to_le64 ((u64 )sg_dma_address (sc)); sg_arr[i].size =cpu_to_le32 ((u32 )sg_dma_len (sc));
drivers/scsi/arcmsr/arcmsr_hba.c +5 -6
@@ -563,18 +563,18 @@ static void arcmsr_build_ccb(struct AdapterControlBlock *acb,memcpy (arcmsr_cdb->Cdb, pcmd->cmnd, pcmd->cmd_len);if (pcmd->use_sg) {int length, sgcount, i, cdb_sgcount =0 ; -struct scatterlist *sl; +struct scatterlist *sl, *sg;/* Get Scatter Gather List from scsiport. */ sl = (struct scatterlist *) pcmd->request_buffer; sgcount =pci_map_sg (acb->pdev, sl, pcmd->use_sg, pcmd->sc_data_direction);/* map stor port SG list to our iop SG List. */ -for (i =0 ; i < sgcount; i++) { +for_each_sg (sl, sg, sgcount, i) {/* Get the physical address of the current data pointer */ - length =cpu_to_le32 (sg_dma_len (sl)); - address_lo =cpu_to_le32 (dma_addr_lo32 (sg_dma_address (sl))); - address_hi =cpu_to_le32 (dma_addr_hi32 (sg_dma_address (sl))); + length =cpu_to_le32 (sg_dma_len (sg)); + address_lo =cpu_to_le32 (dma_addr_lo32 (sg_dma_address (sg))); + address_hi =cpu_to_le32 (dma_addr_hi32 (sg_dma_address (sg)));if (address_hi ==0 ) {struct SG32ENTRY *pdma_sg = (struct SG32ENTRY *)psge;
@@ -591,7 +591,6 @@ static void arcmsr_build_ccb(struct AdapterControlBlock *acb, psge +=sizeof (struct SG64ENTRY ); arccdbsize +=sizeof (struct SG64ENTRY ); } - sl++; cdb_sgcount++; } arcmsr_cdb->sgcount = (uint8_t )cdb_sgcount;
drivers/scsi/dc395x.c +4 -3
@@ -1010,6 +1010,7 @@ static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb,u32 reqlen = cmd->request_bufflen;struct scatterlist *sl = (struct scatterlist *) cmd->request_buffer; +struct scatterlist *sg;struct SGentry *sgp = srb->segment_x; srb->sg_count =pci_map_sg (dcb->acb->dev, sl, cmd->use_sg, dir);
@@ -1018,9 +1019,9 @@ static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb, reqlen, cmd->request_buffer, cmd->use_sg, srb->sg_count); -for (i =0 ; i < srb->sg_count; i++) { -u32 busaddr = (u32 )sg_dma_address (&sl[i]); -u32 seglen = (u32 )sl[i].length; +for_each_sg (sl, sg, srb->sg_count, i) { +u32 busaddr = (u32 )sg_dma_address (sg); +u32 seglen = (u32 )sg->length; sgp[i].address = busaddr; sgp[i].length = seglen; srb->total_xfer_length += seglen;
drivers/scsi/dpt_i2o.c +7 -6
@@ -2141,20 +2141,21 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_d reqlen =14 ;// SINGLE SGE /* Now fill in the SGList and command */ if (cmd->use_sg) { -struct scatterlist *sg = (struct scatterlist *)cmd->request_buffer; -int sg_count =pci_map_sg (pHba->pDev, sg, cmd->use_sg, +struct scatterlist *sgl = (struct scatterlist *)cmd->request_buffer; +struct scatterlist *sg; +int sg_count =pci_map_sg (pHba->pDev, sgl, cmd->use_sg, cmd->sc_data_direction); len =0 ; -for (i =0 ; i < sg_count; i++) { +for_each_sg (sgl, sg, sg_count, i) { *mptr++ = direction|0x10000000 |sg_dma_len (sg); len+=sg_dma_len (sg); *mptr++ =sg_dma_address (sg); - sg++; +/* Make this an end of list */ +if (i == sg_count -1 ) + mptr[-2 ] = direction|0xD0000000 |sg_dma_len (sg); } -/* Make this an end of list */ - mptr[-2 ] = direction|0xD0000000 |sg_dma_len (sg-1 ); reqlen = mptr - msg; *lenptr = len;
drivers/scsi/eata.c +4 -4
@@ -1610,7 +1610,7 @@ static int eata2x_detect(struct scsi_host_template *tpnt)static void map_dma (unsigned int i,struct hostdata *ha) {unsigned int k, count, pci_dir; -struct scatterlist *sgpnt; +struct scatterlist *sgpnt, *sg;struct mscp *cpp;struct scsi_cmnd *SCpnt;
@@ -1646,9 +1646,9 @@ static void map_dma(unsigned int i, struct hostdata *ha) sgpnt = (struct scatterlist *)SCpnt->request_buffer; count =pci_map_sg (ha->pdev, sgpnt, SCpnt->use_sg, pci_dir); -for (k =0 ; k < count; k++) { - cpp->sglist[k].address =H2DEV (sg_dma_address (&sgpnt[k])); - cpp->sglist[k].num_bytes =H2DEV (sg_dma_len (&sgpnt[k])); +for_each_sg (sgpnt, sg, count, k) { + cpp->sglist[k].address =H2DEV (sg_dma_address (sg)); + cpp->sglist[k].num_bytes =H2DEV (sg_dma_len (sg)); } cpp->sg =1 ;
drivers/scsi/esp_scsi.c +3 -2
@@ -325,6 +325,7 @@ static void esp_map_dma(struct esp *esp, struct scsi_cmnd *cmd) {struct esp_cmd_priv *spriv =ESP_CMD_PRIV (cmd);struct scatterlist *sg = cmd->request_buffer; +struct scatterlist *s;int dir = cmd->sc_data_direction;int total, i;
@@ -339,8 +340,8 @@ static void esp_map_dma(struct esp *esp, struct scsi_cmnd *cmd) spriv->cur_sg = sg; total =0 ; -for (i =0 ; i < spriv->u.num_sg; i++) - total +=sg_dma_len (&sg[i]); +for_each_sg (sg, s, spriv->u.num_sg, i) + total +=sg_dma_len (s); spriv->tot_residue = total; }
drivers/scsi/gdth.c +23 -22
123 lines not on this page · raw message
drivers/scsi/hptiop.c +4 -4
@@ -449,6 +449,7 @@ static int hptiop_buildsgl(struct scsi_cmnd *scp, struct hpt_iopsg *psg)struct Scsi_Host *host = scp->device->host;struct hptiop_hba *hba = (struct hptiop_hba *)host->hostdata;struct scatterlist *sglist = (struct scatterlist *)scp->request_buffer; +struct scatterlist *sg;/* * though we'll not get non-use_sg fields anymore,
@@ -463,10 +464,9 @@ static int hptiop_buildsgl(struct scsi_cmnd *scp, struct hpt_iopsg *psg)HPT_SCP (scp)->mapped =1 ;BUG_ON (HPT_SCP (scp)->sgcnt > hba->max_sg_descriptors); -for (idx =0 ; idx <HPT_SCP (scp)->sgcnt; idx++) { - psg[idx].pci_address = -cpu_to_le64 (sg_dma_address (&sglist[idx])); - psg[idx].size =cpu_to_le32 (sg_dma_len (&sglist[idx])); +for_each_sg (sglist, sg,HPT_SCP (scp)->sgcnt, idx) { + psg[idx].pci_address =cpu_to_le64 (sg_dma_address (sg)); + psg[idx].size =cpu_to_le32 (sg_dma_len (sg)); psg[idx].eot = (idx ==HPT_SCP (scp)->sgcnt -1 ) ?cpu_to_le32 (1 ) :0 ; }
drivers/scsi/ibmmca.c +5 -6
@@ -1808,7 +1808,7 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))int host_index;int max_pun;int i; -struct scatterlist *sl; +struct scatterlist *sl, *sg; shpnt = cmd->device->host;/* search for the right hostadapter */
@@ -1938,13 +1938,12 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) scsi_cmd = cmd->cmnd[0 ];if (cmd->use_sg) { - i = cmd->use_sg; sl = (struct scatterlist *) (cmd->request_buffer); -if (i >16 ) +if (cmd->use_sg >16 )panic ("IBM MCA SCSI: scatter-gather list too long.\n" ); -while (--i >=0 ) { -ld (host_index)[ldn].sge[i].address = (void *) (isa_page_to_bus (sl[i].page) + sl[i].offset); -ld (host_index)[ldn].sge[i].byte_length = sl[i].length; +for_each_sg (sl, sg, cmd->use_sg, i) { +ld (host_index)[ldn].sge[i].address = (void *) (isa_page_to_bus (sg->page) + sg->offset); +ld (host_index)[ldn].sge[i].byte_length = sg->length; } scb->enable |=IM_POINTER_TO_LIST ; scb->sys_buf_adr =isa_virt_to_bus (&(ld (host_index)[ldn].sge[0 ]));
drivers/scsi/ibmvscsi/ibmvscsi.c +2 -2
@@ -359,10 +359,10 @@ static int map_sg_list(int num_entries, {int i;u64 total_length =0 ; +struct scatterlist *sg_entry; -for (i =0 ; i < num_entries; ++i) { +for_each_sg (sg, sg_entry, num_entries, i) {struct srp_direct_buf *descr = md + i; -struct scatterlist *sg_entry = &sg[i]; descr->va =sg_dma_address (sg_entry); descr->len =sg_dma_len (sg_entry); descr->key =0 ;
drivers/scsi/ide-scsi.c +19 -12
@@ -70,6 +70,7 @@ typedef struct idescsi_pc_s {u8 *buffer;/* Data buffer */ u8 *current_position;/* Pointer into the above buffer */ struct scatterlist *sg;/* Scatter gather table */ +struct scatterlist *last_sg;/* Last sg element */ int b_count;/* Bytes transferred from current entry */ struct scsi_cmnd *scsi_cmd;/* SCSI command */ void (*done)(struct scsi_cmnd *);/* Scsi completion routine */
@@ -175,11 +176,6 @@ static void idescsi_input_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsignechar *buf;while (bcount) { -if (pc->sg - (struct scatterlist *) pc->scsi_cmd->request_buffer > pc->scsi_cmd->use_sg) { -printk (KERN_ERR "ide-scsi: scatter gather table too small, discarding data\n" ); -idescsi_discard_data (drive, bcount); -return ; - } count =min (pc->sg->length - pc->b_count, bcount);if (PageHighMem (pc->sg->page)) {unsigned long flags;
@@ -198,10 +194,17 @@ static void idescsi_input_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsigne } bcount -= count; pc->b_count += count;if (pc->b_count == pc->sg->length) { - pc->sg++; +if (pc->sg == pc->last_sg) +break ; + pc->sg =sg_next (pc->sg); pc->b_count =0 ; } } + +if (bcount) { +printk (KERN_ERR "ide-scsi: scatter gather table too small, discarding data\n" ); +idescsi_discard_data (drive, bcount); + } }static void idescsi_output_buffers (ide_drive_t *drive,idescsi_pc_t *pc,unsigned int bcount)
@@ -210,11 +213,6 @@ static void idescsi_output_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsignchar *buf;while (bcount) { -if (pc->sg - (struct scatterlist *) pc->scsi_cmd->request_buffer > pc->scsi_cmd->use_sg) { -printk (KERN_ERR "ide-scsi: scatter gather table too small, padding with zeros\n" ); -idescsi_output_zeros (drive, bcount); -return ; - } count =min (pc->sg->length - pc->b_count, bcount);if (PageHighMem (pc->sg->page)) {unsigned long flags;
@@ -233,10 +231,17 @@ static void idescsi_output_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsign } bcount -= count; pc->b_count += count;if (pc->b_count == pc->sg->length) { - pc->sg++; +if (pc->sg == pc->last_sg) +break ; + pc->sg =sg_next (pc->sg); pc->b_count =0 ; } } + +if (bcount) { +printk (KERN_ERR "ide-scsi: scatter gather table too small, padding with zeros\n" ); +idescsi_output_zeros (drive, bcount); + } }/*
@@ -910,9 +915,11 @@ static int idescsi_queue (struct scsi_cmnd *cmd,if (cmd->use_sg) { pc->buffer =NULL ; pc->sg = cmd->request_buffer; + pc->last_sg =sg_last (pc->sg, cmd->use_sg); }else { pc->buffer = cmd->request_buffer; pc->sg =NULL ; + pc->last_sg =NULL ; } pc->b_count =0 ; pc->request_transfer = pc->buffer_size = cmd->request_bufflen;
drivers/scsi/initio.c +7 -5
@@ -2882,7 +2882,7 @@ static int i91u_detect(struct scsi_host_template * tpnt)static void i91uBuildSCB (HCS * pHCB,SCB * pSCB,struct scsi_cmnd * SCpnt) {/* Create corresponding SCB */ -struct scatterlist *pSrbSG; +struct scatterlist *pSrbSG, *sg;SG *pSG;/* Pointer to SG list */ int i;long TotalLen;
@@ -2926,10 +2926,12 @@ static void i91uBuildSCB(HCS * pHCB, SCB * pSCB, struct scsi_cmnd * SCpnt) SCpnt->use_sg, SCpnt->sc_data_direction); pSCB->SCB_Flags |=SCF_SG ;/* Turn on SG list flag */ -for (i =0 , TotalLen =0 , pSG = &pSCB->SCB_SGList[0 ];/* 1.01g */ - i < pSCB->SCB_SGLen; i++, pSG++, pSrbSG++) { - pSG->SG_Ptr =cpu_to_le32 ((u32 )sg_dma_address (pSrbSG)); - TotalLen += pSG->SG_Len =cpu_to_le32 ((u32 )sg_dma_len (pSrbSG)); + pSG = &pSCB->SCB_SGList[0 ]; + TotalLen =0 ; +for_each_sg (pSrbSG, sg, pSCB->SCB_SGLen, i) { + pSG->SG_Ptr =cpu_to_le32 ((u32 )sg_dma_address (sg)); + TotalLen += pSG->SG_Len =cpu_to_le32 ((u32 )sg_dma_len (sg)); + pSG++; } pSCB->SCB_BufLen = (SCpnt->request_bufflen > TotalLen) ?
drivers/scsi/ipr.c +4 -5
@@ -4286,7 +4286,7 @@ static int ipr_build_ioadl(struct ipr_ioa_cfg *ioa_cfg, struct ipr_cmnd *ipr_cmd) {int i; -struct scatterlist *sglist; +struct scatterlist *sglist, *sg;u32 length;u32 ioadl_flags =0 ;struct scsi_cmnd *scsi_cmd = ipr_cmd->scsi_cmd;
@@ -4327,11 +4327,10 @@ static int ipr_build_ioadl(struct ipr_ioa_cfg *ioa_cfg, ioarcb->read_ioadl_addr = ioarcb->write_ioadl_addr; } -for (i =0 ; i < ipr_cmd->dma_use_sg; i++) { +for_each_sg (sglist, sg, ipr_cmd->dma_use_sg, i) { ioadl[i].flags_and_data_len = -cpu_to_be32 (ioadl_flags |sg_dma_len (&sglist[i])); - ioadl[i].address = -cpu_to_be32 (sg_dma_address (&sglist[i])); +cpu_to_be32 (ioadl_flags |sg_dma_len (sg)); + ioadl[i].address =cpu_to_be32 (sg_dma_address (sg)); }if (likely (ipr_cmd->dma_use_sg)) {
drivers/scsi/ips.c +41 -33
134 lines not on this page · raw message
drivers/scsi/iscsi_tcp.c +22 -21
104 lines not on this page · raw message
drivers/scsi/jazz_esp.c +14 -13
@@ -15,6 +15,7 @@#include <linux/blkdev.h> #include <linux/proc_fs.h> #include <linux/stat.h> +#include <linux/dma-mapping.h> #include "scsi.h" #include <scsi/scsi_host.h>
@@ -240,12 +241,13 @@ static void dma_mmu_get_scsi_one (struct NCR_ESP *esp, struct scsi_cmnd *sp)static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp,struct scsi_cmnd *sp) {int sz = sp->SCp.buffers_residual; -struct scatterlist *sg = (struct scatterlist *) sp->SCp.buffer; - -while (sz >=0 ) { - sg[sz].dma_address =vdma_alloc (CPHYSADDR (page_address (sg[sz].page) + sg[sz].offset), sg[sz].length); - sz--; - } +struct scatterlist *sgl = (struct scatterlist *) sp->SCp.buffer; +struct scatterlist *sg; +int i; + +for_each_sg (sgl, sg, sz, i) + sg->dma_address =vdma_alloc (CPHYSADDR (page_address (sg->page) + sg->offset), sg->length); + sp->SCp.ptr=(char *)(sp->SCp.buffer->dma_address); }
@@ -256,13 +258,12 @@ static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, struct scsi_cmnd *sp)static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp,struct scsi_cmnd *sp) { -int sz = sp->use_sg -1 ; -struct scatterlist *sg = (struct scatterlist *)sp->request_buffer; - -while (sz >=0 ) { -vdma_free (sg[sz].dma_address); - sz--; - } +struct scatterlist *sgl = (struct scatterlist *)sp->request_buffer; +struct scatterlist *sg; +int i; + +for_each_sg (sgl, sg, sp->use_sg, i) +vdma_free (sg->dma_address); }static void dma_advance_sg (struct scsi_cmnd *sp)
drivers/scsi/lpfc/lpfc_scsi.c +4 -5
@@ -169,7 +169,7 @@ static int lpfc_scsi_prep_dma_buf(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd) { struct scsi_cmnd *scsi_cmnd = lpfc_cmd->pCmd; -struct scatterlist *sgel =NULL ; +struct scatterlist *sgel =NULL , *sg;struct fcp_cmnd *fcp_cmnd = lpfc_cmd->fcp_cmnd;struct ulp_bde64 *bpl = lpfc_cmd->fcp_bpl;IOCB_t *iocb_cmd = &lpfc_cmd->cur_iocbq.iocb;
@@ -214,18 +214,17 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd)* single scsi command. Just run through the seg_cnt and format * the bde's. */ -for (i =0 ; i < lpfc_cmd->seg_cnt; i++) { - physaddr =sg_dma_address (sgel); +for_each_sg (sgel, sg, lpfc_cmd->seg_cnt, i) { + physaddr =sg_dma_address (sg); bpl->addrLow =le32_to_cpu (putPaddrLow (physaddr)); bpl->addrHigh =le32_to_cpu (putPaddrHigh (physaddr)); - bpl->tus.f.bdeSize =sg_dma_len (sgel); + bpl->tus.f.bdeSize =sg_dma_len (sg);if (datadir ==DMA_TO_DEVICE ) bpl->tus.f.bdeFlags =0 ;else bpl->tus.f.bdeFlags =BUFF_USE_RCV ; bpl->tus.w =le32_to_cpu (bpl->tus.w); bpl++; - sgel++; num_bde++; } }else if (scsi_cmnd->request_buffer && scsi_cmnd->request_bufflen) {
drivers/scsi/mac53c94.c +4 -5
@@ -366,7 +366,7 @@ static void cmd_done(struct fsc_state *state, int result)static void set_dma_cmds (struct fsc_state *state,struct scsi_cmnd *cmd) {int i, dma_cmd, total; -struct scatterlist *scl; +struct scatterlist *scl, *sg;struct dbdma_cmd *dcmds;dma_addr_t dma_addr;u32 dma_len;
@@ -381,9 +381,9 @@ static void set_dma_cmds(struct fsc_state *state, struct scsi_cmnd *cmd) scl = (struct scatterlist *) cmd->request_buffer; nseg =pci_map_sg (state->pdev, scl, cmd->use_sg, cmd->sc_data_direction); -for (i =0 ; i < nseg; ++i) { - dma_addr =sg_dma_address (scl); - dma_len =sg_dma_len (scl); +for_each_sg (scl, sg, nseg, i) { + dma_addr =sg_dma_address (sg); + dma_len =sg_dma_len (sg);if (dma_len >0xffff )panic ("mac53c94: scatterlist element >= 64k" ); total += dma_len;
@@ -391,7 +391,6 @@ static void set_dma_cmds(struct fsc_state *state, struct scsi_cmnd *cmd)st_le16 (&dcmds->command, dma_cmd);st_le32 (&dcmds->phy_addr, dma_addr); dcmds->xfer_status =0 ; - ++scl; ++dcmds; } }else {
drivers/scsi/megaraid.c +6 -7
@@ -1767,7 +1767,7 @@ __mega_busywait_mbox (adapter_t *adapter)static int mega_build_sglist (adapter_t *adapter,scb_t *scb,u32 *buf,u32 *len) { -struct scatterlist *sgl; +struct scatterlist *sgl, *sg;struct page *page;unsigned long offset;unsigned int length;
@@ -1832,15 +1832,14 @@ mega_build_sglist(adapter_t *adapter, scb_t *scb, u32 *buf, u32 *len) *len =0 ; -for ( idx =0 ; idx < sgcnt; idx++, sgl++ ) { - +for_each_sg (sgl, sg, sgcnt, idx) {if ( adapter->has_64bit_addr ) { - scb->sgl64[idx].address =sg_dma_address (sgl); - *len += scb->sgl64[idx].length =sg_dma_len (sgl); + scb->sgl64[idx].address =sg_dma_address (sg); + *len += scb->sgl64[idx].length =sg_dma_len (sg); }else { - scb->sgl[idx].address =sg_dma_address (sgl); - *len += scb->sgl[idx].length =sg_dma_len (sgl); + scb->sgl[idx].address =sg_dma_address (sg); + *len += scb->sgl[idx].length =sg_dma_len (sg); } }
drivers/scsi/megaraid/megaraid_mbox.c +4 -3
@@ -1377,6 +1377,7 @@ static int megaraid_mbox_mksgl(adapter_t *adapter, scb_t *scb) {struct scatterlist *sgl; +struct scatterlist *sg;mbox_ccb_t *ccb;struct page *page;unsigned long offset;
@@ -1429,9 +1430,9 @@ megaraid_mbox_mksgl(adapter_t *adapter, scb_t *scb) scb->dma_type =MRAID_DMA_WSG ; -for (i =0 ; i < sgcnt; i++, sgl++) { - ccb->sgl64[i].address =sg_dma_address (sgl); - ccb->sgl64[i].length =sg_dma_len (sgl); +for_each_sg (sgl, sg, sgcnt, i) { + ccb->sgl64[i].address =sg_dma_address (sg); + ccb->sgl64[i].length =sg_dma_len (sg); }// Return count of SG nodes
drivers/scsi/megaraid/megaraid_sas.c +8 -8
@@ -431,7 +431,7 @@ megasas_make_sgl32(struct megasas_instance *instance, struct scsi_cmnd *scp, {int i;int sge_count; -struct scatterlist *os_sgl; +struct scatterlist *os_sgl, *sg;/* * Return 0 if there is no data transfer
@@ -456,9 +456,9 @@ megasas_make_sgl32(struct megasas_instance *instance, struct scsi_cmnd *scp, sge_count =pci_map_sg (instance->pdev, os_sgl, scp->use_sg, scp->sc_data_direction); -for (i =0 ; i < sge_count; i++, os_sgl++) { - mfi_sgl->sge32[i].length =sg_dma_len (os_sgl); - mfi_sgl->sge32[i].phys_addr =sg_dma_address (os_sgl); +for_each_sg (os_sgl, sg, sge_count, i) { + mfi_sgl->sge32[i].length =sg_dma_len (sg); + mfi_sgl->sge32[i].phys_addr =sg_dma_address (sg); }return sge_count;
@@ -479,7 +479,7 @@ megasas_make_sgl64(struct megasas_instance *instance, struct scsi_cmnd *scp, {int i;int sge_count; -struct scatterlist *os_sgl; +struct scatterlist *os_sgl, *sg;/* * Return 0 if there is no data transfer
@@ -505,9 +505,9 @@ megasas_make_sgl64(struct megasas_instance *instance, struct scsi_cmnd *scp, sge_count =pci_map_sg (instance->pdev, os_sgl, scp->use_sg, scp->sc_data_direction); -for (i =0 ; i < sge_count; i++, os_sgl++) { - mfi_sgl->sge64[i].length =sg_dma_len (os_sgl); - mfi_sgl->sge64[i].phys_addr =sg_dma_address (os_sgl); +for_each_sg (os_sgl, sg, sge_count, i) { + mfi_sgl->sge64[i].length =sg_dma_len (sg); + mfi_sgl->sge64[i].phys_addr =sg_dma_address (sg); }return sge_count;
drivers/scsi/mesh.c +6 -6
@@ -1257,7 +1257,7 @@ static void handle_msgin(struct mesh_state *ms)static void set_dma_cmds (struct mesh_state *ms,struct scsi_cmnd *cmd) {int i, dma_cmd, total, off, dtot; -struct scatterlist *scl; +struct scatterlist *scl, *sg;struct dbdma_cmd *dcmds; dma_cmd = ms->tgts[ms->conn_tgt].data_goes_out?
@@ -1267,17 +1267,17 @@ static void set_dma_cmds(struct mesh_state *ms, struct scsi_cmnd *cmd)if (cmd) { cmd->SCp.this_residual = cmd->request_bufflen;if (cmd->use_sg >0 ) { -int nseg; +int nseg, i; total =0 ; scl = (struct scatterlist *) cmd->request_buffer; off = ms->data_ptr; nseg =pci_map_sg (ms->pdev, scl, cmd->use_sg, cmd->sc_data_direction); -for (i =0 ; i <nseg; ++i, ++scl) { -u32 dma_addr =sg_dma_address (scl); -u32 dma_len =sg_dma_len (scl); +for_each_sg (scl, sg, nseg, i) { +u32 dma_addr =sg_dma_address (sg); +u32 dma_len =sg_dma_len (sg); - total += scl->length; + total += sg->length;if (off >= dma_len) { off -= dma_len;continue ;
drivers/scsi/ncr53c8xx.c +4 -3
@@ -7700,6 +7700,7 @@ static int ncr_scatter(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd) segment =ncr_scatter_no_sglist (np, cp, cmd); else if ((use_sg = map_scsi_sg_data(np, cmd)) > 0) {struct scatterlist *scatter = (struct scatterlist *)cmd->request_buffer; +struct scatterlist *sg;struct scr_tblmove *data;if (use_sg >MAX_SCATTER ) {
@@ -7709,9 +7710,9 @@ static int ncr_scatter(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd) data = &cp->phys.data[MAX_SCATTER - use_sg]; -for (segment =0 ; segment < use_sg; segment++) { -dma_addr_t baddr =sg_dma_address (&scatter[segment]); -unsigned int len =sg_dma_len (&scatter[segment]); +for_each_sg (scatter, sg, use_sg, segment) { +dma_addr_t baddr =sg_dma_address (sg); +unsigned int len =sg_dma_len (sg);ncr_build_sge (np, &data[segment], baddr, len); cp->data_len += len;
drivers/scsi/nsp32.c +4 -5
@@ -888,7 +888,7 @@ static int nsp32_reselection(struct scsi_cmnd *SCpnt, unsigned char newlun)static int nsp32_setup_sg_table (struct scsi_cmnd *SCpnt) {nsp32_hw_data *data = (nsp32_hw_data *)SCpnt->device->host->hostdata; -struct scatterlist *sgl; +struct scatterlist *sgl, *sg;nsp32_sgtable *sgt = data->cur_lunt->sglun->sgt;int num, i;u32_le l;
@@ -906,13 +906,12 @@ static int nsp32_setup_sg_table(struct scsi_cmnd *SCpnt) sgl = (struct scatterlist *)SCpnt->request_buffer; num =pci_map_sg (data->Pci, sgl, SCpnt->use_sg, SCpnt->sc_data_direction); -for (i =0 ; i < num; i++) { +for_each_sg (sgl, sg, num, i) {/* * Build nsp32_sglist, substitute sg dma addresses. */ - sgt[i].addr =cpu_to_le32 (sg_dma_address (sgl)); - sgt[i].len =cpu_to_le32 (sg_dma_len (sgl)); - sgl++; + sgt[i].addr =cpu_to_le32 (sg_dma_address (sg)); + sgt[i].len =cpu_to_le32 (sg_dma_len (sg));if (le32_to_cpu (sgt[i].len) >0x10000 ) { nsp32_msg(KERN_ERR,
drivers/scsi/pcmcia/sym53c500_cs.c +10 -8
@@ -442,12 +442,13 @@ SYM53C500_intr(int irq, void *dev_id)if (!curSC->use_sg)/* Don't use scatter-gather */ SYM53C500_pio_write (fast_pio, port_base, curSC->request_buffer, curSC->request_bufflen);else {/* use scatter-gather */ +struct scatterlist *sg; +int i; + sgcount = curSC->use_sg; sglist = curSC->request_buffer; -while (sgcount--) { -SYM53C500_pio_write (fast_pio, port_base,page_address (sglist->page) + sglist->offset, sglist->length); - sglist++; - } +for_each_sg (sglist, sg, sgcount, i) +SYM53C500_pio_write (fast_pio, port_base,page_address (sg->page) + sg->offset, sg->length); }REG0 (port_base); }
@@ -463,12 +464,13 @@ SYM53C500_intr(int irq, void *dev_id)if (!curSC->use_sg)/* Don't use scatter-gather */ SYM53C500_pio_read (fast_pio, port_base, curSC->request_buffer, curSC->request_bufflen);else {/* Use scatter-gather */ +struct scatterlist *sg; +int i; + sgcount = curSC->use_sg; sglist = curSC->request_buffer; -while (sgcount--) { -SYM53C500_pio_read (fast_pio, port_base,page_address (sglist->page) + sglist->offset, sglist->length); - sglist++; - } +for_each_sg (sglist, sg, sgcount, i) +SYM53C500_pio_read (fast_pio, port_base,page_address (sg->page) + sg->offset, sg->length); }REG0 (port_base); }
drivers/scsi/qla1280.c +37 -29
150 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_iocb.c +3 -6
@@ -671,12 +671,11 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,/* Load data segments */ if (cmd->use_sg !=0 ) { +struct scatterlist *sgl = cmd->request_buffer;struct scatterlist *cur_seg; -struct scatterlist *end_seg; +int i; - cur_seg = (struct scatterlist *)cmd->request_buffer; - end_seg = cur_seg + tot_dsds; -while (cur_seg < end_seg) { +for_each_sg (sgl, cur_seg, tot_dsds, i) {dma_addr_t sle_dma;cont_a64_entry_t *cont_pkt;
@@ -696,8 +695,6 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt, *cur_dsd++ =cpu_to_le32 (MSD (sle_dma)); *cur_dsd++ =cpu_to_le32 (sg_dma_len (cur_seg)); avail_dsds--; - - cur_seg++; } }else { *cur_dsd++ =cpu_to_le32 (LSD (sp->dma_handle));
drivers/scsi/qla4xxx/ql4_iocb.c +3 -5
@@ -156,12 +156,11 @@ static void qla4xxx_build_scsi_iocbs(struct srb *srb,/* Load data segments */ if (cmd->use_sg) { +struct scatterlist *sgl = cmd->request_buffer;struct scatterlist *cur_seg; -struct scatterlist *end_seg; +int i; - cur_seg = (struct scatterlist *)cmd->request_buffer; - end_seg = cur_seg + tot_dsds; -while (cur_seg < end_seg) { +for_each_sg (sgl, cur_seg, tot_dsds, i) {dma_addr_t sle_dma;/* Allocate additional continuation packets? */
@@ -182,7 +181,6 @@ static void qla4xxx_build_scsi_iocbs(struct srb *srb, avail_dsds--; cur_dsd++; - cur_seg++; } }else { cur_dsd->base.addrLow =cpu_to_le32 (LSDW (srb->dma_handle));
drivers/scsi/qlogicfas408.c +5 -4
@@ -315,18 +315,19 @@ static unsigned int ql_pcmd(struct scsi_cmnd *cmd)ql_pdma (priv, phase, cmd->request_buffer, cmd->request_bufflen); else { +struct scatterlist *sg; + sgcount = cmd->use_sg; sglist = cmd->request_buffer; -while (sgcount--) { +for_each_sg (sglist, sg, sgcount, i) {if (priv->qabort) {REG0 ;return ((priv->qabort ==1 ?DID_ABORT :DID_RESET ) <<16 ); } - buf =page_address (sglist->page) + sglist->offset; -if (ql_pdma (priv, phase, buf, sglist->length)) + buf =page_address (sg->page) + sg->offset; +if (ql_pdma (priv, phase, buf, sg->length))break ; - sglist++; } }REG0 ;
drivers/scsi/qlogicpti.c +8 -7
@@ -868,7 +868,7 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd, struct qlogicpti *qpti, u_int in_ptr, u_int out_ptr) { struct dataseg *ds; -struct scatterlist *sg; +struct scatterlist *sg, *s;int i, n;if (Cmnd->use_sg) {
@@ -884,11 +884,12 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd, n = sg_count;if (n >4 ) n =4 ; -for (i =0 ; i < n; i++, sg++) { - ds[i].d_base =sg_dma_address (sg); - ds[i].d_count =sg_dma_len (sg); +for_each_sg (sg, s, n, i) { + ds[i].d_base =sg_dma_address (s); + ds[i].d_count =sg_dma_len (g); } sg_count -=4 ; + sg = s;while (sg_count >0 ) {struct Continuation_Entry *cont;
@@ -907,9 +908,9 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd, n = sg_count;if (n >7 ) n =7 ; -for (i =0 ; i < n; i++, sg++) { - ds[i].d_base =sg_dma_address (sg); - ds[i].d_count =sg_dma_len (sg); +for_each_sg (sg, s, n, i) { + ds[i].d_base =sg_dma_address (s); + ds[i].d_count =sg_dma_len (s); } sg_count -= n; }
drivers/scsi/scsi_debug.c +16 -13
@@ -38,6 +38,7 @@#include <linux/proc_fs.h> #include <linux/vmalloc.h> #include <linux/moduleparam.h> +#include <linux/scatterlist.h> #include <linux/blkdev.h> #include "scsi.h"
@@ -600,7 +601,7 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,int k, req_len, act_len, len, active;void * kaddr;void * kaddr_off; -struct scatterlist * sgpnt; +struct scatterlist * sgpnt, * sg;if (0 == scp->request_bufflen)return 0 ;
@@ -621,14 +622,15 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr, } sgpnt = (struct scatterlist *)scp->request_buffer; active =1 ; -for (k =0 , req_len =0 , act_len =0 ; k < scp->use_sg; ++k, ++sgpnt) { + req_len = act_len =0 ; +for_each_sg (sgpnt, sg, scp->use_sg, k) {if (active) { kaddr = (unsigned char *) -kmap_atomic (sgpnt->page,KM_USER0 ); +kmap_atomic (sg->page,KM_USER0 );if (NULL == kaddr)return (DID_ERROR <<16 ); - kaddr_off = (unsigned char *)kaddr + sgpnt->offset; - len = sgpnt->length; + kaddr_off = (unsigned char *)kaddr + sg->offset; + len = sg->length;if ((req_len + len) > arr_len) { active =0 ; len = arr_len - req_len;
@@ -637,7 +639,7 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,kunmap_atomic (kaddr,KM_USER0 ); act_len += len; } - req_len += sgpnt->length; + req_len += sg->length; }if (scp->resid) scp->resid -= act_len;
@@ -653,7 +655,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,int k, req_len, len, fin;void * kaddr;void * kaddr_off; -struct scatterlist * sgpnt; +struct scatterlist * sg;if (0 == scp->request_bufflen)return 0 ;
@@ -668,13 +670,14 @@ static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,memcpy (arr, scp->request_buffer, len);return len; } - sgpnt = (struct scatterlist *)scp->request_buffer; -for (k =0 , req_len =0 , fin =0 ; k < scp->use_sg; ++k, ++sgpnt) { - kaddr = (unsigned char *)kmap_atomic (sgpnt->page,KM_USER0 ); + sg = (struct scatterlist *)scp->request_buffer; + req_len = fin =0 ; +for (k =0 ; k < scp->use_sg; ++k, sg =sg_next (sg)) { + kaddr = (unsigned char *)kmap_atomic (sg->page,KM_USER0 );if (NULL == kaddr)return -1 ; - kaddr_off = (unsigned char *)kaddr + sgpnt->offset; - len = sgpnt->length; + kaddr_off = (unsigned char *)kaddr + sg->offset; + len = sg->length;if ((req_len + len) > max_arr_len) { len = max_arr_len - req_len; fin =1 ;
@@ -683,7 +686,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,kunmap_atomic (kaddr,KM_USER0 );if (fin)return req_len + len; - req_len += sgpnt->length; + req_len += sg->length; }return req_len; }
drivers/scsi/sg.c +8 -8
@@ -1168,7 +1168,7 @@ sg_vma_nopage(struct vm_area_struct *vma, unsigned long addr, int *type) sg = rsv_schp->buffer; sa = vma->vm_start;for (k =0 ; (k < rsv_schp->k_use_sg) && (sa < vma->vm_end); - ++k, ++sg) { + ++k, sg =sg_next (sg)) { len = vma->vm_end - sa; len = (len < sg->length) ? len : sg->length;if (offset < len) {
@@ -1212,7 +1212,7 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma) sa = vma->vm_start; sg = rsv_schp->buffer;for (k =0 ; (k < rsv_schp->k_use_sg) && (sa < vma->vm_end); - ++k, ++sg) { + ++k, sg =sg_next (sg)) { len = vma->vm_end - sa; len = (len < sg->length) ? len : sg->length; sa += len;
@@ -1866,7 +1866,7 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size) }for (k =0 , sg = schp->buffer, rem_sz = blk_size; (rem_sz >0 ) && (k < mx_sc_elems); - ++k, rem_sz -= ret_sz, ++sg) { + ++k, rem_sz -= ret_sz, sg =sg_next (sg)) { num = (rem_sz > scatter_elem_sz_prev) ? scatter_elem_sz_prev : rem_sz;
@@ -1939,7 +1939,7 @@ sg_write_xfer(Sg_request * srp)if (res)return res; -for (; p; ++sg, ksglen = sg->length, +for (; p; sg =sg_next (sg), ksglen = sg->length, p =page_address (sg->page)) {if (usglen <=0 )break ;
@@ -2018,7 +2018,7 @@ sg_remove_scat(Sg_scatter_hold * schp)int k;for (k =0 ; (k < schp->k_use_sg) && sg->page; - ++k, ++sg) { + ++k, sg =sg_next (sg)) {SCSI_LOG_TIMEOUT (5 ,printk ("sg_remove_scat: k=%d, pg=0x%p, len=%d\n" , k, sg->page, sg->length));
@@ -2071,7 +2071,7 @@ sg_read_xfer(Sg_request * srp)if (res)return res; -for (; p; ++sg, ksglen = sg->length, +for (; p; sg =sg_next (sg), ksglen = sg->length, p =page_address (sg->page)) {if (usglen <=0 )break ;
@@ -2118,7 +2118,7 @@ sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer)if ((!outp) || (num_read_xfer <=0 ))return 0 ; -for (k =0 ; (k < schp->k_use_sg) && sg->page; ++k, ++sg) { +for (k =0 ; (k < schp->k_use_sg) && sg->page; ++k, sg =sg_next (sg)) { num = sg->length;if (num > num_read_xfer) { if (__copy_to_user(outp, page_address(sg->page),
@@ -2168,7 +2168,7 @@ sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size)SCSI_LOG_TIMEOUT (4 ,printk ("sg_link_reserve: size=%d\n" , size)); rem = size; -for (k =0 ; k < rsv_schp->k_use_sg; ++k, ++sg) { +for (k =0 ; k < rsv_schp->k_use_sg; ++k, sg =sg_next (sg)) { num = sg->length;if (rem <= num) { sfp->save_scat_len = num;
drivers/scsi/sym53c416.c +3 -6
@@ -332,7 +332,7 @@ static irqreturn_t sym53c416_intr_handle(int irq, void *dev_id)int i;unsigned long flags =0 ;unsigned char status_reg, pio_int_reg, int_reg; -struct scatterlist *sglist; +struct scatterlist *sglist, *sg;unsigned int sgcount;unsigned int tot_trans =0 ;
@@ -437,11 +437,8 @@ static irqreturn_t sym53c416_intr_handle(int irq, void *dev_id) { sgcount = current_command->use_sg; sglist = current_command->request_buffer; -while (sgcount--) - { - tot_trans +=sym53c416_write (base,SG_ADDRESS (sglist), sglist->length); - sglist++; - } +for_each_sg (sglist, sg, sgcount, i) + tot_trans +=sym53c416_write (base,SG_ADDRESS (sg), sg->length); }if (tot_trans < current_command->underflow)printk (KERN_WARNING "sym53c416: Underflow, wrote %d bytes, request for %d bytes.\n" , tot_trans, current_command->underflow);
drivers/scsi/sym53c8xx_2/sym_glue.c +4 -3
@@ -371,6 +371,7 @@ static int sym_scatter(struct sym_hcb *np, struct sym_ccb *cp, struct scsi_cmnd segment =sym_scatter_no_sglist (np, cp, cmd); else if ((use_sg = map_scsi_sg_data(np, cmd)) > 0) {struct scatterlist *scatter = (struct scatterlist *)cmd->request_buffer; +struct scatterlist *sg;struct sym_tcb *tp = &np->target[cp->target];struct sym_tblmove *data;
@@ -381,9 +382,9 @@ static int sym_scatter(struct sym_hcb *np, struct sym_ccb *cp, struct scsi_cmnd data = &cp->phys.data[SYM_CONF_MAX_SG - use_sg]; -for (segment =0 ; segment < use_sg; segment++) { -dma_addr_t baddr =sg_dma_address (&scatter[segment]); -unsigned int len =sg_dma_len (&scatter[segment]); +for_each_sg (scatter, sg, use_sg, segment) { +dma_addr_t baddr =sg_dma_address (sg); +unsigned int len =sg_dma_len (sg);if ((len &1 ) && (tp->head.wval &EWS )) { len++;
drivers/scsi/u14-34f.c +5 -5
@@ -1111,7 +1111,7 @@ static int u14_34f_detect(struct scsi_host_template *tpnt) {static void map_dma (unsigned int i,unsigned int j) {unsigned int data_len =0 ;unsigned int k, count, pci_dir; -struct scatterlist *sgpnt; +struct scatterlist *sgpnt, *sg;struct mscp *cpp;struct scsi_cmnd *SCpnt;
@@ -1140,10 +1140,10 @@ static void map_dma(unsigned int i, unsigned int j) { sgpnt = (struct scatterlist *) SCpnt->request_buffer; count =pci_map_sg (HD (j)->pdev, sgpnt, SCpnt->use_sg, pci_dir); -for (k =0 ; k < count; k++) { - cpp->sglist[k].address =H2DEV (sg_dma_address (&sgpnt[k])); - cpp->sglist[k].num_bytes =H2DEV (sg_dma_len (&sgpnt[k])); - data_len += sgpnt[k].length; +for_each_sg (sgpnt, sg, count, k) { + cpp->sglist[k].address =H2DEV (sg_dma_address (sg)); + cpp->sglist[k].num_bytes =H2DEV (sg_dma_len (sg)); + data_len += sg->length; } cpp->sg = TRUE;
drivers/scsi/ultrastor.c +5 -5
@@ -675,16 +675,16 @@ static const char *ultrastor_info(struct Scsi_Host * shpnt)static inline void build_sg_list (struct mscp *mscp,struct scsi_cmnd *SCpnt) { -struct scatterlist *sl; +struct scatterlist *sl, *sg;long transfer_length =0 ;int i, max; sl = (struct scatterlist *) SCpnt->request_buffer; max = SCpnt->use_sg; -for (i =0 ; i < max; i++) { - mscp->sglist[i].address =isa_page_to_bus (sl[i].page) + sl[i].offset; - mscp->sglist[i].num_bytes = sl[i].length; - transfer_length += sl[i].length; +for_each_sg (sl, sg, max, i) { + mscp->sglist[i].address =isa_page_to_bus (sg->page) + sg->offset; + mscp->sglist[i].num_bytes = sg->length; + transfer_length += sg->length; } mscp->number_of_sg_list = max; mscp->transfer_data =isa_virt_to_bus (mscp->sglist);
drivers/scsi/wd7000.c +4 -3
@@ -1108,6 +1108,7 @@ static int wd7000_queuecommand(struct scsi_cmnd *SCpnt,if (SCpnt->use_sg) {struct scatterlist *sg = (struct scatterlist *) SCpnt->request_buffer; +struct scatterlist *s;unsigned i;if (SCpnt->device->host->sg_tablesize ==SG_NONE ) {
@@ -1120,9 +1121,9 @@ static int wd7000_queuecommand(struct scsi_cmnd *SCpnt,any2scsi (scb->dataptr, (int ) sgb);any2scsi (scb->maxlen, SCpnt->use_sg *sizeof (Sgb)); -for (i =0 ; i < SCpnt->use_sg; i++) { -any2scsi (sgb[i].ptr,isa_page_to_bus (sg[i].page) + sg[i].offset); -any2scsi (sgb[i].len, sg[i].length); +for_each_sg (sg, s, SCpnt->use_sg, i) { +any2scsi (sgb[i].ptr,isa_page_to_bus (s->page) + s->offset); +any2scsi (sgb[i].len, s->length); } }else { scb->op =0 ;
drivers/usb/storage/alauda.c +10 -6
@@ -798,12 +798,13 @@ static int alauda_read_data(struct us_data *us, unsigned long address, {unsigned char *buffer;u16 lba, max_lba; -unsigned int page, len, index, offset; +unsigned int page, len, offset;unsigned int blockshift =MEDIA_INFO (us).blockshift;unsigned int pageshift =MEDIA_INFO (us).pageshift;unsigned int blocksize =MEDIA_INFO (us).blocksize;unsigned int pagesize =MEDIA_INFO (us).pagesize;unsigned int uzonesize =MEDIA_INFO (us).uzonesize; +struct scatterlist *sg;int result;/*
@@ -827,7 +828,8 @@ static int alauda_read_data(struct us_data *us, unsigned long address, max_lba =MEDIA_INFO (us).capacity >> (blockshift + pageshift); result =USB_STOR_TRANSPORT_GOOD ; - index = offset =0 ; + offset =0 ; + sg =NULL ;while (sectors >0 ) {unsigned int zone = lba / uzonesize;/* integer division */
@@ -873,7 +875,7 @@ static int alauda_read_data(struct us_data *us, unsigned long address,/* Store the data in the transfer buffer */ usb_stor_access_xfer_buf (buffer, len, us->srb, - &index, &offset,TO_XFER_BUF ); + &sg, &offset,TO_XFER_BUF ); page =0 ; lba++;
@@ -891,11 +893,12 @@ static int alauda_write_data(struct us_data *us, unsigned long address, unsigned int sectors) {unsigned char *buffer, *blockbuffer; -unsigned int page, len, index, offset; +unsigned int page, len, offset;unsigned int blockshift =MEDIA_INFO (us).blockshift;unsigned int pageshift =MEDIA_INFO (us).pageshift;unsigned int blocksize =MEDIA_INFO (us).blocksize;unsigned int pagesize =MEDIA_INFO (us).pagesize; +struct scatterlist *sg;u16 lba, max_lba;int result;
@@ -929,7 +932,8 @@ static int alauda_write_data(struct us_data *us, unsigned long address, max_lba =MEDIA_INFO (us).capacity >> (pageshift + blockshift); result =USB_STOR_TRANSPORT_GOOD ; - index = offset =0 ; + offset =0 ; + sg =NULL ;while (sectors >0 ) {/* Write as many sectors as possible in this block */
@@ -946,7 +950,7 @@ static int alauda_write_data(struct us_data *us, unsigned long address,/* Get the data from the transfer buffer */ usb_stor_access_xfer_buf (buffer, len, us->srb, - &index, &offset,FROM_XFER_BUF ); + &sg, &offset,FROM_XFER_BUF ); result =alauda_write_lba (us, lba, page, pages, buffer, blockbuffer);
drivers/usb/storage/datafab.c +6 -4
@@ -98,7 +98,8 @@ static int datafab_read_data(struct us_data *us,unsigned char thistime;unsigned int totallen, alloclen;int len, result; -unsigned int sg_idx =0 , sg_offset =0 ; +unsigned int sg_offset =0 ; +struct scatterlist *sg =NULL ;// we're working in LBA mode. according to the ATA spec, // we can support up to 28-bit addressing. I don't know if Datafab
@@ -155,7 +156,7 @@ static int datafab_read_data(struct us_data *us,// Store the data in the transfer buffer usb_stor_access_xfer_buf (buffer, len, us->srb, - &sg_idx, &sg_offset,TO_XFER_BUF ); + &sg, &sg_offset,TO_XFER_BUF ); sector += thistime; totallen -= len;
@@ -181,7 +182,8 @@ static int datafab_write_data(struct us_data *us,unsigned char thistime;unsigned int totallen, alloclen;int len, result; -unsigned int sg_idx =0 , sg_offset =0 ; +unsigned int sg_offset =0 ; +struct scatterlist *sg =NULL ;// we're working in LBA mode. according to the ATA spec, // we can support up to 28-bit addressing. I don't know if Datafab
@@ -217,7 +219,7 @@ static int datafab_write_data(struct us_data *us,// Get the data from the transfer buffer usb_stor_access_xfer_buf (buffer, len, us->srb, - &sg_idx, &sg_offset,FROM_XFER_BUF ); + &sg, &sg_offset,FROM_XFER_BUF ); command[0 ] =0 ; command[1 ] = thistime;
drivers/usb/storage/jumpshot.c +6 -4
@@ -119,7 +119,8 @@ static int jumpshot_read_data(struct us_data *us,unsigned char thistime;unsigned int totallen, alloclen;int len, result; -unsigned int sg_idx =0 , sg_offset =0 ; +unsigned int sg_offset =0 ; +struct scatterlist *sg =NULL ;// we're working in LBA mode. according to the ATA spec, // we can support up to 28-bit addressing. I don't know if Jumpshot
@@ -170,7 +171,7 @@ static int jumpshot_read_data(struct us_data *us,// Store the data in the transfer buffer usb_stor_access_xfer_buf (buffer, len, us->srb, - &sg_idx, &sg_offset,TO_XFER_BUF ); + &sg, &sg_offset,TO_XFER_BUF ); sector += thistime; totallen -= len;
@@ -195,7 +196,8 @@ static int jumpshot_write_data(struct us_data *us,unsigned char thistime;unsigned int totallen, alloclen;int len, result, waitcount; -unsigned int sg_idx =0 , sg_offset =0 ; +unsigned int sg_offset =0 ; +struct scatterlist *sg =NULL ;// we're working in LBA mode. according to the ATA spec, // we can support up to 28-bit addressing. I don't know if Jumpshot
@@ -225,7 +227,7 @@ static int jumpshot_write_data(struct us_data *us,// Get the data from the transfer buffer usb_stor_access_xfer_buf (buffer, len, us->srb, - &sg_idx, &sg_offset,FROM_XFER_BUF ); + &sg, &sg_offset,FROM_XFER_BUF ); command[0 ] =0 ; command[1 ] = thistime;
drivers/usb/storage/protocol.c +11 -9
@@ -157,7 +157,7 @@ void usb_stor_transparent_scsi_command(struct scsi_cmnd *srb,* pick up from where this one left off. */ unsigned int usb_stor_access_xfer_buf (unsigned char *buffer, -unsigned int buflen,struct scsi_cmnd *srb,unsigned int *index, +unsigned int buflen,struct scsi_cmnd *srb,struct scatterlist **sgptr,unsigned int *offset,enum xfer_buf_dir dir) {unsigned int cnt;
@@ -184,16 +184,17 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,* located in high memory -- then kmap() will map it to a temporary * position in the kernel's virtual address space. */ }else { -struct scatterlist *sg = - (struct scatterlist *) srb->request_buffer - + *index; +struct scatterlist *sg = *sgptr; + +if (!sg) + sg = (struct scatterlist *) srb->request_buffer;/* This loop handles a single s-g list entry, which may * include multiple pages. Find the initial page structure * and the starting offset within the page, and update * the *offset and *index values for the next loop. */ cnt =0 ; -while (cnt < buflen && *index < srb->use_sg) { +while (cnt < buflen) {struct page *page = sg->page + ((sg->offset + *offset) >>PAGE_SHIFT ); unsigned int poff =
@@ -209,8 +210,7 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,/* Transfer continues to next s-g entry */ *offset =0 ; - ++*index; - ++sg; + sg =sg_next (sg); }/* Transfer the data for all the pages in this
@@ -234,6 +234,7 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer, sglen -= plen; } } + *sgptr = sg; }/* Return the amount actually transferred */
@@ -245,9 +246,10 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,void usb_stor_set_xfer_buf (unsigned char *buffer,unsigned int buflen,struct scsi_cmnd *srb) { -unsigned int index =0 , offset =0 ; +unsigned int offset =0 ; +struct scatterlist *sg =NULL ; -usb_stor_access_xfer_buf (buffer, buflen, srb, &index, &offset, +usb_stor_access_xfer_buf (buffer, buflen, srb, &sg, &offset,TO_XFER_BUF );if (buflen < srb->request_bufflen) srb->resid = srb->request_bufflen - buflen;
drivers/usb/storage/protocol.h +1 -1
@@ -52,7 +52,7 @@ extern void usb_stor_transparent_scsi_command(struct scsi_cmnd*,enum xfer_buf_dir {TO_XFER_BUF ,FROM_XFER_BUF };extern unsigned int usb_stor_access_xfer_buf (unsigned char *buffer, -unsigned int buflen,struct scsi_cmnd *srb,unsigned int *index, +unsigned int buflen,struct scsi_cmnd *srb,struct scatterlist **,unsigned int *offset,enum xfer_buf_dir dir); extern void usb_stor_set_xfer_buf(unsigned char *buffer,
drivers/usb/storage/sddr09.c +10 -6
@@ -705,7 +705,8 @@ sddr09_read_data(struct us_data *us,unsigned char *buffer;unsigned int lba, maxlba, pba;unsigned int page, pages; -unsigned int len, index, offset; +unsigned int len, offset; +struct scatterlist *sg;int result;// Figure out the initial LBA and page
@@ -730,7 +731,8 @@ sddr09_read_data(struct us_data *us,// contiguous LBA's. Another exercise left to the student. result =0 ; - index = offset =0 ; + offset =0 ; + sg =NULL ;while (sectors >0 ) {
@@ -777,7 +779,7 @@ sddr09_read_data(struct us_data *us,// Store the data in the transfer buffer usb_stor_access_xfer_buf (buffer, len, us->srb, - &index, &offset,TO_XFER_BUF ); + &sg, &offset,TO_XFER_BUF ); page =0 ; lba++;
@@ -931,7 +933,8 @@ sddr09_write_data(struct us_data *us,unsigned int pagelen, blocklen;unsigned char *blockbuffer;unsigned char *buffer; -unsigned int len, index, offset; +unsigned int len, offset; +struct scatterlist *sg;int result;// Figure out the initial LBA and page
@@ -968,7 +971,8 @@ sddr09_write_data(struct us_data *us, } result =0 ; - index = offset =0 ; + offset =0 ; + sg =NULL ;while (sectors >0 ) {
@@ -987,7 +991,7 @@ sddr09_write_data(struct us_data *us,// Get the data from the transfer buffer usb_stor_access_xfer_buf (buffer, len, us->srb, - &index, &offset,FROM_XFER_BUF ); + &sg, &offset,FROM_XFER_BUF ); result =sddr09_write_lba (us, lba, page, pages, buffer, blockbuffer);
drivers/usb/storage/sddr55.c +10 -6
@@ -167,7 +167,8 @@ static int sddr55_read_data(struct us_data *us,unsigned long address;unsigned short pages; -unsigned int len, index, offset; +unsigned int len, offset; +struct scatterlist *sg;// Since we only read in one block at a time, we have to create // a bounce buffer and move the data a piece at a time between the
@@ -178,7 +179,8 @@ static int sddr55_read_data(struct us_data *us, buffer =kmalloc (len,GFP_NOIO );if (buffer ==NULL )return USB_STOR_TRANSPORT_ERROR ;/* out of memory */ - index = offset =0 ; + offset =0 ; + sg =NULL ;while (sectors>0 ) {
@@ -255,7 +257,7 @@ static int sddr55_read_data(struct us_data *us,// Store the data in the transfer buffer usb_stor_access_xfer_buf (buffer, len, us->srb, - &index, &offset,TO_XFER_BUF ); + &sg, &offset,TO_XFER_BUF ); page =0 ; lba++;
@@ -287,7 +289,8 @@ static int sddr55_write_data(struct us_data *us,unsigned short pages;int i; -unsigned int len, index, offset; +unsigned int len, offset; +struct scatterlist *sg;/* check if we are allowed to write */ if (info->read_only || info->force_read_only) {
@@ -304,7 +307,8 @@ static int sddr55_write_data(struct us_data *us, buffer =kmalloc (len,GFP_NOIO );if (buffer ==NULL )return USB_STOR_TRANSPORT_ERROR ; - index = offset =0 ; + offset =0 ; + sg =NULL ;while (sectors >0 ) {
@@ -322,7 +326,7 @@ static int sddr55_write_data(struct us_data *us,// Get the data from the transfer buffer usb_stor_access_xfer_buf (buffer, len, us->srb, - &index, &offset,FROM_XFER_BUF ); + &sg, &offset,FROM_XFER_BUF ); US_DEBUGP("Write %02X pages, to PBA %04X" " (LBA %04X) page %02X\n",
drivers/usb/storage/shuttle_usbat.c +8 -9
@@ -996,7 +996,8 @@ static int usbat_flash_read_data(struct us_data *us,unsigned char thistime;unsigned int totallen, alloclen;int len, result; -unsigned int sg_idx =0 , sg_offset =0 ; +unsigned int sg_offset =0 ; +struct scatterlist *sg =NULL ; result =usbat_flash_check_media (us, info);if (result !=USB_STOR_TRANSPORT_GOOD )
@@ -1050,7 +1051,7 @@ static int usbat_flash_read_data(struct us_data *us,/* Store the data in the transfer buffer */ usb_stor_access_xfer_buf (buffer, len, us->srb, - &sg_idx, &sg_offset,TO_XFER_BUF ); + &sg, &sg_offset,TO_XFER_BUF ); sector += thistime; totallen -= len;
@@ -1086,7 +1087,8 @@ static int usbat_flash_write_data(struct us_data *us,unsigned char thistime;unsigned int totallen, alloclen;int len, result; -unsigned int sg_idx =0 , sg_offset =0 ; +unsigned int sg_offset =0 ; +struct scatterlist *sg =NULL ; result =usbat_flash_check_media (us, info);if (result !=USB_STOR_TRANSPORT_GOOD )
@@ -1125,7 +1127,7 @@ static int usbat_flash_write_data(struct us_data *us,/* Get the data from the transfer buffer */ usb_stor_access_xfer_buf (buffer, len, us->srb, - &sg_idx, &sg_offset,FROM_XFER_BUF ); + &sg, &sg_offset,FROM_XFER_BUF );/* ATA command 0x30 (WRITE SECTORS) */ usbat_pack_ata_sector_cmd (command, thistime, sector,0x30 );
@@ -1165,8 +1167,8 @@ static int usbat_hp8200e_handle_read10(struct us_data *us,unsigned char *buffer;unsigned int len;unsigned int sector; -unsigned int sg_segment =0 ;unsigned int sg_offset =0 ; +struct scatterlist *sg =NULL ;US_DEBUGP ("handle_read10: transfersize %d\n" , srb->transfersize);
@@ -1223,9 +1225,6 @@ static int usbat_hp8200e_handle_read10(struct us_data *us, sector |=short_pack (data[7 +5 ], data[7 +4 ]); transferred =0 ; - sg_segment =0 ;/* for keeping track of where we are in */ - sg_offset =0 ;/* the scatter/gather list */ -while (transferred != srb->request_bufflen) {if (len > srb->request_bufflen - transferred)
@@ -1258,7 +1257,7 @@ static int usbat_hp8200e_handle_read10(struct us_data *us,/* Store the data in the transfer buffer */ usb_stor_access_xfer_buf (buffer, len, srb, - &sg_segment, &sg_offset,TO_XFER_BUF ); + &sg, &sg_offset,TO_XFER_BUF );/* Update the amount transferred and the sector number */
include/linux/i2o.h +1 -1
@@ -836,7 +836,7 @@ static inline int i2o_dma_map_sg(struct i2o_controller *c,if ((sizeof (dma_addr_t) >4 ) && c->pae_support) *mptr++ =cpu_to_le32 (i2o_dma_high (sg_dma_address (sg)));#endif - sg++; + sg =sg_next (sg); } *sg_ptr = mptr;
include/linux/ide.h +1 -1
@@ -764,7 +764,7 @@ typedef struct hwif_s {unsigned int nsect;unsigned int nleft; -unsigned int cursg; +struct scatterlist *cursg;unsigned int cursg_ofs;int rqsize;/* max sectors per request */