cnic, bnx2i: Add support for new devices - 57800, 57810, and 57840

And change iSCSI RQ doorbell size from 16B to 64B to match new firmware.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/net/cnic.h b/drivers/net/cnic.h
index 330ef9350413..7a2928f82d40 100644
--- a/drivers/net/cnic.h
+++ b/drivers/net/cnic.h
@@ -384,6 +384,9 @@ struct bnx2x_bd_chain_next {
 #define BNX2X_CHIP_NUM_57712E           0x1663
 #define BNX2X_CHIP_NUM_57713            0x1651
 #define BNX2X_CHIP_NUM_57713E           0x1652
+#define BNX2X_CHIP_NUM_57800            0x168a
+#define BNX2X_CHIP_NUM_57810            0x168e
+#define BNX2X_CHIP_NUM_57840            0x168d
 
 #define BNX2X_CHIP_NUM(x)               (x >> 16)
 #define BNX2X_CHIP_IS_57710(x)          \
@@ -402,10 +405,19 @@ struct bnx2x_bd_chain_next {
         (BNX2X_CHIP_NUM(x) == BNX2X_CHIP_NUM_57713)
 #define BNX2X_CHIP_IS_57713E(x)         \
         (BNX2X_CHIP_NUM(x) == BNX2X_CHIP_NUM_57713E)
+#define BNX2X_CHIP_IS_57800(x)          \
+        (BNX2X_CHIP_NUM(x) == BNX2X_CHIP_NUM_57800)
+#define BNX2X_CHIP_IS_57810(x)          \
+        (BNX2X_CHIP_NUM(x) == BNX2X_CHIP_NUM_57810)
+#define BNX2X_CHIP_IS_57840(x)          \
+        (BNX2X_CHIP_NUM(x) == BNX2X_CHIP_NUM_57840)
 #define BNX2X_CHIP_IS_E2(x)             \
         (BNX2X_CHIP_IS_57712(x) || BNX2X_CHIP_IS_57712E(x) || \
          BNX2X_CHIP_IS_57713(x) || BNX2X_CHIP_IS_57713E(x))
-#define BNX2X_CHIP_IS_E2_PLUS(x) BNX2X_CHIP_IS_E2(x)
+#define BNX2X_CHIP_IS_E3(x)                     \
+        (BNX2X_CHIP_IS_57800(x) || BNX2X_CHIP_IS_57810(x) || \
+         BNX2X_CHIP_IS_57840(x))
+#define BNX2X_CHIP_IS_E2_PLUS(x) (BNX2X_CHIP_IS_E2(x) || BNX2X_CHIP_IS_E3(x))
 
 #define IS_E1H_OFFSET                   BNX2X_CHIP_IS_E1H(cp->chip_id)