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)
         if (err)
                 goto err_sw_init;
 
+        /* Cache if MNG FW is up so we don't have to read the REG later */
+        if (hw->mac.ops.mng_fw_enabled)
+                hw->mng_fw_enabled = hw->mac.ops.mng_fw_enabled(hw);
+
         /* Make it possible the adapter to be woken up via WOL */
         switch (adapter->hw.mac.type) {
         case ixgbe_mac_82599EB:
@@ -7623,6 +7627,12 @@ skip_sriov:
         ixgbe_dbg_adapter_init(adapter);
 #endif /* CONFIG_DEBUG_FS */
 
+        /* Need link setup for MNG FW, else wait for IXGBE_UP */
+        if (hw->mng_fw_enabled && hw->mac.ops.setup_link)
+                hw->mac.ops.setup_link(hw,
+                        IXGBE_LINK_SPEED_10GB_FULL | IXGBE_LINK_SPEED_1GB_FULL,
+                        true);
+
         return 0;
 
 err_register: