Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 852af20a authored by Matt Bondurant's avatar Matt Bondurant Committed by James Bottomley
Browse files

[SCSI] hpsa: retry driver initiated commands on busy status 



In shared SAS configurations we might get a busy status
during driver initiated commands (e.g. during rescan for
devices).  We should retry the command in such cases rather
than giving up.

Signed-off-by: default avatarMatt Bondurant <Matthew.dav.bondurant@hp.com>
Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 2c17d2da

drivers/scsi/hpsa.c

+12 −1
Original line number Diff line number Diff line
@@ -234,6 +234,16 @@ static int check_for_unit_attention(struct ctlr_info *h, 
	return 1;

}



static int check_for_busy(struct ctlr_info *h, struct CommandList *c)

{

	if (c->err_info->CommandStatus != CMD_TARGET_STATUS ||

		(c->err_info->ScsiStatus != SAM_STAT_BUSY &&

		 c->err_info->ScsiStatus != SAM_STAT_TASK_SET_FULL))

		return 0;

	dev_warn(&h->pdev->dev, HPSA "device busy");

	return 1;

}



static ssize_t host_store_rescan(struct device *dev,

				 struct device_attribute *attr,

				 const char *buf, size_t count)
@@ -1379,7 +1389,8 @@ static void hpsa_scsi_do_simple_cmd_with_retry(struct ctlr_info *h, 
		memset(c->err_info, 0, sizeof(*c->err_info));

		hpsa_scsi_do_simple_cmd_core(h, c);

		retry_count++;

	} while (check_for_unit_attention(h, c) && retry_count <= 3);

	} while ((check_for_unit_attention(h, c) ||

			check_for_busy(h, c)) && retry_count <= 3);

	hpsa_pci_unmap(h->pdev, c, 1, data_direction);

}