From: Wenzhuo Lu <wenzhuo.lu@intel.com>
Date: Wed, 1 Mar 2017 06:04:46 +0000 (+0800)
Subject: net/ixgbe/base: add link block check for KR
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=90a02fce708b74dfdc022dc9328efb128f33e62e;p=dpdk.git

net/ixgbe/base: add link block check for KR

When setting up link on x550 KR devices, should check
if there are constraints on link from manageability, which
may result in link loss.

Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
---

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index a28ced1555..1058684d97 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -2663,6 +2663,9 @@ s32 ixgbe_setup_kr_x550em(struct ixgbe_hw *hw)
 	if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_2_5GB_FULL)
 		return IXGBE_SUCCESS;
 
+	if (ixgbe_check_reset_blocked(hw))
+		return 0;
+
 	return ixgbe_setup_kr_speed_x550em(hw, hw->phy.autoneg_advertised);
 }