|
|
@@ -2956,7 +2956,7 @@ static int hpsa_send_reset(struct ctlr_info *h, unsigned char *scsi3addr,
|
|
|
/* fill_cmd can't fail here, no data buffer to map. */
|
|
|
(void) fill_cmd(c, reset_type, h, NULL, 0, 0,
|
|
|
scsi3addr, TYPE_MSG);
|
|
|
- rc = hpsa_scsi_do_simple_cmd(h, c, reply_queue, DEFAULT_TIMEOUT);
|
|
|
+ rc = hpsa_scsi_do_simple_cmd(h, c, reply_queue, NO_TIMEOUT);
|
|
|
if (rc) {
|
|
|
dev_warn(&h->pdev->dev, "Failed to send reset command\n");
|
|
|
goto out;
|
|
|
@@ -3714,7 +3714,7 @@ exit_failed:
|
|
|
* # (integer code indicating one of several NOT READY states
|
|
|
* describing why a volume is to be kept offline)
|
|
|
*/
|
|
|
-static int hpsa_volume_offline(struct ctlr_info *h,
|
|
|
+static unsigned char hpsa_volume_offline(struct ctlr_info *h,
|
|
|
unsigned char scsi3addr[])
|
|
|
{
|
|
|
struct CommandList *c;
|
|
|
@@ -3735,7 +3735,7 @@ static int hpsa_volume_offline(struct ctlr_info *h,
|
|
|
DEFAULT_TIMEOUT);
|
|
|
if (rc) {
|
|
|
cmd_free(h, c);
|
|
|
- return 0;
|
|
|
+ return HPSA_VPD_LV_STATUS_UNSUPPORTED;
|
|
|
}
|
|
|
sense = c->err_info->SenseInfo;
|
|
|
if (c->err_info->SenseLen > sizeof(c->err_info->SenseInfo))
|
|
|
@@ -3746,19 +3746,13 @@ static int hpsa_volume_offline(struct ctlr_info *h,
|
|
|
cmd_status = c->err_info->CommandStatus;
|
|
|
scsi_status = c->err_info->ScsiStatus;
|
|
|
cmd_free(h, c);
|
|
|
- /* Is the volume 'not ready'? */
|
|
|
- if (cmd_status != CMD_TARGET_STATUS ||
|
|
|
- scsi_status != SAM_STAT_CHECK_CONDITION ||
|
|
|
- sense_key != NOT_READY ||
|
|
|
- asc != ASC_LUN_NOT_READY) {
|
|
|
- return 0;
|
|
|
- }
|
|
|
|
|
|
/* Determine the reason for not ready state */
|
|
|
ldstat = hpsa_get_volume_status(h, scsi3addr);
|
|
|
|
|
|
/* Keep volume offline in certain cases: */
|
|
|
switch (ldstat) {
|
|
|
+ case HPSA_LV_FAILED:
|
|
|
case HPSA_LV_UNDERGOING_ERASE:
|
|
|
case HPSA_LV_NOT_AVAILABLE:
|
|
|
case HPSA_LV_UNDERGOING_RPI:
|
|
|
@@ -3780,7 +3774,7 @@ static int hpsa_volume_offline(struct ctlr_info *h,
|
|
|
default:
|
|
|
break;
|
|
|
}
|
|
|
- return 0;
|
|
|
+ return HPSA_LV_OK;
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
@@ -3853,10 +3847,10 @@ static int hpsa_update_device_info(struct ctlr_info *h,
|
|
|
/* Do an inquiry to the device to see what it is. */
|
|
|
if (hpsa_scsi_do_inquiry(h, scsi3addr, 0, inq_buff,
|
|
|
(unsigned char) OBDR_TAPE_INQ_SIZE) != 0) {
|
|
|
- /* Inquiry failed (msg printed already) */
|
|
|
dev_err(&h->pdev->dev,
|
|
|
- "hpsa_update_device_info: inquiry failed\n");
|
|
|
- rc = -EIO;
|
|
|
+ "%s: inquiry failed, device will be skipped.\n",
|
|
|
+ __func__);
|
|
|
+ rc = HPSA_INQUIRY_FAILED;
|
|
|
goto bail_out;
|
|
|
}
|
|
|
|
|
|
@@ -3885,15 +3879,19 @@ static int hpsa_update_device_info(struct ctlr_info *h,
|
|
|
if ((this_device->devtype == TYPE_DISK ||
|
|
|
this_device->devtype == TYPE_ZBC) &&
|
|
|
is_logical_dev_addr_mode(scsi3addr)) {
|
|
|
- int volume_offline;
|
|
|
+ unsigned char volume_offline;
|
|
|
|
|
|
hpsa_get_raid_level(h, scsi3addr, &this_device->raid_level);
|
|
|
if (h->fw_support & MISC_FW_RAID_OFFLOAD_BASIC)
|
|
|
hpsa_get_ioaccel_status(h, scsi3addr, this_device);
|
|
|
volume_offline = hpsa_volume_offline(h, scsi3addr);
|
|
|
- if (volume_offline < 0 || volume_offline > 0xff)
|
|
|
- volume_offline = HPSA_VPD_LV_STATUS_UNSUPPORTED;
|
|
|
- this_device->volume_offline = volume_offline & 0xff;
|
|
|
+ if (volume_offline == HPSA_LV_FAILED) {
|
|
|
+ rc = HPSA_LV_FAILED;
|
|
|
+ dev_err(&h->pdev->dev,
|
|
|
+ "%s: LV failed, device will be skipped.\n",
|
|
|
+ __func__);
|
|
|
+ goto bail_out;
|
|
|
+ }
|
|
|
} else {
|
|
|
this_device->raid_level = RAID_UNKNOWN;
|
|
|
this_device->offload_config = 0;
|
|
|
@@ -4379,8 +4377,7 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h)
|
|
|
goto out;
|
|
|
}
|
|
|
if (rc) {
|
|
|
- dev_warn(&h->pdev->dev,
|
|
|
- "Inquiry failed, skipping device.\n");
|
|
|
+ h->drv_req_rescan = 1;
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
@@ -5558,7 +5555,7 @@ static void hpsa_scan_complete(struct ctlr_info *h)
|
|
|
|
|
|
spin_lock_irqsave(&h->scan_lock, flags);
|
|
|
h->scan_finished = 1;
|
|
|
- wake_up_all(&h->scan_wait_queue);
|
|
|
+ wake_up(&h->scan_wait_queue);
|
|
|
spin_unlock_irqrestore(&h->scan_lock, flags);
|
|
|
}
|
|
|
|
|
|
@@ -5576,11 +5573,23 @@ static void hpsa_scan_start(struct Scsi_Host *sh)
|
|
|
if (unlikely(lockup_detected(h)))
|
|
|
return hpsa_scan_complete(h);
|
|
|
|
|
|
+ /*
|
|
|
+ * If a scan is already waiting to run, no need to add another
|
|
|
+ */
|
|
|
+ spin_lock_irqsave(&h->scan_lock, flags);
|
|
|
+ if (h->scan_waiting) {
|
|
|
+ spin_unlock_irqrestore(&h->scan_lock, flags);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ spin_unlock_irqrestore(&h->scan_lock, flags);
|
|
|
+
|
|
|
/* wait until any scan already in progress is finished. */
|
|
|
while (1) {
|
|
|
spin_lock_irqsave(&h->scan_lock, flags);
|
|
|
if (h->scan_finished)
|
|
|
break;
|
|
|
+ h->scan_waiting = 1;
|
|
|
spin_unlock_irqrestore(&h->scan_lock, flags);
|
|
|
wait_event(h->scan_wait_queue, h->scan_finished);
|
|
|
/* Note: We don't need to worry about a race between this
|
|
|
@@ -5590,6 +5599,7 @@ static void hpsa_scan_start(struct Scsi_Host *sh)
|
|
|
*/
|
|
|
}
|
|
|
h->scan_finished = 0; /* mark scan as in progress */
|
|
|
+ h->scan_waiting = 0;
|
|
|
spin_unlock_irqrestore(&h->scan_lock, flags);
|
|
|
|
|
|
if (unlikely(lockup_detected(h)))
|
|
|
@@ -8792,6 +8802,7 @@ reinit_after_soft_reset:
|
|
|
init_waitqueue_head(&h->event_sync_wait_queue);
|
|
|
mutex_init(&h->reset_mutex);
|
|
|
h->scan_finished = 1; /* no scan currently in progress */
|
|
|
+ h->scan_waiting = 0;
|
|
|
|
|
|
pci_set_drvdata(pdev, h);
|
|
|
h->ndevices = 0;
|
James Bottomley