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

Commit d0f698c4 authored by Kashyap, Desai's avatar Kashyap, Desai Committed by James Bottomley
Browse files

[SCSI] mptfusion: Added new less expensive RESET (Message Unit Reset) 



Message Unit Reset - instructs the IOC to reset the Reply Post and
Free FIFO's. All the Message Frames on Reply Free FIFO are
discarded. All posted buffers are freed, and event notification is
turned off.  IOC doesnt reply to any outstanding request. This will
transfer IOC to READY state.  Message unit ready is less expensive
operations than Hard Reset.  soft reset will not force Firmware to
reload again, it only do clean up of Message units.

mpt_Soft_Hard_ResetHandler will first try for Soft Reset,if
it fails then go for big hammer reset which is Hard Reset.

Signed-off-by: default avatarKashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 1a7d7eac

drivers/message/fusion/mptbase.c

+168 −2
Original line number Original line Diff line number Diff line
@@ -5064,7 +5064,7 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode) 
		if (!timeleft) {

		if (!timeleft) {

			printk(KERN_DEBUG "%s: Issuing Reset from %s!!\n",

			printk(KERN_DEBUG "%s: Issuing Reset from %s!!\n",

			    ioc->name, __func__);

			    ioc->name, __func__);

			mpt_HardResetHandler(ioc, CAN_SLEEP);

			mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);

			mpt_free_msg_frame(ioc, mf);

			mpt_free_msg_frame(ioc, mf);

		}

		}

		goto out;

		goto out;
@@ -6456,7 +6456,7 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg) 
		issue_hard_reset = 0;

		issue_hard_reset = 0;

		printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",

		printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",

		    ioc->name, __func__);

		    ioc->name, __func__);

		mpt_HardResetHandler(ioc, CAN_SLEEP);

		mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);

		mpt_free_msg_frame(ioc, mf);

		mpt_free_msg_frame(ioc, mf);

		/* attempt one retry for a timed out command */

		/* attempt one retry for a timed out command */

		if (!retry_count) {

		if (!retry_count) {
@@ -6904,6 +6904,172 @@ mpt_halt_firmware(MPT_ADAPTER *ioc) 
}

}

EXPORT_SYMBOL(mpt_halt_firmware);

EXPORT_SYMBOL(mpt_halt_firmware);





/**

 *	mpt_SoftResetHandler - Issues a less expensive reset

 *	@ioc: Pointer to MPT_ADAPTER structure

 *	@sleepFlag: Indicates if sleep or schedule must be called.



 *

 *	Returns 0 for SUCCESS or -1 if FAILED.

 *

 *	Message Unit Reset - instructs the IOC to reset the Reply Post and

 *	Free FIFO's. All the Message Frames on Reply Free FIFO are discarded.

 *	All posted buffers are freed, and event notification is turned off.

 *	IOC doesnt reply to any outstanding request. This will transfer IOC

 *	to READY state.

 **/

int

mpt_SoftResetHandler(MPT_ADAPTER *ioc, int sleepFlag)

