瀏覽代碼

[SCSI] mpt fusion: Put IOC into ready state if it not already in ready state

Signed-off-by: Kashyap Desai <kadesai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Kashyap, Desai 16 年之前
父節點
當前提交
71278192a8
共有 1 個文件被更改,包括 16 次插入0 次删除
  1. 16 0
      drivers/message/fusion/mptbase.c

+ 16 - 0
drivers/message/fusion/mptbase.c

@@ -2667,6 +2667,22 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)
 		}
 		}
 	}
 	}
 
 
+	/*
+	 * Put the controller into ready state (if its not already)
+	 */
+	if (mpt_GetIocState(ioc, 1) != MPI_IOC_STATE_READY) {
+		if (!SendIocReset(ioc, MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET,
+		    CAN_SLEEP)) {
+			if (mpt_GetIocState(ioc, 1) != MPI_IOC_STATE_READY)
+				printk(MYIOC_s_ERR_FMT "%s:  IOC msg unit "
+				    "reset failed to put ioc in ready state!\n",
+				    ioc->name, __func__);
+		} else
+			printk(MYIOC_s_ERR_FMT "%s:  IOC msg unit reset "
+			    "failed!\n", ioc->name, __func__);
+	}
+
+
 	/* Disable adapter interrupts! */
 	/* Disable adapter interrupts! */
 	synchronize_irq(ioc->pcidev->irq);
 	synchronize_irq(ioc->pcidev->irq);
 	CHIPREG_WRITE32(&ioc->chip->IntMask, 0xFFFFFFFF);
 	CHIPREG_WRITE32(&ioc->chip->IntMask, 0xFFFFFFFF);