[SCSI] hpsa: teach hpsa_device_reset to do either target or lun reset
Signed-off-by: Scott Teel <scott.teel@hp.com> Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
c349775e4c
commit
bf711ac654
|
@ -1858,7 +1858,8 @@ out:
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int hpsa_send_reset(struct ctlr_info *h, unsigned char *scsi3addr)
|
static int hpsa_send_reset(struct ctlr_info *h, unsigned char *scsi3addr,
|
||||||
|
u8 reset_type)
|
||||||
{
|
{
|
||||||
int rc = IO_OK;
|
int rc = IO_OK;
|
||||||
struct CommandList *c;
|
struct CommandList *c;
|
||||||
|
@ -1872,8 +1873,9 @@ static int hpsa_send_reset(struct ctlr_info *h, unsigned char *scsi3addr)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* fill_cmd can't fail here, no data buffer to map. */
|
/* fill_cmd can't fail here, no data buffer to map. */
|
||||||
(void) fill_cmd(c, HPSA_DEVICE_RESET_MSG, h,
|
(void) fill_cmd(c, HPSA_DEVICE_RESET_MSG, h, NULL, 0, 0,
|
||||||
NULL, 0, 0, scsi3addr, TYPE_MSG);
|
scsi3addr, TYPE_MSG);
|
||||||
|
c->Request.CDB[1] = reset_type; /* fill_cmd defaults to LUN reset */
|
||||||
hpsa_scsi_do_simple_cmd_core(h, c);
|
hpsa_scsi_do_simple_cmd_core(h, c);
|
||||||
/* no unmap needed here because no data xfer. */
|
/* no unmap needed here because no data xfer. */
|
||||||
|
|
||||||
|
@ -3390,7 +3392,7 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)
|
||||||
dev_warn(&h->pdev->dev, "resetting device %d:%d:%d:%d\n",
|
dev_warn(&h->pdev->dev, "resetting device %d:%d:%d:%d\n",
|
||||||
h->scsi_host->host_no, dev->bus, dev->target, dev->lun);
|
h->scsi_host->host_no, dev->bus, dev->target, dev->lun);
|
||||||
/* send a reset to the SCSI LUN which the command was sent to */
|
/* send a reset to the SCSI LUN which the command was sent to */
|
||||||
rc = hpsa_send_reset(h, dev->scsi3addr);
|
rc = hpsa_send_reset(h, dev->scsi3addr, HPSA_RESET_TYPE_LUN);
|
||||||
if (rc == 0 && wait_for_device_to_become_ready(h, dev->scsi3addr) == 0)
|
if (rc == 0 && wait_for_device_to_become_ready(h, dev->scsi3addr) == 0)
|
||||||
return SUCCESS;
|
return SUCCESS;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue