[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: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 76687126b573..e5e9bf3487db 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -2041,7 +2041,7 @@ static int mptsas_phy_reset(struct sas_phy *phy, int hard_reset)
         if (!timeleft) {
                 /* On timeout reset the board */
                 mpt_free_msg_frame(ioc, mf);
-                mpt_HardResetHandler(ioc, CAN_SLEEP);
+                mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);
                 error = -ETIMEDOUT;
                 goto out_unlock;
         }
@@ -2226,7 +2226,7 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         if (!timeleft) {
                 printk(MYIOC_s_ERR_FMT "%s: smp timeout!\n", ioc->name, __func__);
                 /* On timeout reset the board */
-                mpt_HardResetHandler(ioc, CAN_SLEEP);
+                mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);
                 ret = -ETIMEDOUT;
                 goto unmap;
         }
@@ -2833,7 +2833,7 @@ mptsas_exp_repmanufacture_info(MPT_ADAPTER *ioc,
                 if (ioc->sas_mgmt.status & MPT_MGMT_STATUS_DID_IOCRESET)
                         goto out_free;
                 if (!timeleft)
-                        mpt_HardResetHandler(ioc, CAN_SLEEP);
+                        mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);
                 goto out_free;
         }
 
@@ -4717,7 +4717,7 @@ mptsas_broadcast_primative_work(struct fw_event_work *fw_event)
         if (issue_reset) {
                 printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",
                     ioc->name, __func__);
-                mpt_HardResetHandler(ioc, CAN_SLEEP);
+                mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);
         }
         mptsas_free_fw_event(ioc, fw_event);
 }