[SCSI] lpfc 8.3.2 : Addition of SLI4 Interface - Base Support

Adds new hardware and interface definitions.

Adds new interface routines - utilizing the reorganized layout of the
driver. Adds SLI-4 specific functions for attachment, initialization,
teardown, etc.

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 44 insertions, 5 deletions

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 6c24c9aabe7b..13ac108a244c 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -105,9 +105,11 @@ struct lpfc_dma_pool {
 };
 
 struct hbq_dmabuf {
+        struct lpfc_dmabuf hbuf;
         struct lpfc_dmabuf dbuf;
         uint32_t size;
         uint32_t tag;
+        struct lpfc_rcqe rcqe;
 };
 
 /* Priority bit.  Set value to exceed low water mark in lpfc_mem. */
@@ -141,7 +143,10 @@ typedef struct lpfc_vpd {
         } rev;
         struct {
 #ifdef __BIG_ENDIAN_BITFIELD
-                uint32_t rsvd2  :24;  /* Reserved                             */
+                uint32_t rsvd3  :19;  /* Reserved                             */
+                uint32_t cdss   : 1;  /* Configure Data Security SLI          */
+                uint32_t rsvd2  : 3;  /* Reserved                             */
+                uint32_t cbg    : 1;  /* Configure BlockGuard                 */
                 uint32_t cmv    : 1;  /* Configure Max VPIs                   */
                 uint32_t ccrp   : 1;  /* Config Command Ring Polling          */
                 uint32_t csah   : 1;  /* Configure Synchronous Abort Handling */
@@ -159,7 +164,10 @@ typedef struct lpfc_vpd {
                 uint32_t csah   : 1;  /* Configure Synchronous Abort Handling */
                 uint32_t ccrp   : 1;  /* Config Command Ring Polling          */
                 uint32_t cmv    : 1;  /* Configure Max VPIs                   */
-                uint32_t rsvd2  :24;  /* Reserved                             */
+                uint32_t cbg    : 1;  /* Configure BlockGuard                 */
+                uint32_t rsvd2  : 3;  /* Reserved                             */
+                uint32_t cdss   : 1;  /* Configure Data Security SLI          */
+                uint32_t rsvd3  :19;  /* Reserved                             */
 #endif
         } sli3Feat;
 } lpfc_vpd_t;
@@ -280,6 +288,9 @@ struct lpfc_vport {
         enum discovery_state port_state;
 
         uint16_t vpi;
+        uint16_t vfi;
+        uint8_t vfi_state;
+#define LPFC_VFI_REGISTERED     0x1
 
         uint32_t fc_flag;       /* FC flags */
 /* Several of these flags are HBA centric and should be moved to
@@ -392,6 +403,9 @@ struct lpfc_vport {
 #endif
         uint8_t stat_data_enabled;
         uint8_t stat_data_blocked;
+        struct list_head rcv_buffer_list;
+        uint32_t vport_flag;
+#define STATIC_VPORT    1
 };
 
 struct hbq_s {
@@ -494,6 +508,7 @@ struct lpfc_hba {
 #define LPFC_SLI3_CRP_ENABLED           0x08
 #define LPFC_SLI3_INB_ENABLED           0x10
 #define LPFC_SLI3_BG_ENABLED            0x20
+#define LPFC_SLI3_DSS_ENABLED           0x40
         uint32_t iocb_cmd_size;
         uint32_t iocb_rsp_size;
 
@@ -507,8 +522,13 @@ struct lpfc_hba {
 
         uint32_t hba_flag;      /* hba generic flags */
 #define HBA_ERATT_HANDLED       0x1 /* This flag is set when eratt handled */
-
-#define DEFER_ERATT             0x4 /* Deferred error attention in progress */
+#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_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
         struct lpfc_dmabuf slim2p;
 
         MAILBOX_t *mbox;
@@ -567,6 +587,9 @@ struct lpfc_hba {
         uint32_t cfg_poll;
         uint32_t cfg_poll_tmo;
         uint32_t cfg_use_msi;
+        uint32_t cfg_fcp_imax;
+        uint32_t cfg_fcp_wq_count;
+        uint32_t cfg_fcp_eq_count;
         uint32_t cfg_sg_seg_cnt;
         uint32_t cfg_prot_sg_seg_cnt;
         uint32_t cfg_sg_dma_buf_size;
@@ -576,6 +599,8 @@ 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;
 
         lpfc_vpd_t vpd;         /* vital product data */
 
@@ -659,7 +684,8 @@ struct lpfc_hba {
         /* pci_mem_pools */
         struct pci_pool *lpfc_scsi_dma_buf_pool;
         struct pci_pool *lpfc_mbuf_pool;
-        struct pci_pool *lpfc_hbq_pool;
+        struct pci_pool *lpfc_hrb_pool; /* header receive buffer pool */
+        struct pci_pool *lpfc_drb_pool; /* data receive buffer pool */
         struct lpfc_dma_pool lpfc_mbuf_safety_pool;
 
         mempool_t *mbox_mem_pool;
@@ -675,6 +701,14 @@ struct lpfc_hba {
         struct lpfc_vport *pport;       /* physical lpfc_vport pointer */
         uint16_t max_vpi;               /* Maximum virtual nports */
 #define LPFC_MAX_VPI 0xFFFF             /* Max number of VPI supported */
+        uint16_t max_vports;            /*
+                                         * For IOV HBAs max_vpi can change
+                                         * after a reset. max_vports is max
+                                         * number of vports present. This can
+                                         * be greater than max_vpi.
+                                         */
+        uint16_t vpi_base;
+        uint16_t vfi_base;
         unsigned long *vpi_bmask;       /* vpi allocation table */
 
         /* Data structure used by fabric iocb scheduler */
@@ -733,6 +767,11 @@ struct lpfc_hba {
 /* Maximum number of events that can be outstanding at any time*/
 #define LPFC_MAX_EVT_COUNT 512
         atomic_t fast_event_count;
+        struct lpfc_fcf fcf;
+        uint8_t fc_map[3];
+        uint8_t valid_vlan;
+        uint16_t vlan_id;
+        struct list_head fcf_conn_rec_list;
 };
 
 static inline struct Scsi_Host *