Add sas_internal_timeout(), which is the timeout handler for reserved
commands, and plug into the libsas LLDDs.
Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/scsi/aic94xx/aic94xx_init.c | 1 +
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 1 +
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 1 +
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 +
drivers/scsi/isci/init.c | 1 +
drivers/scsi/libsas/sas_scsi_host.c | 18 ++++++++++++++++++
drivers/scsi/mvsas/mv_init.c | 1 +
drivers/scsi/pm8001/pm8001_init.c | 1 +
include/scsi/libsas.h | 1 +
9 files changed, 26 insertions(+)
@@ -61,6 +61,7 @@ static struct scsi_host_template aic94xx_sht = {
#endif
.track_queue_depth = 1,
.reserved_queuecommand = sas_queuecommand_internal,
+ .reserved_timedout = sas_internal_timeout,
};
static int asd_map_memio(struct asd_ha_struct *asd_ha)
@@ -1761,6 +1761,7 @@ static struct scsi_host_template sht_v1_hw = {
.shost_groups = host_v1_hw_groups,
.host_reset = hisi_sas_host_reset,
.reserved_queuecommand = sas_queuecommand_internal,
+ .reserved_timedout = sas_internal_timeout,
};
static const struct hisi_sas_hw hisi_sas_v1_hw = {
@@ -3579,6 +3579,7 @@ static struct scsi_host_template sht_v2_hw = {
.map_queues = map_queues_v2_hw,
.host_tagset = 1,
.reserved_queuecommand = sas_queuecommand_internal,
+ .reserved_timedout = sas_internal_timeout,
};
static const struct hisi_sas_hw hisi_sas_v2_hw = {
@@ -3246,6 +3246,7 @@ static struct scsi_host_template sht_v3_hw = {
.host_reset = hisi_sas_host_reset,
.host_tagset = 1,
.reserved_queuecommand = sas_queuecommand_internal,
+ .reserved_timedout = sas_internal_timeout,
};
static const struct hisi_sas_hw hisi_sas_v3_hw = {
@@ -178,6 +178,7 @@ static struct scsi_host_template isci_sht = {
.shost_groups = isci_host_groups,
.track_queue_depth = 1,
.reserved_queuecommand = sas_queuecommand_internal,
+ .reserved_timedout = sas_internal_timeout,
};
static struct sas_domain_function_template isci_transport_ops = {
@@ -930,6 +930,24 @@ void sas_task_internal_timedout(struct timer_list *t)
if (!is_completed)
complete(&task->slow_task->completion);
}
+enum blk_eh_timer_return sas_internal_timeout(struct scsi_cmnd *scmd)
+{
+ struct sas_task *task = TO_SAS_TASK(scmd);
+ bool is_completed = true;
+ unsigned long flags;
+
+ spin_lock_irqsave(&task->task_state_lock, flags);
+ if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
+ task->task_state_flags |= SAS_TASK_STATE_ABORTED;
+ is_completed = false;
+ }
+ spin_unlock_irqrestore(&task->task_state_lock, flags);
+
+ if (!is_completed)
+ complete(&task->slow_task->completion);
+ return BLK_EH_DONE;
+}
+EXPORT_SYMBOL_GPL(sas_internal_timeout);
#define TASK_TIMEOUT (20 * HZ)
#define TASK_RETRY 3
@@ -55,6 +55,7 @@ static struct scsi_host_template mvs_sht = {
.shost_groups = mvst_host_groups,
.track_queue_depth = 1,
.reserved_queuecommand = sas_queuecommand_internal,
+ .reserved_timedout = sas_internal_timeout,
};
static struct sas_domain_function_template mvs_transport_ops = {
@@ -124,6 +124,7 @@ static struct scsi_host_template pm8001_sht = {
.cmd_per_lun = 32,
.map_queues = pm8001_map_queues,
.reserved_queuecommand = sas_queuecommand_internal,
+ .reserved_timedout = sas_internal_timeout,
};
/*
@@ -711,6 +711,7 @@ int sas_set_phy_speed(struct sas_phy *phy, struct sas_phy_linkrates *rates);
int sas_phy_reset(struct sas_phy *phy, int hard_reset);
int sas_phy_enable(struct sas_phy *phy, int enable);
extern int sas_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
+extern enum blk_eh_timer_return sas_internal_timeout(struct scsi_cmnd *scmd);
extern int sas_target_alloc(struct scsi_target *);
extern int sas_slave_configure(struct scsi_device *);
extern int sas_change_queue_depth(struct scsi_device *, int new_depth);