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

scsi: libsas: Add sas_clear_task_set()

Browse Source 
Add a generic implementation of clear task set TMF handler, and use in
LLDDs.

Link: https://lore.kernel.org/r/1645112566-115804-15-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:42 +08:00 committed by Martin K. Petersen
parent 69b80a0ed0
commit e858545295
7 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -690,7 +690,6 @@ static int hisi_sas_init_device(struct domain_device *device)
{ {
int rc = TMF_RESP_FUNC_COMPLETE; int rc = TMF_RESP_FUNC_COMPLETE;
struct scsi_lun lun; struct scsi_lun lun;
struct sas_tmf_task tmf_task;
int retry = HISI_SAS_DISK_RECOVER_CNT; int retry = HISI_SAS_DISK_RECOVER_CNT;
struct hisi_hba *hisi_hba = dev_to_hisi_hba(device); struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
struct device *dev = hisi_hba->dev; struct device *dev = hisi_hba->dev;
@ -700,10 +699,8 @@ static int hisi_sas_init_device(struct domain_device *device)
case SAS_END_DEVICE: case SAS_END_DEVICE:
int_to_scsilun(0, &lun); int_to_scsilun(0, &lun);
tmf_task.tmf = TMF_CLEAR_TASK_SET;
while (retry-- > 0) { while (retry-- > 0) {
rc = hisi_sas_debug_issue_ssp_tmf(device, lun.scsi_lun, rc = sas_clear_task_set(device, lun.scsi_lun);
&tmf_task);
if (rc == TMF_RESP_FUNC_COMPLETE) { if (rc == TMF_RESP_FUNC_COMPLETE) {
hisi_sas_release_task(hisi_hba, device); hisi_sas_release_task(hisi_hba, device);
break; break;

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

@ -1053,6 +1053,16 @@ int sas_abort_task_set(struct domain_device *dev, u8 *lun)
} }
EXPORT_SYMBOL_GPL(sas_abort_task_set); EXPORT_SYMBOL_GPL(sas_abort_task_set);
int sas_clear_task_set(struct domain_device *dev, u8 *lun)
{
struct sas_tmf_task tmf_task = {
.tmf = TMF_CLEAR_TASK_SET,
};
return sas_execute_ssp_tmf(dev, lun, &tmf_task);
}
EXPORT_SYMBOL_GPL(sas_clear_task_set);
/* /*
* Tell an upper layer that it needs to initiate an abort for a given task. * Tell an upper layer that it needs to initiate an abort for a given task.
* This should only ever be called by an LLDD. * This should only ever be called by an LLDD.

2
drivers/scsi/mvsas/mv_init.c
View File

@ -64,7 +64,7 @@ static struct sas_domain_function_template mvs_transport_ops = {
.lldd_abort_task = mvs_abort_task, .lldd_abort_task = mvs_abort_task,
.lldd_abort_task_set = sas_abort_task_set, .lldd_abort_task_set = sas_abort_task_set,
.lldd_clear_task_set = mvs_clear_task_set, .lldd_clear_task_set = sas_clear_task_set,
.lldd_I_T_nexus_reset = mvs_I_T_nexus_reset, .lldd_I_T_nexus_reset = mvs_I_T_nexus_reset,
.lldd_lu_reset = mvs_lu_reset, .lldd_lu_reset = mvs_lu_reset,
.lldd_query_task = mvs_query_task, .lldd_query_task = mvs_query_task,

11
drivers/scsi/mvsas/mv_sas.c
View File

@ -1536,17 +1536,6 @@ out:
return rc; return rc;
} }
int mvs_clear_task_set(struct domain_device *dev, u8 *lun)
{
int rc = TMF_RESP_FUNC_FAILED;
struct sas_tmf_task tmf_task;
tmf_task.tmf = TMF_CLEAR_TASK_SET;
rc = mvs_debug_issue_ssp_tmf(dev, lun, &tmf_task);
return rc;
}
static int mvs_sata_done(struct mvs_info *mvi, struct sas_task *task, static int mvs_sata_done(struct mvs_info *mvi, struct sas_task *task,
u32 slot_idx, int err) u32 slot_idx, int err)
{ {

1
drivers/scsi/mvsas/mv_sas.h
View File

@ -440,7 +440,6 @@ void mvs_scan_start(struct Scsi_Host *shost);
int mvs_scan_finished(struct Scsi_Host *shost, unsigned long time); int mvs_scan_finished(struct Scsi_Host *shost, unsigned long time);
int mvs_queue_command(struct sas_task *task, gfp_t gfp_flags); int mvs_queue_command(struct sas_task *task, gfp_t gfp_flags);
int mvs_abort_task(struct sas_task *task); int mvs_abort_task(struct sas_task *task);
int mvs_clear_task_set(struct domain_device *dev, u8 * lun);
void mvs_port_formed(struct asd_sas_phy *sas_phy); void mvs_port_formed(struct asd_sas_phy *sas_phy);
void mvs_port_deformed(struct asd_sas_phy *sas_phy); void mvs_port_deformed(struct asd_sas_phy *sas_phy);
int mvs_dev_found(struct domain_device *dev); int mvs_dev_found(struct domain_device *dev);

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

@ -1344,14 +1344,12 @@ out:
int pm8001_clear_task_set(struct domain_device *dev, u8 *lun) int pm8001_clear_task_set(struct domain_device *dev, u8 *lun)
{ {
struct sas_tmf_task tmf_task;
struct pm8001_device *pm8001_dev = dev->lldd_dev; struct pm8001_device *pm8001_dev = dev->lldd_dev;
struct pm8001_hba_info *pm8001_ha = pm8001_find_ha_by_dev(dev); struct pm8001_hba_info *pm8001_ha = pm8001_find_ha_by_dev(dev);
pm8001_dbg(pm8001_ha, EH, "I_T_L_Q clear task set[%x]\n", pm8001_dbg(pm8001_ha, EH, "I_T_L_Q clear task set[%x]\n",
pm8001_dev->device_id); pm8001_dev->device_id);
tmf_task.tmf = TMF_CLEAR_TASK_SET; return sas_clear_task_set(dev, lun);
return pm8001_issue_ssp_tmf(dev, lun, &tmf_task);
} }
void pm8001_port_formed(struct asd_sas_phy *sas_phy) void pm8001_port_formed(struct asd_sas_phy *sas_phy)

1
include/scsi/libsas.h
View File

@ -723,6 +723,7 @@ struct sas_phy *sas_get_local_phy(struct domain_device *dev);
int sas_request_addr(struct Scsi_Host *shost, u8 *addr); int sas_request_addr(struct Scsi_Host *shost, u8 *addr);
int sas_abort_task_set(struct domain_device *dev, u8 *lun); int sas_abort_task_set(struct domain_device *dev, u8 *lun);
int sas_clear_task_set(struct domain_device *dev, u8 *lun);
int sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event, int sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event,
gfp_t gfp_flags); gfp_t gfp_flags);