[SCSI] lpfc 8.1.2: Add ERROR and WARM_START modes for diagnostic purposes.
Add ERROR and WARM_START modes for diagnostic purposes.
Signed-off-by: Jamie Wellnitz <Jamie.Wellnitz@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 214ab43..c4cca91 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -1,7 +1,7 @@
/*******************************************************************
* This file is part of the Emulex Linux Device Driver for *
* Fibre Channel Host Bus Adapters. *
- * Copyright (C) 2004-2005 Emulex. All rights reserved. *
+ * Copyright (C) 2004-2006 Emulex. All rights reserved. *
* EMULEX and SLI are trademarks of Emulex. *
* www.emulex.com *
* Portions Copyright (C) 2004-2005 Christoph Hellwig *
@@ -175,25 +175,27 @@
uint16_t pci_cfg_value;
struct semaphore hba_can_block;
- uint32_t hba_state;
+ int32_t hba_state;
-#define LPFC_INIT_START 1 /* Initial state after board reset */
-#define LPFC_INIT_MBX_CMDS 2 /* Initialize HBA with mbox commands */
-#define LPFC_LINK_DOWN 3 /* HBA initialized, link is down */
-#define LPFC_LINK_UP 4 /* Link is up - issue READ_LA */
-#define LPFC_LOCAL_CFG_LINK 5 /* local NPORT Id configured */
-#define LPFC_FLOGI 6 /* FLOGI sent to Fabric */
-#define LPFC_FABRIC_CFG_LINK 7 /* Fabric assigned NPORT Id
+#define LPFC_STATE_UNKNOWN 0 /* HBA state is unknown */
+#define LPFC_WARM_START 1 /* HBA state after selective reset */
+#define LPFC_INIT_START 2 /* Initial state after board reset */
+#define LPFC_INIT_MBX_CMDS 3 /* Initialize HBA with mbox commands */
+#define LPFC_LINK_DOWN 4 /* HBA initialized, link is down */
+#define LPFC_LINK_UP 5 /* Link is up - issue READ_LA */
+#define LPFC_LOCAL_CFG_LINK 6 /* local NPORT Id configured */
+#define LPFC_FLOGI 7 /* FLOGI sent to Fabric */
+#define LPFC_FABRIC_CFG_LINK 8 /* Fabric assigned NPORT Id
configured */
-#define LPFC_NS_REG 8 /* Register with NameServer */
-#define LPFC_NS_QRY 9 /* Query NameServer for NPort ID list */
-#define LPFC_BUILD_DISC_LIST 10 /* Build ADISC and PLOGI lists for
+#define LPFC_NS_REG 9 /* Register with NameServer */
+#define LPFC_NS_QRY 10 /* Query NameServer for NPort ID list */
+#define LPFC_BUILD_DISC_LIST 11 /* Build ADISC and PLOGI lists for
* device authentication / discovery */
-#define LPFC_DISC_AUTH 11 /* Processing ADISC list */
-#define LPFC_CLEAR_LA 12 /* authentication cmplt - issue
+#define LPFC_DISC_AUTH 12 /* Processing ADISC list */
+#define LPFC_CLEAR_LA 13 /* authentication cmplt - issue
CLEAR_LA */
#define LPFC_HBA_READY 32
-#define LPFC_HBA_ERROR 0xff
+#define LPFC_HBA_ERROR -1
uint8_t fc_linkspeed; /* Link speed after last READ_LA */