leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: libsas: Add TMF handler aborted callback

Browse Source 
The hisi_sas and pm8001 TMF handlers have some special processing for when
the TMF is aborted, so add a callback and fill it in for those drivers.

Link: https://lore.kernel.org/r/1645112566-115804-13-git-send-email-john.garry@huawei.com
Tested-by: Yihang Li <liyihang6@hisilicon.com>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
John Garry
2022-02-17 23:42:40 +08:00
committed by Martin K. Petersen
parent 2037a34031
commit 693e66a0a6
6 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/scsi/hisi_sas/hisi_sas_main.c
View File

@@ -666,6 +666,25 @@ static struct hisi_sas_device *hisi_sas_alloc_dev(struct domain_device *device)
return sas_dev; return sas_dev;
} }
static void hisi_sas_tmf_aborted(struct sas_task *task)
{
struct hisi_sas_slot *slot = task->lldd_task;
struct domain_device *device = task->dev;
struct hisi_sas_device *sas_dev = device->lldd_dev;
struct hisi_hba *hisi_hba = sas_dev->hisi_hba;
if (slot) {
struct hisi_sas_cq *cq =
&hisi_hba->cq[slot->dlvry_queue];
/*
* sync irq to avoid free'ing task
* before using task in IO completion
*/
synchronize_irq(cq->irq_no);
slot->task = NULL;
}
}
#define HISI_SAS_DISK_RECOVER_CNT 3 #define HISI_SAS_DISK_RECOVER_CNT 3
static int hisi_sas_init_device(struct domain_device *device) static int hisi_sas_init_device(struct domain_device *device)
{ {
@@ -2322,6 +2341,7 @@ static struct sas_domain_function_template hisi_sas_transport_ops = {
.lldd_clear_nexus_ha = hisi_sas_clear_nexus_ha, .lldd_clear_nexus_ha = hisi_sas_clear_nexus_ha,
.lldd_port_formed = hisi_sas_port_formed, .lldd_port_formed = hisi_sas_port_formed,
.lldd_write_gpio = hisi_sas_write_gpio, .lldd_write_gpio = hisi_sas_write_gpio,
.lldd_tmf_aborted = hisi_sas_tmf_aborted,
}; };
void hisi_sas_init_mem(struct hisi_hba *hisi_hba) void hisi_sas_init_mem(struct hisi_hba *hisi_hba)

2
drivers/scsi/libsas/sas_scsi_host.c
View File

@@ -966,6 +966,8 @@ int sas_execute_tmf(struct domain_device *device, void *parameter,
if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) { if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
pr_err("TMF task timeout for %016llx and not done\n", pr_err("TMF task timeout for %016llx and not done\n",
SAS_ADDR(device->sas_addr)); SAS_ADDR(device->sas_addr));
if (i->dft->lldd_tmf_aborted)
i->dft->lldd_tmf_aborted(task);
break; break;
} }
pr_warn("TMF task timeout for %016llx and done\n", pr_warn("TMF task timeout for %016llx and done\n",

1
drivers/scsi/pm8001/pm8001_init.c
View File

@@ -129,6 +129,7 @@ static struct sas_domain_function_template pm8001_transport_ops = {
.lldd_query_task = pm8001_query_task, .lldd_query_task = pm8001_query_task,
.lldd_port_formed = pm8001_port_formed, .lldd_port_formed = pm8001_port_formed,
.lldd_tmf_exec_complete = pm8001_setds_completion, .lldd_tmf_exec_complete = pm8001_setds_completion,
.lldd_tmf_aborted = pm8001_tmf_aborted,
}; };
/** /**

8
drivers/scsi/pm8001/pm8001_sas.c
View File

@@ -1390,3 +1390,11 @@ void pm8001_setds_completion(struct domain_device *dev)
wait_for_completion(&completion_setstate); wait_for_completion(&completion_setstate);
} }
} }
void pm8001_tmf_aborted(struct sas_task *task)
{
struct pm8001_ccb_info *ccb = task->lldd_task;
if (ccb)
ccb->task = NULL;
}

1
drivers/scsi/pm8001/pm8001_sas.h
View File

@@ -743,6 +743,7 @@ pm8001_ccb_task_free_done(struct pm8001_hba_info *pm8001_ha,
task->task_done(task); task->task_done(task);
} }
void pm8001_setds_completion(struct domain_device *dev); void pm8001_setds_completion(struct domain_device *dev);
void pm8001_tmf_aborted(struct sas_task *task);
#endif #endif

1
include/scsi/libsas.h
View File

@@ -654,6 +654,7 @@ struct sas_domain_function_template {
/* Special TMF callbacks */ /* Special TMF callbacks */
void (*lldd_tmf_exec_complete)(struct domain_device *dev); void (*lldd_tmf_exec_complete)(struct domain_device *dev);
void (*lldd_tmf_aborted)(struct sas_task *task);
/* Port and Adapter management */ /* Port and Adapter management */
int (*lldd_clear_nexus_port)(struct asd_sas_port *); int (*lldd_clear_nexus_port)(struct asd_sas_port *);