diff options
author | Don Skidmore <donald.c.skidmore@intel.com> | 2013-02-20 22:00:04 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-04-18 01:03:09 -0400 |
commit | 0b2679d61c55f04f405cde11809a9f87e582527f (patch) | |
tree | 4cd306a3e597d6e209934449c0d77f84a175b2d9 /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |
parent | b8e820015ec703b971e6a3e2354502ecdd905aee (diff) |
ixgbe: fix MNG FW support when adapter not up
We were only turning the laser on when the adapter was up. This
causes issues for those who wanted to access the MNG FW while the
port was in a down state. This patch makes sure the laser is turned
on in probe and remain up even after the port is brought down.
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 3beac2300643..ac6e464382e4 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -7370,6 +7370,10 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
7370 | if (err) | 7370 | if (err) |
7371 | goto err_sw_init; | 7371 | goto err_sw_init; |
7372 | 7372 | ||
7373 | /* Cache if MNG FW is up so we don't have to read the REG later */ | ||
7374 | if (hw->mac.ops.mng_fw_enabled) | ||
7375 | hw->mng_fw_enabled = hw->mac.ops.mng_fw_enabled(hw); | ||
7376 | |||
7373 | /* Make it possible the adapter to be woken up via WOL */ | 7377 | /* Make it possible the adapter to be woken up via WOL */ |
7374 | switch (adapter->hw.mac.type) { | 7378 | switch (adapter->hw.mac.type) { |
7375 | case ixgbe_mac_82599EB: | 7379 | case ixgbe_mac_82599EB: |
@@ -7623,6 +7627,12 @@ skip_sriov: | |||
7623 | ixgbe_dbg_adapter_init(adapter); | 7627 | ixgbe_dbg_adapter_init(adapter); |
7624 | #endif /* CONFIG_DEBUG_FS */ | 7628 | #endif /* CONFIG_DEBUG_FS */ |
7625 | 7629 | ||
7630 | /* Need link setup for MNG FW, else wait for IXGBE_UP */ | ||
7631 | if (hw->mng_fw_enabled && hw->mac.ops.setup_link) | ||
7632 | hw->mac.ops.setup_link(hw, | ||
7633 | IXGBE_LINK_SPEED_10GB_FULL | IXGBE_LINK_SPEED_1GB_FULL, | ||
7634 | true); | ||
7635 | |||
7626 | return 0; | 7636 | return 0; |
7627 | 7637 | ||
7628 | err_register: | 7638 | err_register: |