On 29.7.2015 08:27, Viswas.G@xxxxxxxx wrote: > From: Viswas G <Viswas.G@xxxxxxxx> > > In Nexus reset the device state set to DS_IN_RECOVERY before doing > phy reset and internal cleanup. Once internal cleanup finishes, > the device state will set to DS_OPERATIONAL. > > Signed-off-by: Viswas G <Viswas.G@xxxxxxxx> > Signed-off-by: Suresh Thiagarajan <Suresh.Thiagarajan@xxxxxxxx> > --- > drivers/scsi/pm8001/pm8001_sas.c | 14 +++++++++++--- > drivers/scsi/pm8001/pm8001_sas.h | 8 ++++++++ > 2 files changed, 19 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c > index b93f289..4e6955f 100644 > --- a/drivers/scsi/pm8001/pm8001_sas.c > +++ b/drivers/scsi/pm8001/pm8001_sas.c > @@ -980,13 +980,21 @@ int pm8001_I_T_nexus_reset(struct domain_device *dev) > rc = 0; > goto out; > } > + pm8001_dev->setds_completion = &completion_setstate; > + PM8001_CHIP_DISP->set_dev_state_req(pm8001_ha, > + pm8001_dev, DS_IN_RECOVERY); > + wait_for_completion(&completion_setstate); > rc = sas_phy_reset(phy, 1); > msleep(2000); > + if (rc) { > + PM8001_EH_DBG(pm8001_ha, > + pm8001_printk("phy reset failed for device %x\n" > + "with rc %d\n", pm8001_dev->device_id, rc)); > + } > rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev , > dev, 1, 0); > - pm8001_dev->setds_completion = &completion_setstate; > - rc = PM8001_CHIP_DISP->set_dev_state_req(pm8001_ha, > - pm8001_dev, 0x01); > + PM8001_CHIP_DISP->set_dev_state_req(pm8001_ha, > + pm8001_dev, DS_OPERATIONAL); Hi Viswas, the set_dev_state_req can't fail any more ? Also the pm8001_exec_internal_task_abort may fail - shouldn't be error handling also added ? Cheers, Tomas > wait_for_completion(&completion_setstate); > } else { > rc = sas_phy_reset(phy, 1); > diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h > index 8dd8b78..c9736cc 100644 > --- a/drivers/scsi/pm8001/pm8001_sas.h > +++ b/drivers/scsi/pm8001/pm8001_sas.h > @@ -569,6 +569,14 @@ struct pm8001_fw_image_header { > #define NCQ_READ_LOG_FLAG 0x80000000 > #define NCQ_ABORT_ALL_FLAG 0x40000000 > #define NCQ_2ND_RLE_FLAG 0x20000000 > + > +/* Device states */ > +#define DS_OPERATIONAL 0x01 > +#define DS_PORT_IN_RESET 0x02 > +#define DS_IN_RECOVERY 0x03 > +#define DS_IN_ERROR 0x04 > +#define DS_NON_OPERATIONAL 0x07 > + > /** > * brief param structure for firmware flash update. > */ > -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html