Commit 69b80a0e authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: libsas: Add sas_abort_task_set() 

Add a generic implementation of abort task set TMF handler, and use in
LLDDs.

Link: https://lore.kernel.org/r/1645112566-115804-14-git-send-email-john.garry@huawei.com


Tested-by: default avatarYihang Li <liyihang6@hisilicon.com>
Tested-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 693e66a0

drivers/scsi/hisi_sas/hisi_sas_main.c

+1 −4
Original line number Diff line number Diff line
@@ -1788,7 +1788,6 @@ static int hisi_sas_abort_task_set(struct domain_device *device, u8 *lun) 
{

	struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);

	struct device *dev = hisi_hba->dev;

	struct sas_tmf_task tmf_task;

	int rc;



	rc = hisi_sas_internal_task_abort(hisi_hba, device,
@@ -1799,9 +1798,7 @@ static int hisi_sas_abort_task_set(struct domain_device *device, u8 *lun) 
	}

	hisi_sas_dereg_device(hisi_hba, device);



	tmf_task.tmf = TMF_ABORT_TASK_SET;

	rc = hisi_sas_debug_issue_ssp_tmf(device, lun, &tmf_task);



	rc = sas_abort_task_set(device, lun);

	if (rc == TMF_RESP_FUNC_COMPLETE)

		hisi_sas_release_task(hisi_hba, device);

drivers/scsi/libsas/sas_scsi_host.c

+12 −4
Original line number Diff line number Diff line
@@ -1030,9 +1030,7 @@ int sas_execute_tmf(struct domain_device *device, void *parameter, 
	return res;

}



int sas_execute_ssp_tmf(struct domain_device *device, u8 *lun,

			struct sas_tmf_task *tmf);

int sas_execute_ssp_tmf(struct domain_device *device, u8 *lun,

static int sas_execute_ssp_tmf(struct domain_device *device, u8 *lun,

			       struct sas_tmf_task *tmf)

{

	struct sas_ssp_task ssp_task;
@@ -1045,6 +1043,16 @@ int sas_execute_ssp_tmf(struct domain_device *device, u8 *lun, 
	return sas_execute_tmf(device, &ssp_task, sizeof(ssp_task), -1, tmf);

}



int sas_abort_task_set(struct domain_device *dev, u8 *lun)

{

	struct sas_tmf_task tmf_task = {

		.tmf = TMF_ABORT_TASK_SET,

	};



	return sas_execute_ssp_tmf(dev, lun, &tmf_task);

}

EXPORT_SYMBOL_GPL(sas_abort_task_set);



/*

 * Tell an upper layer that it needs to initiate an abort for a given task.

 * This should only ever be called by an LLDD.

drivers/scsi/mvsas/mv_init.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static struct sas_domain_function_template mvs_transport_ops = { 
	.lldd_control_phy	= mvs_phy_control,



	.lldd_abort_task	= mvs_abort_task,

	.lldd_abort_task_set    = mvs_abort_task_set,

	.lldd_abort_task_set    = sas_abort_task_set,

	.lldd_clear_task_set    = mvs_clear_task_set,

	.lldd_I_T_nexus_reset	= mvs_I_T_nexus_reset,

	.lldd_lu_reset 		= mvs_lu_reset,

drivers/scsi/mvsas/mv_sas.c

+0 −11
Original line number Diff line number Diff line
@@ -1536,17 +1536,6 @@ int mvs_abort_task(struct sas_task *task) 
	return rc;

}



int mvs_abort_task_set(struct domain_device *dev, u8 *lun)

{

	int rc;

	struct sas_tmf_task tmf_task;



	tmf_task.tmf = TMF_ABORT_TASK_SET;

	rc = mvs_debug_issue_ssp_tmf(dev, lun, &tmf_task);



	return rc;

}



int mvs_clear_task_set(struct domain_device *dev, u8 *lun)

{

	int rc = TMF_RESP_FUNC_FAILED;

drivers/scsi/mvsas/mv_sas.h

+0 −1
Original line number Diff line number Diff line
@@ -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_queue_command(struct sas_task *task, gfp_t gfp_flags);

int mvs_abort_task(struct sas_task *task);

int mvs_abort_task_set(struct domain_device *dev, u8 *lun);

int mvs_clear_task_set(struct domain_device *dev, u8 * lun);

void mvs_port_formed(struct asd_sas_phy *sas_phy);

void mvs_port_deformed(struct asd_sas_phy *sas_phy);