| Message ID | 20161116032937.117395-1-zangleigang@hisilicon.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On 2016-11-15 19:29, Zang Leigang wrote: > Add a new ufshcd_state, indicats that an err handler may get to run > immediately. Use UFSHCD_STATE_ERROR here looks not literaly correct. > > Signed-off-by: Zang Leigang <zangleigang@hisilicon.com> > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 05c7456..59d4130 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -123,6 +123,7 @@ enum { > UFSHCD_STATE_RESET, > UFSHCD_STATE_ERROR, > UFSHCD_STATE_OPERATIONAL, > + UFSHCD_STATE_EH_SCHEDULED, > }; > > /* UFSHCD error handling flags */ > @@ -1410,6 +1411,7 @@ static int ufshcd_queuecommand(struct Scsi_Host > *host, struct scsi_cmnd *cmd) > switch (hba->ufshcd_state) { > case UFSHCD_STATE_OPERATIONAL: > break; > + case UFSHCD_STATE_EH_SCHEDULED: > case UFSHCD_STATE_RESET: > err = SCSI_MLQUEUE_HOST_BUSY; > goto out_unlock; > @@ -4158,7 +4160,7 @@ static void ufshcd_check_errors(struct ufs_hba > *hba) > /* block commands from scsi mid-layer */ > scsi_block_requests(hba->host); > > - hba->ufshcd_state = UFSHCD_STATE_ERROR; > + hba->ufshcd_state = UFSHCD_STATE_EH_SCHEDULED; > schedule_work(&hba->eh_work); > } > } LGTM. Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
>>>>> "Zang" == Zang Leigang <zangleigang@hisilicon.com> writes:
Zang> Add a new ufshcd_state, indicats that an err handler may get to
Zang> run immediately. Use UFSHCD_STATE_ERROR here looks not literaly
Zang> correct.
Applied to 4.10/scsi-queue.
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 05c7456..59d4130 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -123,6 +123,7 @@ enum { UFSHCD_STATE_RESET, UFSHCD_STATE_ERROR, UFSHCD_STATE_OPERATIONAL, + UFSHCD_STATE_EH_SCHEDULED, }; /* UFSHCD error handling flags */ @@ -1410,6 +1411,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) switch (hba->ufshcd_state) { case UFSHCD_STATE_OPERATIONAL: break; + case UFSHCD_STATE_EH_SCHEDULED: case UFSHCD_STATE_RESET: err = SCSI_MLQUEUE_HOST_BUSY; goto out_unlock; @@ -4158,7 +4160,7 @@ static void ufshcd_check_errors(struct ufs_hba *hba) /* block commands from scsi mid-layer */ scsi_block_requests(hba->host); - hba->ufshcd_state = UFSHCD_STATE_ERROR; + hba->ufshcd_state = UFSHCD_STATE_EH_SCHEDULED; schedule_work(&hba->eh_work); } }
Add a new ufshcd_state, indicats that an err handler may get to run immediately. Use UFSHCD_STATE_ERROR here looks not literaly correct. Signed-off-by: Zang Leigang <zangleigang@hisilicon.com>