This has read_capacity_10 have scsi-ml retry errors instead of driving
them itself.
Signed-off-by: Mike Christie <michael.christie@xxxxxxxxxx>
Reviewed-by: Martin Wilck <mwilck@xxxxxxxx>
---
drivers/scsi/sd.c | 76 ++++++++++++++++++++++++++++-------------------
1 file changed, 45 insertions(+), 31 deletions(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 0545fadde8c5..96cf5189dea3 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2435,45 +2435,59 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,
unsigned char *buffer)
{
- unsigned char cmd[16];
+ static const u8 cmd[10] = { READ_CAPACITY };
struct scsi_sense_hdr sshdr;
int sense_valid = 0;
int the_result;
- int retries = 3, reset_retries = READ_CAPACITY_RETRIES_ON_RESET;
sector_t lba;
unsigned sector_size;
+ struct scsi_failure failures[] = {
+ /* Fail immediately for Medium Not Present */
+ {
+ .sense = UNIT_ATTENTION,
+ .asc = 0x3A,
+ .ascq = 0x0,
+ .allowed = 0,
+ .result = SAM_STAT_CHECK_CONDITION,
+ },
+ {
+ .sense = NOT_READY,
+ .asc = 0x3A,
+ .ascq = 0x0,
+ .allowed = 0,
+ .result = SAM_STAT_CHECK_CONDITION,
+ },
+ {
+ .sense = UNIT_ATTENTION,
+ .asc = 0x29,
+ .ascq = 0,
+ /* Device reset might occur several times */
+ .allowed = READ_CAPACITY_RETRIES_ON_RESET,
+ .result = SAM_STAT_CHECK_CONDITION,
+ },
+ /* Any other error not listed above retry */
+ {
+ .result = SCMD_FAILURE_RESULT_ANY,
+ .allowed = 3,
+ },
+ {},
+ };
- do {
- cmd[0] = READ_CAPACITY;
- memset(&cmd[1], 0, 9);
- memset(buffer, 0, 8);
-
- the_result = scsi_exec_req(((struct scsi_exec_args) {
- .sdev = sdp,
- .cmd = cmd,
- .data_dir = DMA_FROM_DEVICE,
- .buf = buffer,
- .buf_len = 8,
- .sshdr = &sshdr,
- .timeout = SD_TIMEOUT,
- .retries = sdkp->max_retries }));
-
- if (media_not_present(sdkp, &sshdr))
- return -ENODEV;
+ memset(buffer, 0, 8);
- if (the_result > 0) {
- sense_valid = scsi_sense_valid(&sshdr);
- if (sense_valid &&
- sshdr.sense_key == UNIT_ATTENTION &&
- sshdr.asc == 0x29 && sshdr.ascq == 0x00)
- /* Device reset might occur several times,
- * give it one more chance */
- if (--reset_retries > 0)
- continue;
- }
- retries--;
+ the_result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdp,
+ .cmd = cmd,
+ .data_dir = DMA_FROM_DEVICE,
+ .buf = buffer,
+ .buf_len = 8,
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries,
+ .failures = failures }));
- } while (the_result && retries);
+ if (media_not_present(sdkp, &sshdr))
+ return -ENODEV;
if (the_result) {
sd_print_result(sdkp, "Read Capacity(10) failed", the_result);
--
2.25.1
