lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] scsi_debug: add bidi data transfer support

Browse Source 
This enables fill_from_dev_buffer and fetch_to_dev_buffer to handle
bidi commands.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Douglas Gilbert <dougg@torque.net>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
FUJITA Tomonori
2008-01-23 01:32:00 +09:00
committed by James Bottomley
parent 3de9f94479
commit 072d0bb3ce
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/scsi/scsi_debug.c
View File

@@ -594,18 +594,18 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
int k, req_len, act_len, len, active; int k, req_len, act_len, len, active;
void * kaddr; void * kaddr;
void * kaddr_off; void * kaddr_off;
struct scatterlist * sg; struct scatterlist *sg;
struct scsi_data_buffer *sdb = scsi_in(scp);
if (0 == scsi_bufflen(scp)) if (!sdb->length)
return 0; return 0;
if (NULL == scsi_sglist(scp)) if (!sdb->table.sgl)
return (DID_ERROR << 16); return (DID_ERROR << 16);
if (! ((scp->sc_data_direction == DMA_BIDIRECTIONAL) || if (!(scsi_bidi_cmnd(scp) || scp->sc_data_direction == DMA_FROM_DEVICE))
(scp->sc_data_direction == DMA_FROM_DEVICE)))
return (DID_ERROR << 16); return (DID_ERROR << 16);
active = 1; active = 1;
req_len = act_len = 0; req_len = act_len = 0;
scsi_for_each_sg(scp, sg, scsi_sg_count(scp), k) { for_each_sg(sdb->table.sgl, sg, sdb->table.nents, k) {
if (active) { if (active) {
kaddr = (unsigned char *) kaddr = (unsigned char *)
kmap_atomic(sg_page(sg), KM_USER0); kmap_atomic(sg_page(sg), KM_USER0);
@@ -623,10 +623,10 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
} }
req_len += sg->length; req_len += sg->length;
} }
if (scsi_get_resid(scp)) if (sdb->resid)
scsi_set_resid(scp, scsi_get_resid(scp) - act_len); sdb->resid -= act_len;
else else
scsi_set_resid(scp, req_len - act_len); sdb->resid = req_len - act_len;
return 0; return 0;
} }
@@ -643,8 +643,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
return 0; return 0;
if (NULL == scsi_sglist(scp)) if (NULL == scsi_sglist(scp))
return -1; return -1;
if (! ((scp->sc_data_direction == DMA_BIDIRECTIONAL) || if (!(scsi_bidi_cmnd(scp) || scp->sc_data_direction == DMA_TO_DEVICE))
(scp->sc_data_direction == DMA_TO_DEVICE)))
return -1; return -1;
req_len = fin = 0; req_len = fin = 0;
scsi_for_each_sg(scp, sg, scsi_sg_count(scp), k) { scsi_for_each_sg(scp, sg, scsi_sg_count(scp), k) {