diff options
author | PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com> | 2009-02-27 10:44:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-01 03:24:35 -0500 |
commit | 235ea828a1640ed493562a5fe08aa666ff84fbc4 (patch) | |
tree | 11a5420b59fc14caca14d5100262adb34331cba9 /drivers/net/ixgbe/ixgbe_dcb.c | |
parent | 11afc1b1fd802c11dc0fa986c210602c177f1e21 (diff) |
ixgbe: Add DCB for 82599, remove BCN support
This patch adds the DCB (Data Center Bridging) support for 82599 hardware.
This is similar to how the 82598 DCB code works.
This patch also removes the BCN (Backwards Congestion Notification) netlink
configuration code from the driver. BCN was a pre-standard congestion
notification framework, and was not what the IEEE body decided upon for
standard congestion management. QCN (802.1Qau), Quantized Congestion
Notification is the accepted standard, which is not supported by 82599,
hence we remove the support altogether.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_dcb.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_dcb.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/ixgbe_dcb.c index 2a60c89ab346..a1562287342f 100644 --- a/drivers/net/ixgbe/ixgbe_dcb.c +++ b/drivers/net/ixgbe/ixgbe_dcb.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "ixgbe_type.h" | 31 | #include "ixgbe_type.h" |
32 | #include "ixgbe_dcb.h" | 32 | #include "ixgbe_dcb.h" |
33 | #include "ixgbe_dcb_82598.h" | 33 | #include "ixgbe_dcb_82598.h" |
34 | #include "ixgbe_dcb_82599.h" | ||
34 | 35 | ||
35 | /** | 36 | /** |
36 | * ixgbe_dcb_config - Struct containing DCB settings. | 37 | * ixgbe_dcb_config - Struct containing DCB settings. |
@@ -215,6 +216,8 @@ s32 ixgbe_dcb_get_tc_stats(struct ixgbe_hw *hw, struct ixgbe_hw_stats *stats, | |||
215 | s32 ret = 0; | 216 | s32 ret = 0; |
216 | if (hw->mac.type == ixgbe_mac_82598EB) | 217 | if (hw->mac.type == ixgbe_mac_82598EB) |
217 | ret = ixgbe_dcb_get_tc_stats_82598(hw, stats, tc_count); | 218 | ret = ixgbe_dcb_get_tc_stats_82598(hw, stats, tc_count); |
219 | else if (hw->mac.type == ixgbe_mac_82599EB) | ||
220 | ret = ixgbe_dcb_get_tc_stats_82599(hw, stats, tc_count); | ||
218 | return ret; | 221 | return ret; |
219 | } | 222 | } |
220 | 223 | ||
@@ -232,6 +235,8 @@ s32 ixgbe_dcb_get_pfc_stats(struct ixgbe_hw *hw, struct ixgbe_hw_stats *stats, | |||
232 | s32 ret = 0; | 235 | s32 ret = 0; |
233 | if (hw->mac.type == ixgbe_mac_82598EB) | 236 | if (hw->mac.type == ixgbe_mac_82598EB) |
234 | ret = ixgbe_dcb_get_pfc_stats_82598(hw, stats, tc_count); | 237 | ret = ixgbe_dcb_get_pfc_stats_82598(hw, stats, tc_count); |
238 | else if (hw->mac.type == ixgbe_mac_82599EB) | ||
239 | ret = ixgbe_dcb_get_pfc_stats_82599(hw, stats, tc_count); | ||
235 | return ret; | 240 | return ret; |
236 | } | 241 | } |
237 | 242 | ||
@@ -248,6 +253,8 @@ s32 ixgbe_dcb_config_rx_arbiter(struct ixgbe_hw *hw, | |||
248 | s32 ret = 0; | 253 | s32 ret = 0; |
249 | if (hw->mac.type == ixgbe_mac_82598EB) | 254 | if (hw->mac.type == ixgbe_mac_82598EB) |
250 | ret = ixgbe_dcb_config_rx_arbiter_82598(hw, dcb_config); | 255 | ret = ixgbe_dcb_config_rx_arbiter_82598(hw, dcb_config); |
256 | else if (hw->mac.type == ixgbe_mac_82599EB) | ||
257 | ret = ixgbe_dcb_config_rx_arbiter_82599(hw, dcb_config); | ||
251 | return ret; | 258 | return ret; |
252 | } | 259 | } |
253 | 260 | ||
@@ -264,6 +271,8 @@ s32 ixgbe_dcb_config_tx_desc_arbiter(struct ixgbe_hw *hw, | |||
264 | s32 ret = 0; | 271 | s32 ret = 0; |
265 | if (hw->mac.type == ixgbe_mac_82598EB) | 272 | if (hw->mac.type == ixgbe_mac_82598EB) |
266 | ret = ixgbe_dcb_config_tx_desc_arbiter_82598(hw, dcb_config); | 273 | ret = ixgbe_dcb_config_tx_desc_arbiter_82598(hw, dcb_config); |
274 | else if (hw->mac.type == ixgbe_mac_82599EB) | ||
275 | ret = ixgbe_dcb_config_tx_desc_arbiter_82599(hw, dcb_config); | ||
267 | return ret; | 276 | return ret; |
268 | } | 277 | } |
269 | 278 | ||
@@ -280,6 +289,8 @@ s32 ixgbe_dcb_config_tx_data_arbiter(struct ixgbe_hw *hw, | |||
280 | s32 ret = 0; | 289 | s32 ret = 0; |
281 | if (hw->mac.type == ixgbe_mac_82598EB) | 290 | if (hw->mac.type == ixgbe_mac_82598EB) |
282 | ret = ixgbe_dcb_config_tx_data_arbiter_82598(hw, dcb_config); | 291 | ret = ixgbe_dcb_config_tx_data_arbiter_82598(hw, dcb_config); |
292 | else if (hw->mac.type == ixgbe_mac_82599EB) | ||
293 | ret = ixgbe_dcb_config_tx_data_arbiter_82599(hw, dcb_config); | ||
283 | return ret; | 294 | return ret; |
284 | } | 295 | } |
285 | 296 | ||
@@ -296,6 +307,8 @@ s32 ixgbe_dcb_config_pfc(struct ixgbe_hw *hw, | |||
296 | s32 ret = 0; | 307 | s32 ret = 0; |
297 | if (hw->mac.type == ixgbe_mac_82598EB) | 308 | if (hw->mac.type == ixgbe_mac_82598EB) |
298 | ret = ixgbe_dcb_config_pfc_82598(hw, dcb_config); | 309 | ret = ixgbe_dcb_config_pfc_82598(hw, dcb_config); |
310 | else if (hw->mac.type == ixgbe_mac_82599EB) | ||
311 | ret = ixgbe_dcb_config_pfc_82599(hw, dcb_config); | ||
299 | return ret; | 312 | return ret; |
300 | } | 313 | } |
301 | 314 | ||
@@ -311,6 +324,8 @@ s32 ixgbe_dcb_config_tc_stats(struct ixgbe_hw *hw) | |||
311 | s32 ret = 0; | 324 | s32 ret = 0; |
312 | if (hw->mac.type == ixgbe_mac_82598EB) | 325 | if (hw->mac.type == ixgbe_mac_82598EB) |
313 | ret = ixgbe_dcb_config_tc_stats_82598(hw); | 326 | ret = ixgbe_dcb_config_tc_stats_82598(hw); |
327 | else if (hw->mac.type == ixgbe_mac_82599EB) | ||
328 | ret = ixgbe_dcb_config_tc_stats_82599(hw); | ||
314 | return ret; | 329 | return ret; |
315 | } | 330 | } |
316 | 331 | ||
@@ -327,6 +342,8 @@ s32 ixgbe_dcb_hw_config(struct ixgbe_hw *hw, | |||
327 | s32 ret = 0; | 342 | s32 ret = 0; |
328 | if (hw->mac.type == ixgbe_mac_82598EB) | 343 | if (hw->mac.type == ixgbe_mac_82598EB) |
329 | ret = ixgbe_dcb_hw_config_82598(hw, dcb_config); | 344 | ret = ixgbe_dcb_hw_config_82598(hw, dcb_config); |
345 | else if (hw->mac.type == ixgbe_mac_82599EB) | ||
346 | ret = ixgbe_dcb_hw_config_82599(hw, dcb_config); | ||
330 | return ret; | 347 | return ret; |
331 | } | 348 | } |
332 | 349 | ||