diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 3 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 13 | ||||
-rw-r--r-- | drivers/scsi/scsi_error.c | 10 | ||||
-rw-r--r-- | drivers/scsi/scsi_lib.c | 5 | ||||
-rw-r--r-- | drivers/scsi/scsi_scan.c | 10 |
5 files changed, 34 insertions, 7 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index dc27598785e..ed38454228c 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c | |||
@@ -4066,7 +4066,6 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
4066 | spin_lock_init(&instance->cmd_pool_lock); | 4066 | spin_lock_init(&instance->cmd_pool_lock); |
4067 | spin_lock_init(&instance->hba_lock); | 4067 | spin_lock_init(&instance->hba_lock); |
4068 | spin_lock_init(&instance->completion_lock); | 4068 | spin_lock_init(&instance->completion_lock); |
4069 | spin_lock_init(&poll_aen_lock); | ||
4070 | 4069 | ||
4071 | mutex_init(&instance->aen_mutex); | 4070 | mutex_init(&instance->aen_mutex); |
4072 | mutex_init(&instance->reset_mutex); | 4071 | mutex_init(&instance->reset_mutex); |
@@ -5392,6 +5391,8 @@ static int __init megasas_init(void) | |||
5392 | printk(KERN_INFO "megasas: %s %s\n", MEGASAS_VERSION, | 5391 | printk(KERN_INFO "megasas: %s %s\n", MEGASAS_VERSION, |
5393 | MEGASAS_EXT_VERSION); | 5392 | MEGASAS_EXT_VERSION); |
5394 | 5393 | ||
5394 | spin_lock_init(&poll_aen_lock); | ||
5395 | |||
5395 | support_poll_for_event = 2; | 5396 | support_poll_for_event = 2; |
5396 | support_device_change = 1; | 5397 | support_device_change = 1; |
5397 | 5398 | ||
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index 9d46fcbe775..b25757d1e91 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c | |||
@@ -2424,10 +2424,13 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc, int sleep_flag) | |||
2424 | } | 2424 | } |
2425 | 2425 | ||
2426 | /* command line tunables for max controller queue depth */ | 2426 | /* command line tunables for max controller queue depth */ |
2427 | if (max_queue_depth != -1) | 2427 | if (max_queue_depth != -1 && max_queue_depth != 0) { |
2428 | max_request_credit = (max_queue_depth < facts->RequestCredit) | 2428 | max_request_credit = min_t(u16, max_queue_depth + |
2429 | ? max_queue_depth : facts->RequestCredit; | 2429 | ioc->hi_priority_depth + ioc->internal_depth, |
2430 | else | 2430 | facts->RequestCredit); |
2431 | if (max_request_credit > MAX_HBA_QUEUE_DEPTH) | ||
2432 | max_request_credit = MAX_HBA_QUEUE_DEPTH; | ||
2433 | } else | ||
2431 | max_request_credit = min_t(u16, facts->RequestCredit, | 2434 | max_request_credit = min_t(u16, facts->RequestCredit, |
2432 | MAX_HBA_QUEUE_DEPTH); | 2435 | MAX_HBA_QUEUE_DEPTH); |
2433 | 2436 | ||
@@ -2502,7 +2505,7 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc, int sleep_flag) | |||
2502 | /* set the scsi host can_queue depth | 2505 | /* set the scsi host can_queue depth |
2503 | * with some internal commands that could be outstanding | 2506 | * with some internal commands that could be outstanding |
2504 | */ | 2507 | */ |
2505 | ioc->shost->can_queue = ioc->scsiio_depth - (2); | 2508 | ioc->shost->can_queue = ioc->scsiio_depth; |
2506 | dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "scsi host: " | 2509 | dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "scsi host: " |
2507 | "can_queue depth (%d)\n", ioc->name, ioc->shost->can_queue)); | 2510 | "can_queue depth (%d)\n", ioc->name, ioc->shost->can_queue)); |
2508 | 2511 | ||
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 4a6381c8725..de2337f255a 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
@@ -42,6 +42,8 @@ | |||
42 | 42 | ||
43 | #include <trace/events/scsi.h> | 43 | #include <trace/events/scsi.h> |
44 | 44 | ||
45 | static void scsi_eh_done(struct scsi_cmnd *scmd); | ||
46 | |||
45 | #define SENSE_TIMEOUT (10*HZ) | 47 | #define SENSE_TIMEOUT (10*HZ) |
46 | 48 | ||
47 | /* | 49 | /* |
@@ -241,6 +243,14 @@ static int scsi_check_sense(struct scsi_cmnd *scmd) | |||
241 | if (! scsi_command_normalize_sense(scmd, &sshdr)) | 243 | if (! scsi_command_normalize_sense(scmd, &sshdr)) |
242 | return FAILED; /* no valid sense data */ | 244 | return FAILED; /* no valid sense data */ |
243 | 245 | ||
246 | if (scmd->cmnd[0] == TEST_UNIT_READY && scmd->scsi_done != scsi_eh_done) | ||
247 | /* | ||
248 | * nasty: for mid-layer issued TURs, we need to return the | ||
249 | * actual sense data without any recovery attempt. For eh | ||
250 | * issued ones, we need to try to recover and interpret | ||
251 | */ | ||
252 | return SUCCESS; | ||
253 | |||
244 | if (scsi_sense_is_deferred(&sshdr)) | 254 | if (scsi_sense_is_deferred(&sshdr)) |
245 | return NEEDS_RETRY; | 255 | return NEEDS_RETRY; |
246 | 256 | ||
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index ffd77739ae3..faa790fba13 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -776,7 +776,6 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) | |||
776 | } | 776 | } |
777 | 777 | ||
778 | if (req->cmd_type == REQ_TYPE_BLOCK_PC) { /* SG_IO ioctl from block level */ | 778 | if (req->cmd_type == REQ_TYPE_BLOCK_PC) { /* SG_IO ioctl from block level */ |
779 | req->errors = result; | ||
780 | if (result) { | 779 | if (result) { |
781 | if (sense_valid && req->sense) { | 780 | if (sense_valid && req->sense) { |
782 | /* | 781 | /* |
@@ -792,6 +791,10 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) | |||
792 | if (!sense_deferred) | 791 | if (!sense_deferred) |
793 | error = __scsi_error_from_host_byte(cmd, result); | 792 | error = __scsi_error_from_host_byte(cmd, result); |
794 | } | 793 | } |
794 | /* | ||
795 | * __scsi_error_from_host_byte may have reset the host_byte | ||
796 | */ | ||
797 | req->errors = cmd->result; | ||
795 | 798 | ||
796 | req->resid_len = scsi_get_resid(cmd); | 799 | req->resid_len = scsi_get_resid(cmd); |
797 | 800 | ||
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 56a93794c47..d947ffc20ce 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
@@ -764,6 +764,16 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, | |||
764 | sdev->model = (char *) (sdev->inquiry + 16); | 764 | sdev->model = (char *) (sdev->inquiry + 16); |
765 | sdev->rev = (char *) (sdev->inquiry + 32); | 765 | sdev->rev = (char *) (sdev->inquiry + 32); |
766 | 766 | ||
767 | if (strncmp(sdev->vendor, "ATA ", 8) == 0) { | ||
768 | /* | ||
769 | * sata emulation layer device. This is a hack to work around | ||
770 | * the SATL power management specifications which state that | ||
771 | * when the SATL detects the device has gone into standby | ||
772 | * mode, it shall respond with NOT READY. | ||
773 | */ | ||
774 | sdev->allow_restart = 1; | ||
775 | } | ||
776 | |||
767 | if (*bflags & BLIST_ISROM) { | 777 | if (*bflags & BLIST_ISROM) { |
768 | sdev->type = TYPE_ROM; | 778 | sdev->type = TYPE_ROM; |
769 | sdev->removable = 1; | 779 | sdev->removable = 1; |