1 files changed, 36 insertions, 15 deletions

diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index 344c842d55ab..fdd8e46a9050 100644
--- a/drivers/net/cnic_if.h
+++ b/drivers/net/cnic_if.h
@@ -1,6 +1,6 @@
 /* cnic_if.h: Broadcom CNIC core network driver.
  *
- * Copyright (c) 2006-2010 Broadcom Corporation
+ * Copyright (c) 2006-2011 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,22 +12,31 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
 
-#define CNIC_MODULE_VERSION     "2.1.3"
-#define CNIC_MODULE_RELDATE     "June 24, 2010"
+#define CNIC_MODULE_VERSION     "2.2.14"
+#define CNIC_MODULE_RELDATE     "Mar 30, 2011"
 
 #define CNIC_ULP_RDMA           0
 #define CNIC_ULP_ISCSI          1
-#define CNIC_ULP_L4             2
-#define MAX_CNIC_ULP_TYPE_EXT   2
-#define MAX_CNIC_ULP_TYPE       3
+#define CNIC_ULP_FCOE           2
+#define CNIC_ULP_L4             3
+#define MAX_CNIC_ULP_TYPE_EXT   3
+#define MAX_CNIC_ULP_TYPE       4
 
 struct kwqe {
         u32 kwqe_op_flag;
 
+#define KWQE_QID_SHIFT          8
 #define KWQE_OPCODE_MASK        0x00ff0000
 #define KWQE_OPCODE_SHIFT       16
-#define KWQE_FLAGS_LAYER_SHIFT  28
 #define KWQE_OPCODE(x)          ((x & KWQE_OPCODE_MASK) >> KWQE_OPCODE_SHIFT)
+#define KWQE_LAYER_MASK                 0x70000000
+#define KWQE_LAYER_SHIFT                28
+#define KWQE_FLAGS_LAYER_MASK_L2        (2<<28)
+#define KWQE_FLAGS_LAYER_MASK_L3        (3<<28)
+#define KWQE_FLAGS_LAYER_MASK_L4        (4<<28)
+#define KWQE_FLAGS_LAYER_MASK_L5_RDMA   (5<<28)
+#define KWQE_FLAGS_LAYER_MASK_L5_ISCSI  (6<<28)
+#define KWQE_FLAGS_LAYER_MASK_L5_FCOE   (7<<28)
 
         u32 kwqe_info0;
         u32 kwqe_info1;
@@ -62,6 +71,7 @@ struct kcqe {
                 #define KCQE_FLAGS_LAYER_MASK_L4        (4<<28)
                 #define KCQE_FLAGS_LAYER_MASK_L5_RDMA   (5<<28)
                 #define KCQE_FLAGS_LAYER_MASK_L5_ISCSI  (6<<28)
+                #define KCQE_FLAGS_LAYER_MASK_L5_FCOE   (7<<28)
                 #define KCQE_FLAGS_NEXT                 (1<<31)
                 #define KCQE_FLAGS_OPCODE_MASK          (0xff<<16)
                 #define KCQE_FLAGS_OPCODE_SHIFT         (16)
@@ -75,23 +85,22 @@ struct kcqe {
 #define CNIC_CTL_STOP_CMD               1
 #define CNIC_CTL_START_CMD              2
 #define CNIC_CTL_COMPLETION_CMD         3
+#define CNIC_CTL_STOP_ISCSI_CMD         4
 
 #define DRV_CTL_IO_WR_CMD               0x101
 #define DRV_CTL_IO_RD_CMD               0x102
 #define DRV_CTL_CTX_WR_CMD              0x103
 #define DRV_CTL_CTXTBL_WR_CMD           0x104
-#define DRV_CTL_COMPLETION_CMD          0x105
+#define DRV_CTL_RET_L5_SPQ_CREDIT_CMD   0x105
 #define DRV_CTL_START_L2_CMD            0x106
 #define DRV_CTL_STOP_L2_CMD             0x107
+#define DRV_CTL_RET_L2_SPQ_CREDIT_CMD   0x10c
+#define DRV_CTL_ISCSI_STOPPED_CMD       0x10d
 
 struct cnic_ctl_completion {
         u32     cid;
 };
 
-struct drv_ctl_completion {
-        u32     comp_count;
-};
-
 struct cnic_ctl_info {
         int     cmd;
         union {
@@ -100,6 +109,10 @@ struct cnic_ctl_info {
         } data;
 };
 
+struct drv_ctl_spq_credit {
+        u32     credit_count;
+};
+
 struct drv_ctl_io {
         u32             cid_addr;
         u32             offset;
@@ -115,7 +128,7 @@ struct drv_ctl_l2_ring {
 struct drv_ctl_info {
         int     cmd;
         union {
-                struct drv_ctl_completion comp;
+                struct drv_ctl_spq_credit credit;
                 struct drv_ctl_io io;
                 struct drv_ctl_l2_ring ring;
                 char bytes[MAX_DRV_CTL_DATA];
@@ -138,6 +151,7 @@ struct cnic_irq {
         unsigned int    vector;
         void            *status_blk;
         u32             status_blk_num;
+        u32             status_blk_num2;
         u32             irq_flags;
 #define CNIC_IRQ_FL_MSIX                0x00000001
 };
@@ -147,11 +161,15 @@ struct cnic_eth_dev {
         u32             drv_state;
 #define CNIC_DRV_STATE_REGD             0x00000001
 #define CNIC_DRV_STATE_USING_MSIX       0x00000002
+#define CNIC_DRV_STATE_NO_ISCSI_OOO     0x00000004
+#define CNIC_DRV_STATE_NO_ISCSI         0x00000008
+#define CNIC_DRV_STATE_NO_FCOE          0x00000010
         u32             chip_id;
         u32             max_kwqe_pending;
         struct pci_dev  *pdev;
         void __iomem    *io_base;
         void __iomem    *io_base2;
+        void            *iro_arr;
 
         u32             ctx_tbl_offset;
         u32             ctx_tbl_len;
@@ -160,7 +178,10 @@ struct cnic_eth_dev {
         u32             max_iscsi_conn;
         u32             max_fcoe_conn;
         u32             max_rdma_conn;
-        u32             reserved0[2];
+        u32             fcoe_init_cid;
+        u16             iscsi_l2_client_id;
+        u16             iscsi_l2_cid;
+        u8              iscsi_mac[ETH_ALEN];
 
         int             num_irq;
         struct cnic_irq irq_arr[MAX_CNIC_VEC];
@@ -296,7 +317,7 @@ struct cnic_ulp_ops {
         void (*cm_abort_complete)(struct cnic_sock *);
         void (*cm_remote_close)(struct cnic_sock *);
         void (*cm_remote_abort)(struct cnic_sock *);
-        void (*iscsi_nl_send_msg)(struct cnic_dev *dev, u32 msg_type,
+        int (*iscsi_nl_send_msg)(void *ulp_ctx, u32 msg_type,
                                   char *data, u16 data_size);
         struct module *owner;
         atomic_t ref_count;