diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2009-09-01 09:19:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-02 03:44:01 -0400 |
commit | f6eb9b1fc1411d22c073f5264e5630a541d0f7df (patch) | |
tree | 8966482a7874e3087301fc3b9c0a5a2e9870eed8 /drivers/net/tg3.h | |
parent | 8d9d7cfc0ec2fe37ff9afd74326d03f38f96ad1b (diff) |
tg3: Add 5717 asic rev
This patch adds the 5717 asic rev.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.h')
-rw-r--r-- | drivers/net/tg3.h | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 685d9712a802..5994476a2508 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -46,6 +46,10 @@ | |||
46 | #define TG3PCI_DEVICE_TIGON3_57788 0x1691 | 46 | #define TG3PCI_DEVICE_TIGON3_57788 0x1691 |
47 | #define TG3PCI_DEVICE_TIGON3_5785_G 0x1699 /* GPHY */ | 47 | #define TG3PCI_DEVICE_TIGON3_5785_G 0x1699 /* GPHY */ |
48 | #define TG3PCI_DEVICE_TIGON3_5785_F 0x16a0 /* 10/100 only */ | 48 | #define TG3PCI_DEVICE_TIGON3_5785_F 0x16a0 /* 10/100 only */ |
49 | #define TG3PCI_DEVICE_TIGON3_5717C 0x1655 | ||
50 | #define TG3PCI_DEVICE_TIGON3_5717S 0x1656 | ||
51 | #define TG3PCI_DEVICE_TIGON3_5718C 0x1665 | ||
52 | #define TG3PCI_DEVICE_TIGON3_5718S 0x1666 | ||
49 | /* 0x04 --> 0x64 unused */ | 53 | /* 0x04 --> 0x64 unused */ |
50 | #define TG3PCI_MSI_DATA 0x00000064 | 54 | #define TG3PCI_MSI_DATA 0x00000064 |
51 | /* 0x66 --> 0x68 unused */ | 55 | /* 0x66 --> 0x68 unused */ |
@@ -117,6 +121,7 @@ | |||
117 | #define ASIC_REV_5761 0x5761 | 121 | #define ASIC_REV_5761 0x5761 |
118 | #define ASIC_REV_5785 0x5785 | 122 | #define ASIC_REV_5785 0x5785 |
119 | #define ASIC_REV_57780 0x57780 | 123 | #define ASIC_REV_57780 0x57780 |
124 | #define ASIC_REV_5717 0x5717 | ||
120 | #define GET_CHIP_REV(CHIP_REV_ID) ((CHIP_REV_ID) >> 8) | 125 | #define GET_CHIP_REV(CHIP_REV_ID) ((CHIP_REV_ID) >> 8) |
121 | #define CHIPREV_5700_AX 0x70 | 126 | #define CHIPREV_5700_AX 0x70 |
122 | #define CHIPREV_5700_BX 0x71 | 127 | #define CHIPREV_5700_BX 0x71 |
@@ -203,20 +208,20 @@ | |||
203 | #define TG3PCI_MEM_WIN_BASE_ADDR 0x0000007c | 208 | #define TG3PCI_MEM_WIN_BASE_ADDR 0x0000007c |
204 | #define TG3PCI_REG_DATA 0x00000080 | 209 | #define TG3PCI_REG_DATA 0x00000080 |
205 | #define TG3PCI_MEM_WIN_DATA 0x00000084 | 210 | #define TG3PCI_MEM_WIN_DATA 0x00000084 |
206 | #define TG3PCI_MODE_CTRL 0x00000088 | ||
207 | #define TG3PCI_MISC_CFG 0x0000008c | ||
208 | #define TG3PCI_MISC_LOCAL_CTRL 0x00000090 | 211 | #define TG3PCI_MISC_LOCAL_CTRL 0x00000090 |
209 | /* 0x94 --> 0x98 unused */ | 212 | /* 0x94 --> 0x98 unused */ |
210 | #define TG3PCI_STD_RING_PROD_IDX 0x00000098 /* 64-bit */ | 213 | #define TG3PCI_STD_RING_PROD_IDX 0x00000098 /* 64-bit */ |
211 | #define TG3PCI_RCV_RET_RING_CON_IDX 0x000000a0 /* 64-bit */ | 214 | #define TG3PCI_RCV_RET_RING_CON_IDX 0x000000a0 /* 64-bit */ |
212 | #define TG3PCI_SND_PROD_IDX 0x000000a8 /* 64-bit */ | 215 | /* 0xa0 --> 0xb8 unused */ |
213 | /* 0xb0 --> 0xb8 unused */ | ||
214 | #define TG3PCI_DUAL_MAC_CTRL 0x000000b8 | 216 | #define TG3PCI_DUAL_MAC_CTRL 0x000000b8 |
215 | #define DUAL_MAC_CTRL_CH_MASK 0x00000003 | 217 | #define DUAL_MAC_CTRL_CH_MASK 0x00000003 |
216 | #define DUAL_MAC_CTRL_ID 0x00000004 | 218 | #define DUAL_MAC_CTRL_ID 0x00000004 |
217 | #define TG3PCI_PRODID_ASICREV 0x000000bc | 219 | #define TG3PCI_PRODID_ASICREV 0x000000bc |
218 | #define PROD_ID_ASIC_REV_MASK 0x0fffffff | 220 | #define PROD_ID_ASIC_REV_MASK 0x0fffffff |
219 | /* 0xc0 --> 0x110 unused */ | 221 | /* 0xc0 --> 0xf4 unused */ |
222 | |||
223 | #define TG3PCI_GEN2_PRODID_ASICREV 0x000000f4 | ||
224 | /* 0xf8 --> 0x200 unused */ | ||
220 | 225 | ||
221 | #define TG3_CORR_ERR_STAT 0x00000110 | 226 | #define TG3_CORR_ERR_STAT 0x00000110 |
222 | #define TG3_CORR_ERR_STAT_CLEAR 0xffffffff | 227 | #define TG3_CORR_ERR_STAT_CLEAR 0xffffffff |
@@ -972,7 +977,11 @@ | |||
972 | #define RCVBDI_MINI_THRESH 0x00002c14 | 977 | #define RCVBDI_MINI_THRESH 0x00002c14 |
973 | #define RCVBDI_STD_THRESH 0x00002c18 | 978 | #define RCVBDI_STD_THRESH 0x00002c18 |
974 | #define RCVBDI_JUMBO_THRESH 0x00002c1c | 979 | #define RCVBDI_JUMBO_THRESH 0x00002c1c |
975 | /* 0x2c20 --> 0x3000 unused */ | 980 | /* 0x2c20 --> 0x2d00 unused */ |
981 | |||
982 | #define STD_REPLENISH_LWM 0x00002d00 | ||
983 | #define JMB_REPLENISH_LWM 0x00002d04 | ||
984 | /* 0x2d08 --> 0x3000 unused */ | ||
976 | 985 | ||
977 | /* Receive BD Completion Control Registers */ | 986 | /* Receive BD Completion Control Registers */ |
978 | #define RCVCC_MODE 0x00003000 | 987 | #define RCVCC_MODE 0x00003000 |
@@ -1486,6 +1495,7 @@ | |||
1486 | #define MSGINT_MODE 0x00006000 | 1495 | #define MSGINT_MODE 0x00006000 |
1487 | #define MSGINT_MODE_RESET 0x00000001 | 1496 | #define MSGINT_MODE_RESET 0x00000001 |
1488 | #define MSGINT_MODE_ENABLE 0x00000002 | 1497 | #define MSGINT_MODE_ENABLE 0x00000002 |
1498 | #define MSGINT_MODE_ONE_SHOT_DISABLE 0x00000020 | ||
1489 | #define MSGINT_MODE_MULTIVEC_EN 0x00000080 | 1499 | #define MSGINT_MODE_MULTIVEC_EN 0x00000080 |
1490 | #define MSGINT_STATUS 0x00006004 | 1500 | #define MSGINT_STATUS 0x00006004 |
1491 | #define MSGINT_FIFO 0x00006008 | 1501 | #define MSGINT_FIFO 0x00006008 |
@@ -2124,6 +2134,7 @@ struct tg3_tx_buffer_desc { | |||
2124 | #define TXD_FLAG_IP_CSUM 0x0002 | 2134 | #define TXD_FLAG_IP_CSUM 0x0002 |
2125 | #define TXD_FLAG_END 0x0004 | 2135 | #define TXD_FLAG_END 0x0004 |
2126 | #define TXD_FLAG_IP_FRAG 0x0008 | 2136 | #define TXD_FLAG_IP_FRAG 0x0008 |
2137 | #define TXD_FLAG_JMB_PKT 0x0008 | ||
2127 | #define TXD_FLAG_IP_FRAG_END 0x0010 | 2138 | #define TXD_FLAG_IP_FRAG_END 0x0010 |
2128 | #define TXD_FLAG_VLAN 0x0040 | 2139 | #define TXD_FLAG_VLAN 0x0040 |
2129 | #define TXD_FLAG_COAL_NOW 0x0080 | 2140 | #define TXD_FLAG_COAL_NOW 0x0080 |
@@ -2520,7 +2531,7 @@ struct tg3_rx_prodring_set { | |||
2520 | dma_addr_t rx_jmb_mapping; | 2531 | dma_addr_t rx_jmb_mapping; |
2521 | }; | 2532 | }; |
2522 | 2533 | ||
2523 | #define TG3_IRQ_MAX_VECS 1 | 2534 | #define TG3_IRQ_MAX_VECS 5 |
2524 | 2535 | ||
2525 | struct tg3_napi { | 2536 | struct tg3_napi { |
2526 | struct napi_struct napi ____cacheline_aligned; | 2537 | struct napi_struct napi ____cacheline_aligned; |