[SCSI] bnx2: Add support for CNIC driver.

Add interface and functions to support a new CNIC driver to drive
the Broadcom bnx2 hardware for iSCSI offload.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 18 insertions, 0 deletions

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 5b570e17c839..a1ff739bc9b5 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -361,6 +361,9 @@ struct l2_fhdr {
 #define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE_VALUE        (1<<28)
 
 #define BNX2_L2CTX_HOST_BDIDX                           0x00000004
+#define BNX2_L2CTX_STATUSB_NUM_SHIFT                     16
+#define BNX2_L2CTX_STATUSB_NUM(sb_id)                    \
+        (((sb_id) > 0) ? (((sb_id) + 7) << BNX2_L2CTX_STATUSB_NUM_SHIFT) : 0)
 #define BNX2_L2CTX_HOST_BSEQ                            0x00000008
 #define BNX2_L2CTX_NX_BSEQ                              0x0000000c
 #define BNX2_L2CTX_NX_BDHADDR_HI                        0x00000010
@@ -5900,6 +5903,7 @@ struct l2_fhdr {
 #define BNX2_RXP_FTQ_CTL_CUR_DEPTH                       (0x3ffL<<22)
 
 #define BNX2_RXP_SCRATCH                                0x000e0000
+#define BNX2_RXP_SCRATCH_RXP_FLOOD                       0x000e0024
 #define BNX2_RXP_SCRATCH_RSS_TBL_SZ                      0x000e0038
 #define BNX2_RXP_SCRATCH_RSS_TBL                         0x000e003c
 #define BNX2_RXP_SCRATCH_RSS_TBL_MAX_ENTRIES             128
@@ -6678,6 +6682,11 @@ struct bnx2_napi {
         u32                     last_status_idx;
         u32                     int_num;
 
+#ifdef BCM_CNIC
+        u32                     cnic_tag;
+        int                     cnic_present;
+#endif
+
         struct bnx2_rx_ring_info        rx_ring;
         struct bnx2_tx_ring_info        tx_ring;
 };
@@ -6727,6 +6736,11 @@ struct bnx2 {
         int             tx_ring_size;
         u32             tx_wake_thresh;
 
+#ifdef BCM_CNIC
+        struct cnic_ops         *cnic_ops;
+        void                    *cnic_data;
+#endif
+
         /* End of fields used in the performance code paths. */
 
         unsigned int            current_interval;
@@ -6885,6 +6899,10 @@ struct bnx2 {
 
         u32                     idle_chk_status_idx;
 
+#ifdef BCM_CNIC
+        struct cnic_eth_dev     cnic_eth_dev;
+#endif
+
         const struct firmware   *mips_firmware;
         const struct firmware   *rv2p_firmware;
 };