Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d018ad0 authored by Sumant Patro's avatar Sumant Patro Committed by James Bottomley
Browse files

[SCSI] megaraid_sas: adds tasklet for cmd completion 



This patch adds a tasklet for command completion.

Signed-off-by: default avatarSumant Patro <Sumant.Patro@lsil.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 658dcedb

drivers/scsi/megaraid/megaraid_sas.c

+44 −22
Original line number Diff line number Diff line
@@ -1271,11 +1271,6 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd, 
static int

megasas_deplete_reply_queue(struct megasas_instance *instance, u8 alt_status)

{

	u32 producer;

	u32 consumer;

	u32 context;

	struct megasas_cmd *cmd;



	/*

	 * Check if it is our interrupt

	 * Clear the interrupt
@@ -1283,23 +1278,10 @@ megasas_deplete_reply_queue(struct megasas_instance *instance, u8 alt_status) 
	if(instance->instancet->clear_intr(instance->reg_set))

		return IRQ_NONE;



	producer = *instance->producer;

	consumer = *instance->consumer;



	while (consumer != producer) {

		context = instance->reply_queue[consumer];



		cmd = instance->cmd_list[context];



		megasas_complete_cmd(instance, cmd, alt_status);



		consumer++;

		if (consumer == (instance->max_fw_cmds + 1)) {

			consumer = 0;

		}

	}



	*instance->consumer = producer;

        /*

	 * Schedule the tasklet for cmd completion

	 */

	tasklet_schedule(&instance->isr_tasklet);



	return IRQ_HANDLED;

}
@@ -1741,6 +1723,39 @@ megasas_get_ctrl_info(struct megasas_instance *instance, 
	return ret;

}



/**

 * megasas_complete_cmd_dpc	 -	Returns FW's controller structure

 * @instance_addr:			Address of adapter soft state

 *

 * Tasklet to complete cmds

 */

void megasas_complete_cmd_dpc(unsigned long instance_addr)

{

	u32 producer;

	u32 consumer;

	u32 context;

	struct megasas_cmd *cmd;

	struct megasas_instance *instance = (struct megasas_instance *)instance_addr;



	producer = *instance->producer;

	consumer = *instance->consumer;



	while (consumer != producer) {

		context = instance->reply_queue[consumer];



		cmd = instance->cmd_list[context];



		megasas_complete_cmd(instance, cmd, DID_OK);



		consumer++;

		if (consumer == (instance->max_fw_cmds + 1)) {

			consumer = 0;

		}

	}



	*instance->consumer = producer;

}



/**

 * megasas_init_mfi -	Initializes the FW

 * @instance:		Adapter soft state
@@ -1911,6 +1926,12 @@ static int megasas_init_mfi(struct megasas_instance *instance) 


	kfree(ctrl_info);



        /*

	* Setup tasklet for cmd completion

	*/



        tasklet_init(&instance->isr_tasklet, megasas_complete_cmd_dpc,

                        (unsigned long)instance);

	return 0;



      fail_fw_init:
@@ -2470,6 +2491,7 @@ static void megasas_detach_one(struct pci_dev *pdev) 
	scsi_remove_host(instance->host);

	megasas_flush_cache(instance);

	megasas_shutdown_controller(instance);

	tasklet_kill(&instance->isr_tasklet);



	/*

	 * Take the instance off the instance array. Note that we will not

drivers/scsi/megaraid/megaraid_sas.h

+1 −0
Original line number Diff line number Diff line
@@ -1102,6 +1102,7 @@ struct megasas_instance { 
	u32 hw_crit_error;



	struct megasas_instance_template *instancet;

	struct tasklet_struct isr_tasklet;

};



#define MEGASAS_IS_LOGICAL(scp)						\