{

	int		 rc;

	int		 ii;

	u8		 cb_idx;

	unsigned long	 flags;

	u32		 ioc_state;

	unsigned long	 time_count;



	dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT "SoftResetHandler Entered!\n",

		ioc->name));



	ioc_state = mpt_GetIocState(ioc, 0) & MPI_IOC_STATE_MASK;



	if (mpt_fwfault_debug)

		mpt_halt_firmware(ioc);



	if (ioc_state == MPI_IOC_STATE_FAULT ||

	    ioc_state == MPI_IOC_STATE_RESET) {

		dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT

		    "skipping, either in FAULT or RESET state!\n", ioc->name));

		return -1;

	}



	if (ioc->bus_type == FC) {

		dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT

		    "skipping, because the bus type is FC!\n", ioc->name));

		return -1;

	}



	spin_lock_irqsave(&ioc->taskmgmt_lock, flags);

	if (ioc->ioc_reset_in_progress) {

		spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);

		return -1;

	}

	ioc->ioc_reset_in_progress = 1;

	spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);



	rc = -1;



	for (cb_idx = MPT_MAX_PROTOCOL_DRIVERS-1; cb_idx; cb_idx--) {

		if (MptResetHandlers[cb_idx])

			mpt_signal_reset(cb_idx, ioc, MPT_IOC_SETUP_RESET);

	}



	spin_lock_irqsave(&ioc->taskmgmt_lock, flags);

	if (ioc->taskmgmt_in_progress) {

		spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);

		return -1;

	}

	spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);

	/* Disable reply interrupts (also blocks FreeQ) */

	CHIPREG_WRITE32(&ioc->chip->IntMask, 0xFFFFFFFF);

	ioc->active = 0;

	time_count = jiffies;



	rc = SendIocReset(ioc, MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET, sleepFlag);



	for (cb_idx = MPT_MAX_PROTOCOL_DRIVERS-1; cb_idx; cb_idx--) {

		if (MptResetHandlers[cb_idx])

			mpt_signal_reset(cb_idx, ioc, MPT_IOC_PRE_RESET);

	}



	if (rc)

		goto out;



	ioc_state = mpt_GetIocState(ioc, 0) & MPI_IOC_STATE_MASK;

	if (ioc_state != MPI_IOC_STATE_READY)

		goto out;



	for (ii = 0; ii < 5; ii++) {

		/* Get IOC facts! Allow 5 retries */

		rc = GetIocFacts(ioc, sleepFlag,

			MPT_HOSTEVENT_IOC_RECOVER);

		if (rc == 0)

			break;

		if (sleepFlag == CAN_SLEEP)

			msleep(100);

		else

			mdelay(100);

	}

	if (ii == 5)

		goto out;



	rc = PrimeIocFifos(ioc);

	if (rc != 0)

		goto out;



	rc = SendIocInit(ioc, sleepFlag);

	if (rc != 0)

		goto out;



	rc = SendEventNotification(ioc, 1, sleepFlag);

	if (rc != 0)

		goto out;



	if (ioc->hard_resets < -1)

		ioc->hard_resets++;



	/*

	 * At this point, we know soft reset succeeded.

	 */



	ioc->active = 1;

	CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM);



 out:

	spin_lock_irqsave(&ioc->taskmgmt_lock, flags);

	ioc->ioc_reset_in_progress = 0;

	ioc->taskmgmt_quiesce_io = 0;

	ioc->taskmgmt_in_progress = 0;

	spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);



	if (ioc->active) {	/* otherwise, hard reset coming */

		for (cb_idx = MPT_MAX_PROTOCOL_DRIVERS-1; cb_idx; cb_idx--) {

			if (MptResetHandlers[cb_idx])

				mpt_signal_reset(cb_idx, ioc,

					MPT_IOC_POST_RESET);

		}

	}



	dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT

		"SoftResetHandler: completed (%d seconds): %s\n",

		ioc->name, jiffies_to_msecs(jiffies - time_count)/1000,

		((rc == 0) ? "SUCCESS" : "FAILED")));



	return rc;

}



/**

 *	mpt_Soft_Hard_ResetHandler - Try less expensive reset

 *	@ioc: Pointer to MPT_ADAPTER structure

 *	@sleepFlag: Indicates if sleep or schedule must be called.



 *

 *	Returns 0 for SUCCESS or -1 if FAILED.

 *	Try for softreset first, only if it fails go for expensive

 *	HardReset.

 **/

int

mpt_Soft_Hard_ResetHandler(MPT_ADAPTER *ioc, int sleepFlag) {

	int ret = -1;



	ret = mpt_SoftResetHandler(ioc, sleepFlag);

	if (ret == 0)

		return ret;

	ret = mpt_HardResetHandler(ioc, sleepFlag);

	return ret;

}

EXPORT_SYMBOL(mpt_Soft_Hard_ResetHandler);



/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

