[SCSI] scsi_debug: add XDWRITEREAD_10 support
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:
parent
072d0bb3ce
commit
c639d14e2f
|
@ -280,6 +280,8 @@ static int resp_write(struct scsi_cmnd * SCpnt, unsigned long long lba,
|
||||||
unsigned int num, struct sdebug_dev_info * devip);
|
unsigned int num, struct sdebug_dev_info * devip);
|
||||||
static int resp_report_luns(struct scsi_cmnd * SCpnt,
|
static int resp_report_luns(struct scsi_cmnd * SCpnt,
|
||||||
struct sdebug_dev_info * devip);
|
struct sdebug_dev_info * devip);
|
||||||
|
static int resp_xdwriteread(struct scsi_cmnd *scp, unsigned long long lba,
|
||||||
|
unsigned int num, struct sdebug_dev_info *devip);
|
||||||
static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
|
static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
|
||||||
int arr_len);
|
int arr_len);
|
||||||
static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
|
static int fetch_to_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,
|
||||||
|
@ -334,6 +336,7 @@ static void get_data_transfer_info(unsigned char *cmd,
|
||||||
break;
|
break;
|
||||||
case WRITE_10:
|
case WRITE_10:
|
||||||
case READ_10:
|
case READ_10:
|
||||||
|
case XDWRITEREAD_10:
|
||||||
*lba = cmd[5] + (cmd[4] << 8) + (cmd[3] << 16) + (cmd[2] << 24);
|
*lba = cmd[5] + (cmd[4] << 8) + (cmd[3] << 16) + (cmd[2] << 24);
|
||||||
*num = cmd[8] + (cmd[7] << 8);
|
*num = cmd[8] + (cmd[7] << 8);
|
||||||
break;
|
break;
|
||||||
|
@ -542,6 +545,28 @@ int scsi_debug_queuecommand(struct scsi_cmnd * SCpnt, done_funct_t done)
|
||||||
case WRITE_BUFFER:
|
case WRITE_BUFFER:
|
||||||
errsts = check_readiness(SCpnt, 1, devip);
|
errsts = check_readiness(SCpnt, 1, devip);
|
||||||
break;
|
break;
|
||||||
|
case XDWRITEREAD_10:
|
||||||
|
if (!scsi_bidi_cmnd(SCpnt)) {
|
||||||
|
mk_sense_buffer(devip, ILLEGAL_REQUEST,
|
||||||
|
INVALID_FIELD_IN_CDB, 0);
|
||||||
|
errsts = check_condition_result;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
errsts = check_readiness(SCpnt, 0, devip);
|
||||||
|
if (errsts)
|
||||||
|
break;
|
||||||
|
if (scsi_debug_fake_rw)
|
||||||
|
break;
|
||||||
|
get_data_transfer_info(cmd, &lba, &num);
|
||||||
|
errsts = resp_read(SCpnt, lba, num, devip);
|
||||||
|
if (errsts)
|
||||||
|
break;
|
||||||
|
errsts = resp_write(SCpnt, lba, num, devip);
|
||||||
|
if (errsts)
|
||||||
|
break;
|
||||||
|
errsts = resp_xdwriteread(SCpnt, lba, num, devip);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts)
|
if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts)
|
||||||
printk(KERN_INFO "scsi_debug: Opcode: 0x%x not "
|
printk(KERN_INFO "scsi_debug: Opcode: 0x%x not "
|
||||||
|
@ -1948,6 +1973,50 @@ static int resp_report_luns(struct scsi_cmnd * scp,
|
||||||
min((int)alloc_len, SDEBUG_RLUN_ARR_SZ));
|
min((int)alloc_len, SDEBUG_RLUN_ARR_SZ));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int resp_xdwriteread(struct scsi_cmnd *scp, unsigned long long lba,
|
||||||
|
unsigned int num, struct sdebug_dev_info *devip)
|
||||||
|
{
|
||||||
|
int i, j, ret = -1;
|
||||||
|
unsigned char *kaddr, *buf;
|
||||||
|
unsigned int offset;
|
||||||
|
struct scatterlist *sg;
|
||||||
|
struct scsi_data_buffer *sdb = scsi_in(scp);
|
||||||
|
|
||||||
|
/* better not to use temporary buffer. */
|
||||||
|
buf = kmalloc(scsi_bufflen(scp), GFP_ATOMIC);
|
||||||
|
if (!buf)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
offset = 0;
|
||||||
|
scsi_for_each_sg(scp, sg, scsi_sg_count(scp), i) {
|
||||||
|
kaddr = (unsigned char *)kmap_atomic(sg_page(sg), KM_USER0);
|
||||||
|
if (!kaddr)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
memcpy(buf + offset, kaddr + sg->offset, sg->length);
|
||||||
|
offset += sg->length;
|
||||||
|
kunmap_atomic(kaddr, KM_USER0);
|
||||||
|
}
|
||||||
|
|
||||||
|
offset = 0;
|
||||||
|
for_each_sg(sdb->table.sgl, sg, sdb->table.nents, i) {
|
||||||
|
kaddr = (unsigned char *)kmap_atomic(sg_page(sg), KM_USER0);
|
||||||
|
if (!kaddr)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
for (j = 0; j < sg->length; j++)
|
||||||
|
*(kaddr + sg->offset + j) ^= *(buf + offset + j);
|
||||||
|
|
||||||
|
offset += sg->length;
|
||||||
|
kunmap_atomic(kaddr, KM_USER0);
|
||||||
|
}
|
||||||
|
ret = 0;
|
||||||
|
out:
|
||||||
|
kfree(buf);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
/* When timer goes off this function is called. */
|
/* When timer goes off this function is called. */
|
||||||
static void timer_intr_handler(unsigned long indx)
|
static void timer_intr_handler(unsigned long indx)
|
||||||
{
|
{
|
||||||
|
@ -1981,6 +2050,7 @@ static int scsi_debug_slave_alloc(struct scsi_device * sdp)
|
||||||
if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts)
|
if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts)
|
||||||
printk(KERN_INFO "scsi_debug: slave_alloc <%u %u %u %u>\n",
|
printk(KERN_INFO "scsi_debug: slave_alloc <%u %u %u %u>\n",
|
||||||
sdp->host->host_no, sdp->channel, sdp->id, sdp->lun);
|
sdp->host->host_no, sdp->channel, sdp->id, sdp->lun);
|
||||||
|
set_bit(QUEUE_FLAG_BIDI, &sdp->request_queue->queue_flags);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -102,6 +102,7 @@ extern const unsigned char scsi_command_size[8];
|
||||||
#define READ_TOC 0x43
|
#define READ_TOC 0x43
|
||||||
#define LOG_SELECT 0x4c
|
#define LOG_SELECT 0x4c
|
||||||
#define LOG_SENSE 0x4d
|
#define LOG_SENSE 0x4d
|
||||||
|
#define XDWRITEREAD_10 0x53
|
||||||
#define MODE_SELECT_10 0x55
|
#define MODE_SELECT_10 0x55
|
||||||
#define RESERVE_10 0x56
|
#define RESERVE_10 0x56
|
||||||
#define RELEASE_10 0x57
|
#define RELEASE_10 0x57
|
||||||
|
|
Loading…
Reference in New Issue