Commit 2037a340 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: libsas: Add TMF handler exec complete callback 

The pm8001 TMF handler has some special processing when the TMF completes,
so add a callback and fill it in for the pm8001 driver.

Link: https://lore.kernel.org/r/1645112566-115804-12-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 350d85ba

drivers/scsi/libsas/sas_scsi_host.c

+3 −0
Original line number Diff line number Diff line
@@ -957,6 +957,9 @@ int sas_execute_tmf(struct domain_device *device, void *parameter, 


		wait_for_completion(&task->slow_task->completion);



		if (i->dft->lldd_tmf_exec_complete)

			i->dft->lldd_tmf_exec_complete(device);



		res = TMF_RESP_FUNC_FAILED;



		if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {

drivers/scsi/pm8001/pm8001_init.c

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ static struct sas_domain_function_template pm8001_transport_ops = { 
	.lldd_lu_reset		= pm8001_lu_reset,

	.lldd_query_task	= pm8001_query_task,

	.lldd_port_formed	= pm8001_port_formed,

	.lldd_tmf_exec_complete = pm8001_setds_completion,

};



/**

drivers/scsi/pm8001/pm8001_sas.c

+14 −0
Original line number Diff line number Diff line
@@ -1376,3 +1376,17 @@ void pm8001_port_formed(struct asd_sas_phy *sas_phy) 
	}

	sas_port->lldd_port = port;

}



void pm8001_setds_completion(struct domain_device *dev)

{

	struct pm8001_hba_info *pm8001_ha = pm8001_find_ha_by_dev(dev);

	struct pm8001_device *pm8001_dev = dev->lldd_dev;

	DECLARE_COMPLETION_ONSTACK(completion_setstate);



	if (pm8001_ha->chip_id != chip_8001) {

		pm8001_dev->setds_completion = &completion_setstate;

		PM8001_CHIP_DISP->set_dev_state_req(pm8001_ha,

			pm8001_dev, DS_OPERATIONAL);

		wait_for_completion(&completion_setstate);

	}

}

drivers/scsi/pm8001/pm8001_sas.h

+1 −0
Original line number Diff line number Diff line
@@ -742,6 +742,7 @@ pm8001_ccb_task_free_done(struct pm8001_hba_info *pm8001_ha, 
	smp_mb(); /*in order to force CPU ordering*/

	task->task_done(task);

}

void pm8001_setds_completion(struct domain_device *dev);



#endif

include/scsi/libsas.h

+3 −0
Original line number Diff line number Diff line
@@ -652,6 +652,9 @@ struct sas_domain_function_template { 
	int (*lldd_lu_reset)(struct domain_device *, u8 *lun);

	int (*lldd_query_task)(struct sas_task *);



	/* Special TMF callbacks */

	void (*lldd_tmf_exec_complete)(struct domain_device *dev);



	/* Port and Adapter management */

	int (*lldd_clear_nexus_port)(struct asd_sas_port *);

	int (*lldd_clear_nexus_ha)(struct sas_ha_struct *);