[dpdk-dev] net/ixgbe: ensure link status is updated

Message ID 20170412082147.19182-1-laurent.hardy@6wind.com (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Laurent Hardy April 12, 2017, 8:21 a.m. UTC
  In case of fiber and link speed set to 1Gb at peer side (with autoneg
or with defined speed), link status could be not properly updated at
time cable is plugged-in.
Indeed if cable was not plugged when device has been configured and
started then link status will not be updated properly with new speed
as no link setup will be triggered.

To avoid this issue, IXGBE_FLAG_NEED_LINK_CONFIG is set to try a link
setup each time link_update() is triggered and current link status is
down. When cable is plugged-in, link setup will be performed via
ixgbe_setup_link().

Signed-off-by: Laurent Hardy <laurent.hardy@6wind.com>
---

v1 -> v2:
- rebase on top of head (change flag to 1<<4)
- fix regression with copper links: only update link for fiber links

v2 -> v3:
- remove unnescessary check on speed mask if autoneg is false
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 18 ++++++++++++++++++
 drivers/net/ixgbe/ixgbe_ethdev.h |  1 +
 2 files changed, 19 insertions(+)
  

Comments

Wei Dai April 18, 2017, 2:33 p.m. UTC | #1
First of all, I agree usage of IXGBE_FLAG_NEED_LINK_CONFIG to trigger link setup when link is up again.

Both ixgbe_get_link_capabilities( ) and ixgbe_setup_link( ) calls different sub-function for different ixgbe MAC type including 82598, 82599, X540 and X550 and so on.

I think ixgbe_setup_link( ) can process all speeds returned from ixgbe_get_link_capabilities( ) no matter what autoneg is.
It is no need to check autoneg and set speed to 10G if autoneg is false.
And sometimes if autoneg is false, the speed can't be 10G, maybe should be 5G or 2.5G or others in case of multi-speed fiber.

So I suggest that you can remove following 3 lines in your patch and test it again.
+/* setup the highest link when no autoneg */
+		if (!autoneg)
+				speed = IXGBE_LINK_SPEED_10GB_FULL;



> -----Original Message-----
> From: Laurent Hardy [mailto:laurent.hardy@6wind.com]
> Sent: Wednesday, April 12, 2017 4:22 PM
> To: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; Dai, Wei
> <wei.dai@intel.com>; olivier.matz@6wind.com
> Cc: Zhang, Helin <helin.zhang@intel.com>; Ananyev, Konstantin
> <konstantin.ananyev@intel.com>
> Subject: [PATCH] net/ixgbe: ensure link status is updated
> 
> In case of fiber and link speed set to 1Gb at peer side (with autoneg or with
> defined speed), link status could be not properly updated at time cable is
> plugged-in.
> Indeed if cable was not plugged when device has been configured and started
> then link status will not be updated properly with new speed as no link setup
> will be triggered.
> 
> To avoid this issue, IXGBE_FLAG_NEED_LINK_CONFIG is set to try a link setup
> each time link_update() is triggered and current link status is down. When
> cable is plugged-in, link setup will be performed via ixgbe_setup_link().
> 
> Signed-off-by: Laurent Hardy <laurent.hardy@6wind.com>
> ---
> 
> v1 -> v2:
> - rebase on top of head (change flag to 1<<4)
> - fix regression with copper links: only update link for fiber links
> 
> v2 -> v3:
> - remove unnescessary check on speed mask if autoneg is false
> ---
>  drivers/net/ixgbe/ixgbe_ethdev.c | 18 ++++++++++++++++++
> drivers/net/ixgbe/ixgbe_ethdev.h |  1 +
>  2 files changed, 19 insertions(+)
> 
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> b/drivers/net/ixgbe/ixgbe_ethdev.c
> index 1462324..bd03e60 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -3516,8 +3516,12 @@ ixgbe_dev_link_update(struct rte_eth_dev *dev,
> int wait_to_complete)
>  	struct ixgbe_hw *hw =
> IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
>  	struct rte_eth_link link, old;
>  	ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;
> +	struct ixgbe_interrupt *intr =
> +		IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
>  	int link_up;
>  	int diag;
> +	u32 speed = 0;
> +	bool autoneg = false;
> 
>  	link.link_status = ETH_LINK_DOWN;
>  	link.link_speed = 0;
> @@ -3527,6 +3531,18 @@ ixgbe_dev_link_update(struct rte_eth_dev *dev,
> int wait_to_complete)
> 
>  	hw->mac.get_link_status = true;
> 
> +	if ((intr->flags & IXGBE_FLAG_NEED_LINK_CONFIG) &&
> +		hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) {
> +		speed = hw->phy.autoneg_advertised;
> +		if (!speed) {
> +			ixgbe_get_link_capabilities(hw, &speed, &autoneg);
> +			/* setup the highest link when no autoneg */
> +			if (!autoneg)
> +				speed = IXGBE_LINK_SPEED_10GB_FULL;
> +		}
> +		ixgbe_setup_link(hw, speed, true);
> +	}
> +
>  	/* check if it needs to wait to complete, if lsc interrupt is enabled */
>  	if (wait_to_complete == 0 || dev->data->dev_conf.intr_conf.lsc != 0)
>  		diag = ixgbe_check_link(hw, &link_speed, &link_up, 0); @@ -3544,10
> +3560,12 @@ ixgbe_dev_link_update(struct rte_eth_dev *dev, int
> wait_to_complete)
> 
>  	if (link_up == 0) {
>  		rte_ixgbe_dev_atomic_write_link_status(dev, &link);
> +		intr->flags |= IXGBE_FLAG_NEED_LINK_CONFIG;
>  		if (link.link_status == old.link_status)
>  			return -1;
>  		return 0;
>  	}
> +	intr->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
>  	link.link_status = ETH_LINK_UP;
>  	link.link_duplex = ETH_LINK_FULL_DUPLEX;
> 
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h
> b/drivers/net/ixgbe/ixgbe_ethdev.h
> index a32ba4d..a6e8c8a 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.h
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.h
> @@ -45,6 +45,7 @@
>  #define IXGBE_FLAG_MAILBOX          (uint32_t)(1 << 1)
>  #define IXGBE_FLAG_PHY_INTERRUPT    (uint32_t)(1 << 2)
>  #define IXGBE_FLAG_MACSEC           (uint32_t)(1 << 3)
> +#define IXGBE_FLAG_NEED_LINK_CONFIG (uint32_t)(1 << 4)
> 
>  /*
>   * Defines that were not part of ixgbe_type.h as they are not used by the
> --
> 2.1.4
  

Patch

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 1462324..bd03e60 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -3516,8 +3516,12 @@  ixgbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	struct rte_eth_link link, old;
 	ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;
+	struct ixgbe_interrupt *intr =
+		IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
 	int link_up;
 	int diag;
+	u32 speed = 0;
+	bool autoneg = false;
 
 	link.link_status = ETH_LINK_DOWN;
 	link.link_speed = 0;
@@ -3527,6 +3531,18 @@  ixgbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 
 	hw->mac.get_link_status = true;
 
+	if ((intr->flags & IXGBE_FLAG_NEED_LINK_CONFIG) &&
+		hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) {
+		speed = hw->phy.autoneg_advertised;
+		if (!speed) {
+			ixgbe_get_link_capabilities(hw, &speed, &autoneg);
+			/* setup the highest link when no autoneg */
+			if (!autoneg)
+				speed = IXGBE_LINK_SPEED_10GB_FULL;
+		}
+		ixgbe_setup_link(hw, speed, true);
+	}
+
 	/* check if it needs to wait to complete, if lsc interrupt is enabled */
 	if (wait_to_complete == 0 || dev->data->dev_conf.intr_conf.lsc != 0)
 		diag = ixgbe_check_link(hw, &link_speed, &link_up, 0);
@@ -3544,10 +3560,12 @@  ixgbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 
 	if (link_up == 0) {
 		rte_ixgbe_dev_atomic_write_link_status(dev, &link);
+		intr->flags |= IXGBE_FLAG_NEED_LINK_CONFIG;
 		if (link.link_status == old.link_status)
 			return -1;
 		return 0;
 	}
+	intr->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
 	link.link_status = ETH_LINK_UP;
 	link.link_duplex = ETH_LINK_FULL_DUPLEX;
 
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h
index a32ba4d..a6e8c8a 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.h
+++ b/drivers/net/ixgbe/ixgbe_ethdev.h
@@ -45,6 +45,7 @@ 
 #define IXGBE_FLAG_MAILBOX          (uint32_t)(1 << 1)
 #define IXGBE_FLAG_PHY_INTERRUPT    (uint32_t)(1 << 2)
 #define IXGBE_FLAG_MACSEC           (uint32_t)(1 << 3)
+#define IXGBE_FLAG_NEED_LINK_CONFIG (uint32_t)(1 << 4)
 
 /*
  * Defines that were not part of ixgbe_type.h as they are not used by the