[SCSI] wd7000: proper fix for boards without sg support (9a3dd65b) · Commits · 戴 / test

- code used to set sg_tablesize to zero for board revision less than 6. This is no longer supported, therefore I use sg_tablesize=1 and open code the sg handling for that case. - Get rid of use of SG_NONE which will be removed soon. Signed-off-by:

Boaz Harrosh <bharrosh@panasas.com> Signed-off-by:

James <James.Bottomley@HansenPartnership.com> Signed-off-by:

James Bottomley <James.Bottomley@HansenPartnership.com>

drivers/scsi/wd7000.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1108,13 +1108,10 @@ static int wd7000_queuecommand(struct scsi_cmnd *SCpnt,
		scb->host = host;

		nseg = scsi_sg_count(SCpnt);
		if (nseg) {
		if (nseg > 1) {
		struct scatterlist *sg;
		unsigned i;

		if (SCpnt->device->host->sg_tablesize == SG_NONE) {
		panic("wd7000_queuecommand: scatter/gather not supported.\n");
		}
		dprintk("Using scatter/gather with %d elements.\n", nseg);

		sgb = scb->sgb;
		@@ -1128,7 +1125,10 @@ static int wd7000_queuecommand(struct scsi_cmnd *SCpnt,
		}
		} else {
		scb->op = 0;
		any2scsi(scb->dataptr, isa_virt_to_bus(scsi_sglist(SCpnt)));
		if (nseg) {
		struct scatterlist *sg = scsi_sglist(SCpnt);
		any2scsi(scb->dataptr, isa_page_to_bus(sg_page(sg)) + sg->offset);
		}
		any2scsi(scb->maxlen, scsi_bufflen(SCpnt));
		}

		@@ -1524,7 +1524,7 @@ static __init int wd7000_detect(struct scsi_host_template *tpnt)
		* For boards before rev 6.0, scatter/gather isn't supported.
		*/
		if (host->rev1 < 6)
		sh->sg_tablesize = SG_NONE;
		sh->sg_tablesize = 1;

		present++; /* count it */

Admin message