/*

/*

 *	Reset Handling

 *	Reset Handling

drivers/message/fusion/mptbase.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -940,6 +940,7 @@ extern int mpt_verify_adapter(int iocid, MPT_ADAPTER **iocpp); 
extern u32	 mpt_GetIocState(MPT_ADAPTER *ioc, int cooked);

extern u32	 mpt_GetIocState(MPT_ADAPTER *ioc, int cooked);

extern void	 mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buf, int *size, int len, int showlan);

extern void	 mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buf, int *size, int len, int showlan);

extern int	 mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag);

extern int	 mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag);

extern int	 mpt_Soft_Hard_ResetHandler(MPT_ADAPTER *ioc, int sleepFlag);

extern int	 mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *cfg);

extern int	 mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *cfg);

extern int	 mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size);

extern int	 mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size);

extern void	 mpt_free_fw_memory(MPT_ADAPTER *ioc);

extern void	 mpt_free_fw_memory(MPT_ADAPTER *ioc);

drivers/message/fusion/mptctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -311,7 +311,7 @@ mptctl_timeout_expired(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf) 
	dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT "Calling HardReset! \n",

	dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT "Calling HardReset! \n",

		 ioc->name));

		 ioc->name));

	CLEAR_MGMT_PENDING_STATUS(ioc->ioctl_cmds.status)

	CLEAR_MGMT_PENDING_STATUS(ioc->ioctl_cmds.status)

	mpt_HardResetHandler(ioc, CAN_SLEEP);

	mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);

	mpt_free_msg_frame(ioc, mf);

	mpt_free_msg_frame(ioc, mf);

}

}

drivers/message/fusion/mptsas.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -2041,7 +2041,7 @@ static int mptsas_phy_reset(struct sas_phy *phy, int hard_reset) 
	if (!timeleft) {

	if (!timeleft) {

		/* On timeout reset the board */

		/* On timeout reset the board */

		mpt_free_msg_frame(ioc, mf);

		mpt_free_msg_frame(ioc, mf);

		mpt_HardResetHandler(ioc, CAN_SLEEP);

		mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);

		error = -ETIMEDOUT;

		error = -ETIMEDOUT;

		goto out_unlock;

		goto out_unlock;

	}

	}
@@ -2226,7 +2226,7 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, 
	if (!timeleft) {

	if (!timeleft) {

		printk(MYIOC_s_ERR_FMT "%s: smp timeout!\n", ioc->name, __func__);

		printk(MYIOC_s_ERR_FMT "%s: smp timeout!\n", ioc->name, __func__);

		/* On timeout reset the board */

		/* On timeout reset the board */

		mpt_HardResetHandler(ioc, CAN_SLEEP);

		mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);

		ret = -ETIMEDOUT;

		ret = -ETIMEDOUT;

		goto unmap;

		goto unmap;

	}

	}
@@ -2833,7 +2833,7 @@ mptsas_exp_repmanufacture_info(MPT_ADAPTER *ioc, 
		if (ioc->sas_mgmt.status & MPT_MGMT_STATUS_DID_IOCRESET)

		if (ioc->sas_mgmt.status & MPT_MGMT_STATUS_DID_IOCRESET)

			goto out_free;

			goto out_free;

		if (!timeleft)

		if (!timeleft)

			mpt_HardResetHandler(ioc, CAN_SLEEP);

			mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);

		goto out_free;

		goto out_free;

	}

	}
@@ -4717,7 +4717,7 @@ mptsas_broadcast_primative_work(struct fw_event_work *fw_event) 
	if (issue_reset) {

	if (issue_reset) {

		printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",

		printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",

		    ioc->name, __func__);

		    ioc->name, __func__);

		mpt_HardResetHandler(ioc, CAN_SLEEP);

		mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);

	}

	}

	mptsas_free_fw_event(ioc, fw_event);

	mptsas_free_fw_event(ioc, fw_event);

}

}

drivers/message/fusion/mptscsih.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1711,7 +1711,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, 
	if (issue_hard_reset) {

	if (issue_hard_reset) {

		printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",

		printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",

			ioc->name, __func__);

			ioc->name, __func__);

		retval = mpt_HardResetHandler(ioc, CAN_SLEEP);

		retval = mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);

		mpt_free_msg_frame(ioc, mf);

		mpt_free_msg_frame(ioc, mf);

	}

	}
@@ -1991,7 +1991,7 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt) 
	/*  If our attempts to reset the host failed, then return a failed

	/*  If our attempts to reset the host failed, then return a failed

	 *  status.  The host will be taken off line by the SCSI mid-layer.

	 *  status.  The host will be taken off line by the SCSI mid-layer.

	 */

	 */

    retval = mpt_HardResetHandler(ioc, CAN_SLEEP);

    retval = mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);

	if (retval < 0)

	if (retval < 0)

		status = FAILED;

		status = FAILED;

	else

	else
@@ -3040,7 +3040,7 @@ mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *io) 
		if (!timeleft) {

		if (!timeleft) {

			printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",

			printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",

			    ioc->name, __func__);

			    ioc->name, __func__);

			mpt_HardResetHandler(ioc, CAN_SLEEP);

			mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);

			mpt_free_msg_frame(ioc, mf);

			mpt_free_msg_frame(ioc, mf);

		}

		}

		goto out;

		goto out;