mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-20 06:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix lost residual for allowed to mismatch data transfer direction commands

Browse Source 
- Fix sending unneeded Control Mode Page MODE SENSE commands. Some devices
   may not support this page, so extra calls only fill logs with pointless warnings



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4565 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2012-10-23 01:05:31 +00:00
parent 9202352561
commit 6b29b72695
10 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/include/scst.h
+2 -1
View File
@@ -4221,7 +4221,8 @@ int scst_block_generic_dev_done(struct scst_cmd *cmd,
int scst_tape_generic_dev_done(struct scst_cmd *cmd,
void (*set_block_size)(struct scst_cmd *cmd, int block_size));
int scst_obtain_device_parameters(struct scst_device *dev);
int scst_obtain_device_parameters(struct scst_device *dev,
const uint8_t *mode_select_cdb);
void scst_reassign_retained_sess_states(struct scst_session *new_sess,
struct scst_session *old_sess);
scst/src/dev_handlers/scst_cdrom.c
+1 -1
View File
@@ -139,7 +139,7 @@ static int cdrom_attach(struct scst_device *dev)
}
dev->block_size = 1 << dev->block_shift;
res = scst_obtain_device_parameters(dev);
res = scst_obtain_device_parameters(dev, NULL);
if (res != 0) {
PRINT_ERROR("Failed to obtain control parameters for device "
"%s", dev->virt_name);
scst/src/dev_handlers/scst_changer.c
+1 -1
View File
@@ -98,7 +98,7 @@ static int changer_attach(struct scst_device *dev)
/* Let's try not to be too smart and continue processing */
}
res = scst_obtain_device_parameters(dev);
res = scst_obtain_device_parameters(dev, NULL);
if (res != 0) {
PRINT_ERROR("Failed to obtain control parameters for device "
"%s", dev->virt_name);
scst/src/dev_handlers/scst_disk.c
+1 -1
View File
@@ -231,7 +231,7 @@ static int disk_attach(struct scst_device *dev)
}
dev->block_size = 1 << dev->block_shift;
res = scst_obtain_device_parameters(dev);
res = scst_obtain_device_parameters(dev, NULL);
if (res != 0) {
PRINT_ERROR("Failed to obtain control parameters for device "
"%s", dev->virt_name);
scst/src/dev_handlers/scst_modisk.c
+1 -1
View File
@@ -238,7 +238,7 @@ static int modisk_attach(struct scst_device *dev)
}
dev->block_size = 1 << dev->block_shift;
res = scst_obtain_device_parameters(dev);
res = scst_obtain_device_parameters(dev, NULL);
if (res != 0) {
PRINT_ERROR("Failed to obtain control parameters for device "
"%s: %x", dev->virt_name, res);
scst/src/dev_handlers/scst_processor.c
+1 -1
View File
@@ -98,7 +98,7 @@ static int processor_attach(struct scst_device *dev)
/* Let's try not to be too smart and continue processing */
}
res = scst_obtain_device_parameters(dev);
res = scst_obtain_device_parameters(dev, NULL);
if (res != 0) {
PRINT_ERROR("Failed to obtain control parameters for device "
"%s", dev->virt_name);
scst/src/dev_handlers/scst_raid.c
+1 -1
View File
@@ -98,7 +98,7 @@ static int raid_attach(struct scst_device *dev)
/* Let's try not to be too smart and continue processing */
}
res = scst_obtain_device_parameters(dev);
res = scst_obtain_device_parameters(dev, NULL);
if (res != 0) {
PRINT_ERROR("Failed to obtain control parameters for device "
"%s", dev->virt_name);
scst/src/dev_handlers/scst_tape.c
+1 -1
View File
@@ -226,7 +226,7 @@ static int tape_attach(struct scst_device *dev)
dev->block_shift = scst_calc_block_shift(dev->block_size);
obtain:
res = scst_obtain_device_parameters(dev);
res = scst_obtain_device_parameters(dev, NULL);
if (res != 0) {
PRINT_ERROR("Failed to obtain control parameters for device "
"%s", dev->virt_name);
scst/src/scst_lib.c
+20 -4
View File
@@ -8178,11 +8178,18 @@ void scst_unblock_dev(struct scst_device *dev)
/**
* scst_obtain_device_parameters() - obtain device control parameters
* @dev: device to act on
* @mode_select_cdb: original MODE SELECT CDB
*
* Issues a MODE SENSE for control mode page data and sets the corresponding
* dev's parameter from it. Returns 0 on success and not 0 otherwise.
* Issues a MODE SENSE for necessary pages data and sets the corresponding
* dev's parameter from it. Parameter mode_select_cdb is pointer on original
* MODE SELECT CDB, if this function called to refresh parameters after
* successfully finished MODE SELECT command detected.
*
* Returns 0 on success and not 0 otherwise.
*/
int scst_obtain_device_parameters(struct scst_device *dev)
int scst_obtain_device_parameters(struct scst_device *dev,
const uint8_t *mode_select_cdb)
{
int rc, i;
uint8_t cmd[16];
@@ -8193,6 +8200,14 @@ int scst_obtain_device_parameters(struct scst_device *dev)
EXTRACHECKS_BUG_ON(dev->scsi_dev == NULL);
if (mode_select_cdb != NULL) {
if ((mode_select_cdb[2] & 0x3F) != 0x0A) {
TRACE_DBG("Not control mode page (%x) change requested, "
"skipping", mode_select_cdb[2] & 0x3F);
goto out;
}
}
for (i = 0; i < 5; i++) {
/* Get control mode page */
memset(cmd, 0, sizeof(cmd));
@@ -8274,7 +8289,8 @@ int scst_obtain_device_parameters(struct scst_device *dev)
SCST_SENSE_KEY_VALID,
ILLEGAL_REQUEST, 0, 0)) {
PRINT_INFO("Device %s doesn't support "
"MODE SENSE", dev->virt_name);
"MODE SENSE or control mode page",
dev->virt_name);
break;
} else if (scst_analyze_sense(sense_buffer,
sizeof(sense_buffer),
scst/src/scst_targ.c
+4 -4
View File
@@ -773,8 +773,8 @@ static int scst_parse_cmd(struct scst_cmd *cmd)
devt->name, cmd->tgtt->name, cmd->bufflen);
PRINT_BUFF_FLAG(TRACE_MINOR, "Suspicious CDB",
cmd->cdb, cmd->cdb_len);
if ((cmd->data_direction & SCST_DATA_READ) ||
(cmd->data_direction & SCST_DATA_WRITE))
if ((cmd->expected_data_direction & SCST_DATA_READ) ||
(cmd->expected_data_direction & SCST_DATA_WRITE))
cmd->resid_possible = 1;
}
if (unlikely(cmd->out_bufflen != cmd->expected_out_transfer_len)) {
@@ -3287,7 +3287,7 @@ static int scst_mode_select_checks(struct scst_cmd *cmd)
spin_unlock_bh(&dev->dev_lock);
if (dev->scsi_dev != NULL)
scst_obtain_device_parameters(dev);
scst_obtain_device_parameters(dev, cmd->cdb);
}
} else if ((cmd->status == SAM_STAT_CHECK_CONDITION) &&
scst_is_ua_sense(cmd->sense, cmd->sense_valid_len) &&
@@ -3317,7 +3317,7 @@ static int scst_mode_select_checks(struct scst_cmd *cmd)
"(LUN %lld): getting new parameters", cmd->sense[12],
(long long unsigned int)cmd->lun);
scst_obtain_device_parameters(cmd->dev);
scst_obtain_device_parameters(cmd->dev, NULL);
} else
sBUG();