diff options
Diffstat (limited to 'drivers/message/fusion/mptbase.c')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index c36d5b9ff663..e319abcd849c 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -5063,8 +5063,9 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode) | |||
5063 | if (ioc->mptbase_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET) | 5063 | if (ioc->mptbase_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET) |
5064 | goto out; | 5064 | goto out; |
5065 | if (!timeleft) { | 5065 | if (!timeleft) { |
5066 | printk(KERN_DEBUG "%s: Issuing Reset from %s!!\n", | 5066 | printk(MYIOC_s_WARN_FMT |
5067 | ioc->name, __func__); | 5067 | "Issuing Reset from %s!!, doorbell=0x%08x\n", |
5068 | ioc->name, __func__, mpt_GetIocState(ioc, 0)); | ||
5068 | mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP); | 5069 | mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP); |
5069 | mpt_free_msg_frame(ioc, mf); | 5070 | mpt_free_msg_frame(ioc, mf); |
5070 | } | 5071 | } |
@@ -6455,8 +6456,9 @@ out: | |||
6455 | mutex_unlock(&ioc->mptbase_cmds.mutex); | 6456 | mutex_unlock(&ioc->mptbase_cmds.mutex); |
6456 | if (issue_hard_reset) { | 6457 | if (issue_hard_reset) { |
6457 | issue_hard_reset = 0; | 6458 | issue_hard_reset = 0; |
6458 | printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n", | 6459 | printk(MYIOC_s_WARN_FMT |
6459 | ioc->name, __func__); | 6460 | "Issuing Reset from %s!!, doorbell=0x%08x\n", |
6461 | ioc->name, __func__, mpt_GetIocState(ioc, 0)); | ||
6460 | if (retry_count == 0) { | 6462 | if (retry_count == 0) { |
6461 | if (mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP) != 0) | 6463 | if (mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP) != 0) |
6462 | retry_count++; | 6464 | retry_count++; |
@@ -7146,7 +7148,8 @@ mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag) | |||
7146 | rc = mpt_do_ioc_recovery(ioc, MPT_HOSTEVENT_IOC_RECOVER, sleepFlag); | 7148 | rc = mpt_do_ioc_recovery(ioc, MPT_HOSTEVENT_IOC_RECOVER, sleepFlag); |
7147 | if (rc != 0) { | 7149 | if (rc != 0) { |
7148 | printk(KERN_WARNING MYNAM | 7150 | printk(KERN_WARNING MYNAM |
7149 | ": WARNING - (%d) Cannot recover %s\n", rc, ioc->name); | 7151 | ": WARNING - (%d) Cannot recover %s, doorbell=0x%08x\n", |
7152 | rc, ioc->name, mpt_GetIocState(ioc, 0)); | ||
7150 | } else { | 7153 | } else { |
7151 | if (ioc->hard_resets < -1) | 7154 | if (ioc->hard_resets < -1) |
7152 | ioc->hard_resets++; | 7155 | ioc->hard_resets++; |