diff options
author | Don Skidmore <donald.c.skidmore@intel.com> | 2010-11-16 22:27:17 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2010-11-16 22:27:17 -0500 |
commit | b93a22260f6f4bcf6c92c54de8530a97d3e921f0 (patch) | |
tree | 33c1c6dbb1854ecc91d8d8a36d61b85f4ef22aa7 /drivers/net/ixgbe/ixgbe_mbx.c | |
parent | fe15e8e1c78521e0b4e375d6ed415b82265419c9 (diff) |
ixgbe: add support for x540 MAC
This patch adds support for the x540 MAC which is the next MAC in the
82598/82599 line.
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_mbx.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_mbx.c | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ixgbe/ixgbe_mbx.c index aede6eb0e67d..027c628c3aae 100644 --- a/drivers/net/ixgbe/ixgbe_mbx.c +++ b/drivers/net/ixgbe/ixgbe_mbx.c | |||
@@ -319,8 +319,14 @@ static s32 ixgbe_check_for_rst_pf(struct ixgbe_hw *hw, u16 vf_number) | |||
319 | u32 vflre = 0; | 319 | u32 vflre = 0; |
320 | s32 ret_val = IXGBE_ERR_MBX; | 320 | s32 ret_val = IXGBE_ERR_MBX; |
321 | 321 | ||
322 | if (hw->mac.type == ixgbe_mac_82599EB) | 322 | switch (hw->mac.type) { |
323 | case ixgbe_mac_82599EB: | ||
324 | case ixgbe_mac_X540: | ||
323 | vflre = IXGBE_READ_REG(hw, IXGBE_VFLRE(reg_offset)); | 325 | vflre = IXGBE_READ_REG(hw, IXGBE_VFLRE(reg_offset)); |
326 | break; | ||
327 | default: | ||
328 | break; | ||
329 | } | ||
324 | 330 | ||
325 | if (vflre & (1 << vf_shift)) { | 331 | if (vflre & (1 << vf_shift)) { |
326 | ret_val = 0; | 332 | ret_val = 0; |
@@ -439,19 +445,23 @@ void ixgbe_init_mbx_params_pf(struct ixgbe_hw *hw) | |||
439 | { | 445 | { |
440 | struct ixgbe_mbx_info *mbx = &hw->mbx; | 446 | struct ixgbe_mbx_info *mbx = &hw->mbx; |
441 | 447 | ||
442 | if (hw->mac.type != ixgbe_mac_82599EB) | 448 | switch (hw->mac.type) { |
443 | return; | 449 | case ixgbe_mac_82599EB: |
444 | 450 | case ixgbe_mac_X540: | |
445 | mbx->timeout = 0; | 451 | mbx->timeout = 0; |
446 | mbx->usec_delay = 0; | 452 | mbx->usec_delay = 0; |
447 | 453 | ||
448 | mbx->size = IXGBE_VFMAILBOX_SIZE; | 454 | mbx->size = IXGBE_VFMAILBOX_SIZE; |
449 | 455 | ||
450 | mbx->stats.msgs_tx = 0; | 456 | mbx->stats.msgs_tx = 0; |
451 | mbx->stats.msgs_rx = 0; | 457 | mbx->stats.msgs_rx = 0; |
452 | mbx->stats.reqs = 0; | 458 | mbx->stats.reqs = 0; |
453 | mbx->stats.acks = 0; | 459 | mbx->stats.acks = 0; |
454 | mbx->stats.rsts = 0; | 460 | mbx->stats.rsts = 0; |
461 | break; | ||
462 | default: | ||
463 | break; | ||
464 | } | ||
455 | } | 465 | } |
456 | 466 | ||
457 | struct ixgbe_mbx_operations mbx_ops_generic = { | 467 | struct ixgbe_mbx_operations mbx_ops_generic = { |