Commit 4aef43b2 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: libsas: Move SMP task handlers to core 

Move the SMP task handlers to the core host code as they will be re-used
for executing internal abort and TMF tasks.

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

drivers/scsi/libsas/sas_expander.c

+2 −22
Original line number Diff line number Diff line
@@ -28,26 +28,6 @@ static int sas_disable_routing(struct domain_device *dev, u8 *sas_addr); 


/* ---------- SMP task management ---------- */



static void smp_task_timedout(struct timer_list *t)

{

	struct sas_task_slow *slow = from_timer(slow, t, timer);

	struct sas_task *task = slow->task;

	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;

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

	}

	spin_unlock_irqrestore(&task->task_state_lock, flags);

}



static void smp_task_done(struct sas_task *task)

{

	del_timer(&task->slow_task->timer);

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

}



/* Give it some long enough timeout. In seconds. */

#define SMP_TIMEOUT 10
@@ -78,9 +58,9 @@ static int smp_execute_task_sg(struct domain_device *dev, 
		task->smp_task.smp_req = *req;

		task->smp_task.smp_resp = *resp;



		task->task_done = smp_task_done;

		task->task_done = sas_task_internal_done;



		task->slow_task->timer.function = smp_task_timedout;

		task->slow_task->timer.function = sas_task_internal_timedout;

		task->slow_task->timer.expires = jiffies + SMP_TIMEOUT*HZ;

		add_timer(&task->slow_task->timer);

drivers/scsi/libsas/sas_internal.h

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ void sas_destruct_devices(struct asd_sas_port *port); 
extern const work_func_t sas_phy_event_fns[PHY_NUM_EVENTS];

extern const work_func_t sas_port_event_fns[PORT_NUM_EVENTS];



void sas_task_internal_done(struct sas_task *task);

void sas_task_internal_timedout(struct timer_list *t);



#ifdef CONFIG_SCSI_SAS_HOST_SMP

extern void sas_smp_host_handler(struct bsg_job *job, struct Scsi_Host *shost);

#else

drivers/scsi/libsas/sas_scsi_host.c

+24 −0
Original line number Diff line number Diff line
@@ -893,6 +893,30 @@ int sas_bios_param(struct scsi_device *scsi_dev, 
}

EXPORT_SYMBOL_GPL(sas_bios_param);



void sas_task_internal_done(struct sas_task *task)

{

	del_timer(&task->slow_task->timer);

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

}



void sas_task_internal_timedout(struct timer_list *t)

{

	struct sas_task_slow *slow = from_timer(slow, t, timer);

	struct sas_task *task = slow->task;

	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);

}



/*

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

 * This should only ever be called by an LLDD.