1 files changed, 33 insertions, 8 deletions

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index aa10f7951634..565e16dd74fc 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-2009 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -37,6 +37,9 @@ struct lpfc_sli2_slim;
                                            the NameServer  before giving up. */
 #define LPFC_CMD_PER_LUN        3       /* max outstanding cmds per lun */
 #define LPFC_DEFAULT_SG_SEG_CNT 64      /* sg element count per scsi cmnd */
+#define LPFC_DEFAULT_MENLO_SG_SEG_CNT 128       /* sg element count per scsi
+                cmnd for menlo needs nearly twice as for firmware
+                downloads using bsg */
 #define LPFC_DEFAULT_PROT_SG_SEG_CNT 4096 /* sg protection elements count */
 #define LPFC_MAX_SG_SEG_CNT     4096    /* sg element count per scsi cmnd */
 #define LPFC_MAX_PROT_SG_SEG_CNT 4096   /* prot sg element count per scsi cmd*/
@@ -109,7 +112,8 @@ struct hbq_dmabuf {
         struct lpfc_dmabuf dbuf;
         uint32_t size;
         uint32_t tag;
-        struct lpfc_rcqe rcqe;
+        struct lpfc_cq_event cq_event;
+        unsigned long time_stamp;
 };
 
 /* Priority bit.  Set value to exceed low water mark in lpfc_mem. */
@@ -201,6 +205,7 @@ struct lpfc_stats {
         uint32_t elsRcvLIRR;
         uint32_t elsRcvRPS;
         uint32_t elsRcvRPL;
+        uint32_t elsRcvRRQ;
         uint32_t elsXmitFLOGI;
         uint32_t elsXmitFDISC;
         uint32_t elsXmitPLOGI;
@@ -289,8 +294,8 @@ struct lpfc_vport {
 
         uint16_t vpi;
         uint16_t vfi;
-        uint8_t vfi_state;
-#define LPFC_VFI_REGISTERED     0x1
+        uint8_t vpi_state;
+#define LPFC_VPI_REGISTERED     0x1
 
         uint32_t fc_flag;       /* FC flags */
 /* Several of these flags are HBA centric and should be moved to
@@ -313,6 +318,9 @@ struct lpfc_vport {
 #define FC_VPORT_NEEDS_REG_VPI  0x80000  /* Needs to have its vpi registered */
 #define FC_RSCN_DEFERRED        0x100000 /* A deferred RSCN being processed */
 #define FC_VPORT_NEEDS_INIT_VPI 0x200000 /* Need to INIT_VPI before FDISC */
+#define FC_VPORT_CVL_RCVD       0x400000 /* VLink failed due to CVL      */
+#define FC_VFI_REGISTERED       0x800000 /* VFI is registered */
+#define FC_FDISC_COMPLETED      0x1000000/* FDISC completed */
 
         uint32_t ct_flags;
 #define FC_CT_RFF_ID            0x1      /* RFF_ID accepted by switch */
@@ -405,6 +413,7 @@ struct lpfc_vport {
         uint8_t stat_data_enabled;
         uint8_t stat_data_blocked;
         struct list_head rcv_buffer_list;
+        unsigned long rcv_buffer_time_stamp;
         uint32_t vport_flag;
 #define STATIC_VPORT    1
 };
@@ -445,6 +454,8 @@ struct unsol_rcv_ct_ctx {
         uint32_t ctxt_id;
         uint32_t SID;
         uint32_t oxid;
+        uint32_t flags;
+#define UNSOL_VALID     0x00000001
 };
 
 struct lpfc_hba {
@@ -496,7 +507,10 @@ struct lpfc_hba {
                 (struct lpfc_hba *);
         void (*lpfc_stop_port)
                 (struct lpfc_hba *);
-
+        int (*lpfc_hba_init_link)
+                (struct lpfc_hba *);
+        int (*lpfc_hba_down_link)
+                (struct lpfc_hba *);
 
         /* SLI4 specific HBA data structure */
         struct lpfc_sli4_hba sli4_hba;
@@ -527,13 +541,16 @@ struct lpfc_hba {
 #define HBA_ERATT_HANDLED       0x1 /* This flag is set when eratt handled */
 #define DEFER_ERATT             0x2 /* Deferred error attention in progress */
 #define HBA_FCOE_SUPPORT        0x4 /* HBA function supports FCOE */
-#define HBA_RECEIVE_BUFFER      0x8 /* Rcv buffer posted to worker thread */
+#define HBA_SP_QUEUE_EVT        0x8 /* Slow-path qevt posted to worker thread*/
 #define HBA_POST_RECEIVE_BUFFER 0x10 /* Rcv buffers need to be posted */
 #define FCP_XRI_ABORT_EVENT     0x20
 #define ELS_XRI_ABORT_EVENT     0x40
 #define ASYNC_EVENT             0x80
 #define LINK_DISABLED           0x100 /* Link disabled by user */
 #define FCF_DISC_INPROGRESS     0x200 /* FCF discovery in progress */
+#define HBA_FIP_SUPPORT         0x400 /* FIP support in HBA */
+#define HBA_AER_ENABLED         0x800 /* AER enabled with HBA */
+        uint32_t fcp_ring_in_use; /* When polling test if intr-hndlr active*/
         struct lpfc_dmabuf slim2p;
 
         MAILBOX_t *mbox;
@@ -551,6 +568,7 @@ struct lpfc_hba {
         uint8_t fc_linkspeed;   /* Link speed after last READ_LA */
 
         uint32_t fc_eventTag;   /* event tag for link attention */
+        uint32_t link_events;
 
         /* These fields used to be binfo */
         uint32_t fc_pref_DID;   /* preferred D_ID */
@@ -604,8 +622,12 @@ struct lpfc_hba {
         uint32_t cfg_enable_hba_reset;
         uint32_t cfg_enable_hba_heartbeat;
         uint32_t cfg_enable_bg;
-        uint32_t cfg_enable_fip;
         uint32_t cfg_log_verbose;
+        uint32_t cfg_aer_support;
+        uint32_t cfg_suppress_link_up;
+#define LPFC_INITIALIZE_LINK              0     /* do normal init_link mbox */
+#define LPFC_DELAY_INIT_LINK              1     /* layered driver hold off */
+#define LPFC_DELAY_INIT_LINK_INDEFINITELY 2     /* wait, manual intervention */
 
         lpfc_vpd_t vpd;         /* vital product data */
 
@@ -783,10 +805,13 @@ struct lpfc_hba {
         uint16_t vlan_id;
         struct list_head fcf_conn_rec_list;
 
-        struct mutex ct_event_mutex; /* synchronize access to ct_ev_waiters */
+        spinlock_t ct_ev_lock; /* synchronize access to ct_ev_waiters */
         struct list_head ct_ev_waiters;
         struct unsol_rcv_ct_ctx ct_ctx[64];
         uint32_t ctx_idx;
+
+        uint8_t menlo_flag;     /* menlo generic flags */
+#define HBA_MENLO_SUPPORT       0x1 /* HBA supports menlo commands */
 };
 
 static inline struct Scsi_Host *