Merge tag 'scsi-sg' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[platform/kernel/linux-rpi.git] / drivers / scsi / aha152x.c

diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index 88c649b..eb466c2 100644 (file)
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -937,7 +937,6 @@ static int aha152x_internal_queue(struct scsi_cmnd *SCpnt,
           SCp.ptr              : buffer pointer
           SCp.this_residual    : buffer length
           SCp.buffer           : next buffer
-          SCp.buffers_residual : left buffers in list
           SCp.phase            : current state of the command */
 
        if ((phase & resetting) || !scsi_sglist(SCpnt)) {
@@ -945,13 +944,11 @@ static int aha152x_internal_queue(struct scsi_cmnd *SCpnt,
                SCpnt->SCp.this_residual = 0;
                scsi_set_resid(SCpnt, 0);
                SCpnt->SCp.buffer           = NULL;
-               SCpnt->SCp.buffers_residual = 0;
        } else {
                scsi_set_resid(SCpnt, scsi_bufflen(SCpnt));
                SCpnt->SCp.buffer           = scsi_sglist(SCpnt);
                SCpnt->SCp.ptr              = SG_ADDRESS(SCpnt->SCp.buffer);
                SCpnt->SCp.this_residual    = SCpnt->SCp.buffer->length;
-               SCpnt->SCp.buffers_residual = scsi_sg_count(SCpnt) - 1;
        }
 
        DO_LOCK(flags);
@@ -2019,10 +2016,9 @@ static void datai_run(struct Scsi_Host *shpnt)
                                }
 
                                if (CURRENT_SC->SCp.this_residual == 0 &&
-                                   CURRENT_SC->SCp.buffers_residual > 0) {
+                                   !sg_is_last(CURRENT_SC->SCp.buffer)) {
                                        /* advance to next buffer */
-                                       CURRENT_SC->SCp.buffers_residual--;
-                                       CURRENT_SC->SCp.buffer++;
+                                       CURRENT_SC->SCp.buffer = sg_next(CURRENT_SC->SCp.buffer);
                                        CURRENT_SC->SCp.ptr           = SG_ADDRESS(CURRENT_SC->SCp.buffer);
                                        CURRENT_SC->SCp.this_residual = CURRENT_SC->SCp.buffer->length;
                                }
@@ -2125,10 +2121,10 @@ static void datao_run(struct Scsi_Host *shpnt)
                        CMD_INC_RESID(CURRENT_SC, -2 * data_count);
                }
 
-               if(CURRENT_SC->SCp.this_residual==0 && CURRENT_SC->SCp.buffers_residual>0) {
+               if (CURRENT_SC->SCp.this_residual == 0 &&
+                   !sg_is_last(CURRENT_SC->SCp.buffer)) {
                        /* advance to next buffer */
-                       CURRENT_SC->SCp.buffers_residual--;
-                       CURRENT_SC->SCp.buffer++;
+                       CURRENT_SC->SCp.buffer = sg_next(CURRENT_SC->SCp.buffer);
                        CURRENT_SC->SCp.ptr           = SG_ADDRESS(CURRENT_SC->SCp.buffer);
                        CURRENT_SC->SCp.this_residual = CURRENT_SC->SCp.buffer->length;
                }
@@ -2147,22 +2143,26 @@ static void datao_run(struct Scsi_Host *shpnt)
 static void datao_end(struct Scsi_Host *shpnt)
 {
        if(TESTLO(DMASTAT, DFIFOEMP)) {
-               int data_count = (DATA_LEN - scsi_get_resid(CURRENT_SC)) -
-                       GETSTCNT();
+               u32 datao_cnt = GETSTCNT();
+               int datao_out = DATA_LEN - scsi_get_resid(CURRENT_SC);
+               int done;
+               struct scatterlist *sg = scsi_sglist(CURRENT_SC);
 
-               CMD_INC_RESID(CURRENT_SC, data_count);
+               CMD_INC_RESID(CURRENT_SC, datao_out - datao_cnt);
 
-               data_count -= CURRENT_SC->SCp.ptr -
-                       SG_ADDRESS(CURRENT_SC->SCp.buffer);
-               while(data_count>0) {
-                       CURRENT_SC->SCp.buffer--;
-                       CURRENT_SC->SCp.buffers_residual++;
-                       data_count -= CURRENT_SC->SCp.buffer->length;
+               done = scsi_bufflen(CURRENT_SC) - scsi_get_resid(CURRENT_SC);
+               /* Locate the first SG entry not yet sent */
+               while (done > 0 && !sg_is_last(sg)) {
+                       if (done < sg->length)
+                               break;
+                       done -= sg->length;
+                       sg = sg_next(sg);
                }
-               CURRENT_SC->SCp.ptr = SG_ADDRESS(CURRENT_SC->SCp.buffer) -
-                       data_count;
-               CURRENT_SC->SCp.this_residual = CURRENT_SC->SCp.buffer->length +
-                       data_count;
+
+               CURRENT_SC->SCp.buffer = sg;
+               CURRENT_SC->SCp.ptr = SG_ADDRESS(CURRENT_SC->SCp.buffer) + done;
+               CURRENT_SC->SCp.this_residual = CURRENT_SC->SCp.buffer->length -
+                       done;
        }
 
        SETPORT(SXFRCTL0, CH1|CLRCH1|CLRSTCNT);
@@ -2490,7 +2490,7 @@ static void get_command(struct seq_file *m, struct scsi_cmnd * ptr)
 
        seq_printf(m, "); resid=%d; residual=%d; buffers=%d; phase |",
                scsi_get_resid(ptr), ptr->SCp.this_residual,
-               ptr->SCp.buffers_residual);
+               sg_nents(ptr->SCp.buffer) - 1);
 
        if (ptr->SCp.phase & not_issued)
                seq_puts(m, "not issued|");