From patchwork Thu Nov 17 17:29:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Hardy X-Patchwork-Id: 17078 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 2789C558D; Thu, 17 Nov 2016 18:30:11 +0100 (CET) Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by dpdk.org (Postfix) with ESMTP id 8BCC6558A for ; Thu, 17 Nov 2016 18:30:06 +0100 (CET) Received: by mail-wm0-f48.google.com with SMTP id a197so324577594wmd.0 for ; Thu, 17 Nov 2016 09:30:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=uMfEae4Fn9HyuKdg1Ptm626vNek8AtqiVIRK4NpCQmE=; b=KJpmXlggIoDY1055SP7iLZxOZZUoi4Tv1nzcXEMWO+gDRvS+7isA5g/yHarJG55RjC mFrD18jQxbItqLScQIWGR1h9/vLCdKcIAiWZEWspj0oMuDJ1qCrW+aCRDrRjHsNkNveT jAssQkIXDjFOBFN6WKRwQEYCJYz2obu9DSyC9V9C/k1amJTNny4kD7OK7Z0X7Zj5FtnB fNhtMt9Ag4ggnk3i/ciGVAyZT/kr0DbF2m+LzGoYDC2Jxtb71OOoqcs+3mKcUOsEms0v hiqPj5Cw1xyjjavItSHUYX78VYThMKbDcR1/WGtnpODbWzp8gwRMdm8DYeNHrJ6DKNHo 7jSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uMfEae4Fn9HyuKdg1Ptm626vNek8AtqiVIRK4NpCQmE=; b=nNAiFFvjp4zseEXPPaKwt9kRnLO9HdVWXLYDFufN1RxcDO544sJlHOrYL9cjjQ1UMX +iyw/+EA+BWMreXHQYbVNXlfxyjedDZ9gV01ONqAM2rwlT9agoa6VSHTJ6Drg8YQGMy6 s2RS/2rK0I8coGkgCVVChQP0b+lQ3IEu96Q6rqUaEcglzMHvV4gREwzZTrGXQxyVeuxK EfM2bvrQMnvSo0wWgRAiQAsIr40TsE1n3dJuA7jOfIF6hMBVIg0gPLOlkuyWG0kkeCRq JMeGUVNa6BN9gocy3d9k9bJVHwEYy1ZHjlCFS+mAFGeZbnW7a7KnNt0mrPmQ1ZVvt/fC hpAg== X-Gm-Message-State: ABUngvfdnwPC/sbF6MM8Z7qv432evltKh0hy/5XXiH2Ej1GAtF3gBISU0UjHSQTC9ZDWe5DQ X-Received: by 10.28.185.78 with SMTP id j75mr17081982wmf.14.1479403806234; Thu, 17 Nov 2016 09:30:06 -0800 (PST) Received: from sphinx.vm.6wind.com. (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id d85sm16781828wmd.17.2016.11.17.09.30.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 09:30:05 -0800 (PST) From: Laurent Hardy To: helin.zhang@intel.com, konstantin.ananyev@intel.com Cc: dev@dpdk.org Date: Thu, 17 Nov 2016 18:29:52 +0100 Message-Id: <1479403792-11928-1-git-send-email-laurent.hardy@6wind.com> X-Mailer: git-send-email 1.7.10.4 Subject: [dpdk-dev] [PATCH] net/ixgbe: ensure link status is updated X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In case of link speed set to 1Gb at peer side (with autoneg or with defined speed) and cable not plugged-in when device is configured and started, then link status is not updated properly with new speed as no link setup is 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 --- drivers/net/ixgbe/ixgbe_ethdev.c | 20 ++++++++++++++++++++ drivers/net/ixgbe/ixgbe_ethdev.h | 1 + 2 files changed, 21 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 52ebbe4..513d1d5 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2095,6 +2095,7 @@ ixgbe_dev_configure(struct rte_eth_dev *dev) /* set flag to update link status after init */ intr->flags |= IXGBE_FLAG_NEED_LINK_UPDATE; + intr->flags |= IXGBE_FLAG_NEED_LINK_CONFIG; /* * Initialize to TRUE. If any of Rx queues doesn't meet the bulk @@ -3117,8 +3118,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; @@ -3128,6 +3133,19 @@ 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) { + speed = hw->phy.autoneg_advertised; + if (!speed) { + ixgbe_get_link_capabilities(hw, &speed, &autoneg); + /* setup the highest link when no autoneg */ + if (!autoneg) { + if (speed & IXGBE_LINK_SPEED_10GB_FULL) + 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); @@ -3145,10 +3163,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 e060c3d..9d335ba 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.h +++ b/drivers/net/ixgbe/ixgbe_ethdev.h @@ -43,6 +43,7 @@ #define IXGBE_FLAG_NEED_LINK_UPDATE (uint32_t)(1 << 0) #define IXGBE_FLAG_MAILBOX (uint32_t)(1 << 1) #define IXGBE_FLAG_PHY_INTERRUPT (uint32_t)(1 << 2) +#define IXGBE_FLAG_NEED_LINK_CONFIG (uint32_t)(1 << 3) /* * Defines that were not part of ixgbe_type.h as they are not used by the