diff options
author | Michael Chan <mchan@broadcom.com> | 2010-10-11 19:12:00 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-11 19:12:00 -0400 |
commit | 22fa159d37efbfe781bbb99279efe83f58b87d29 (patch) | |
tree | 2778781f91b36cd690700db059ae54b541bcec87 /drivers/net/bnx2.h | |
parent | e37ef961e50d74f55e9edb48e54dd2e7963aad39 (diff) |
bnx2: Update firmware to 6.0.x.
- Improved flow control and simplified interface
- Use hardware RSS indirection table instead of the slower firmware-
based table
- Lower latency interrupt on 5709
Signed-off-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.h')
-rw-r--r-- | drivers/net/bnx2.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 2104c1005d02..efdfbc2a9e37 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
@@ -352,12 +352,7 @@ struct l2_fhdr { | |||
352 | #define BNX2_L2CTX_BD_PRE_READ 0x00000000 | 352 | #define BNX2_L2CTX_BD_PRE_READ 0x00000000 |
353 | #define BNX2_L2CTX_CTX_SIZE 0x00000000 | 353 | #define BNX2_L2CTX_CTX_SIZE 0x00000000 |
354 | #define BNX2_L2CTX_CTX_TYPE 0x00000000 | 354 | #define BNX2_L2CTX_CTX_TYPE 0x00000000 |
355 | #define BNX2_L2CTX_LO_WATER_MARK_DEFAULT 4 | 355 | #define BNX2_L2CTX_FLOW_CTRL_ENABLE 0x000000ff |
356 | #define BNX2_L2CTX_LO_WATER_MARK_SCALE 4 | ||
357 | #define BNX2_L2CTX_LO_WATER_MARK_DIS 0 | ||
358 | #define BNX2_L2CTX_HI_WATER_MARK_SHIFT 4 | ||
359 | #define BNX2_L2CTX_HI_WATER_MARK_SCALE 16 | ||
360 | #define BNX2_L2CTX_WATER_MARKS_MSK 0x000000ff | ||
361 | #define BNX2_L2CTX_CTX_TYPE_SIZE_L2 ((0x20/20)<<16) | 356 | #define BNX2_L2CTX_CTX_TYPE_SIZE_L2 ((0x20/20)<<16) |
362 | #define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE (0xf<<28) | 357 | #define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE (0xf<<28) |
363 | #define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE_UNDEFINED (0<<28) | 358 | #define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE_UNDEFINED (0<<28) |
@@ -4185,6 +4180,15 @@ struct l2_fhdr { | |||
4185 | #define BNX2_RLUP_RSS_CONFIG_IPV6_RSS_TYPE_IP_ONLY_XI (2L<<2) | 4180 | #define BNX2_RLUP_RSS_CONFIG_IPV6_RSS_TYPE_IP_ONLY_XI (2L<<2) |
4186 | #define BNX2_RLUP_RSS_CONFIG_IPV6_RSS_TYPE_RES_XI (3L<<2) | 4181 | #define BNX2_RLUP_RSS_CONFIG_IPV6_RSS_TYPE_RES_XI (3L<<2) |
4187 | 4182 | ||
4183 | #define BNX2_RLUP_RSS_COMMAND 0x00002048 | ||
4184 | #define BNX2_RLUP_RSS_COMMAND_RSS_IND_TABLE_ADDR (0xfUL<<0) | ||
4185 | #define BNX2_RLUP_RSS_COMMAND_RSS_WRITE_MASK (0xffUL<<4) | ||
4186 | #define BNX2_RLUP_RSS_COMMAND_WRITE (1UL<<12) | ||
4187 | #define BNX2_RLUP_RSS_COMMAND_READ (1UL<<13) | ||
4188 | #define BNX2_RLUP_RSS_COMMAND_HASH_MASK (0x7UL<<14) | ||
4189 | |||
4190 | #define BNX2_RLUP_RSS_DATA 0x0000204c | ||
4191 | |||
4188 | 4192 | ||
4189 | /* | 4193 | /* |
4190 | * rbuf_reg definition | 4194 | * rbuf_reg definition |
@@ -6077,6 +6081,7 @@ struct l2_fhdr { | |||
6077 | 6081 | ||
6078 | #define BNX2_COM_SCRATCH 0x00120000 | 6082 | #define BNX2_COM_SCRATCH 0x00120000 |
6079 | 6083 | ||
6084 | #define BNX2_FW_RX_LOW_LATENCY 0x00120058 | ||
6080 | #define BNX2_FW_RX_DROP_COUNT 0x00120084 | 6085 | #define BNX2_FW_RX_DROP_COUNT 0x00120084 |
6081 | 6086 | ||
6082 | 6087 | ||