From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E2C1DA051C for ; Tue, 11 Feb 2020 12:27:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DA95D2B9C; Tue, 11 Feb 2020 12:27:23 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 574B249E0 for ; Tue, 11 Feb 2020 12:27:22 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id m16so11840965wrx.11 for ; Tue, 11 Feb 2020 03:27:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TnvjEr64Xg1quOcwplBpxU9rynOQCWBXmXyXXCpxTko=; b=bu/YDbecQaz0SXBD52CEyrKaNejfljY9bzDN91AgWDSRBNvDnML+FFku4WYcIaid4h h6BJ0KNok3aVFogiPQ9tUfyWVdTOov8LbWJbiMxJ2sBEOHIn2XJHQ9zNoxgc53avr5sA 9XgjY4AEk+i7VELJURxECuD9ZGWDnRszCb7H1tsmf+dCu/Q5++pQ4p7NgA3We53iOqP8 bMmXQwqUs3+Y83e4O3PspA9hrarnMLM6yqVxHlP7MPWIQnGUDelYayqv55n/dmXERt6t OXpRJH92pWe6mDpVqq6+/zHGN39+UBoroh7kwibYKYsyz0RiWYpDa5/QLH3tmIjxmmnt 2fzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TnvjEr64Xg1quOcwplBpxU9rynOQCWBXmXyXXCpxTko=; b=BtQ7gzV3DuB6X/bmy9lujWytsUQpjl9TOyp659A0GfFl2B25sZfQ4jXN2WDWmRWQVe h4pzakKXNhha32lcTXka/tO5PUqNwq/gHCNglPiI2oH7z1VQuQkztF4jCGShT0vU9EAr gF/jLDFmqIebFiEWhqMIiFRFiMBc1ai/NN6IHs28hZDSLXllJS7tzxs/pifwB2wWqKHO V32RT5OoK3seUnGzQDaIHIYZ2BsFbeMwBdu6MVzdlBk5lfHemR94WdGtrUn5jHIsy65R aUt3NrrGKpIP2dWUKgcXzm1ATsFE8Ece8k8i6dgO6/aOc9rx3tVT37Xl2uqAOFTbACeG Ky0A== X-Gm-Message-State: APjAAAWz2DLRsfYtg+26uoFnC2YjDaOLvr8j3Ar8Z4jhjUM3bWxKcX7h BUeDZW9Rvh/cz9Vgo4wPAtM= X-Google-Smtp-Source: APXvYqy35BL+aSX/AXPzpcmc0FkEnYYvRvK6OhwZjvjHngm/Qyg/S0hk7ZBGgi2BfMlymxLn04Dlcg== X-Received: by 2002:adf:ea85:: with SMTP id s5mr8005810wrm.75.1581420442048; Tue, 11 Feb 2020 03:27:22 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w26sm3234181wmi.8.2020.02.11.03.27.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:27:21 -0800 (PST) From: luca.boccassi@gmail.com To: Guinan Sun Cc: Ting Xu , Xiaolong Ye , dpdk stable Date: Tue, 11 Feb 2020 11:19:56 +0000 Message-Id: <20200211112216.3929-50-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: set fixed flag for exact link speed' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 9283d11504cc32e99ade0d92d68c5b21250be47b Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Tue, 3 Dec 2019 16:59:27 +0000 Subject: [PATCH] net/i40e: set fixed flag for exact link speed [ upstream commit dc73db27bb617a2755f27f243cf698e111d9e609 ] Setting exact link speed makes sense if auto-negotiation is disabled. Fixed flag is required to disable auto-negotiation. Signed-off-by: Guinan Sun Acked-by: Ting Xu Acked-by: Xiaolong Ye --- drivers/net/i40e/i40e_ethdev.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 8b25003910..86fc4f4076 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2241,6 +2241,9 @@ i40e_apply_link_speed(struct rte_eth_dev *dev) struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct rte_eth_conf *conf = &dev->data->dev_conf; + abilities |= I40E_AQ_PHY_ENABLE_ATOMIC_LINK | + I40E_AQ_PHY_LINK_ENABLED; + if (conf->link_speeds == ETH_LINK_SPEED_AUTONEG) { conf->link_speeds = ETH_LINK_SPEED_40G | ETH_LINK_SPEED_25G | @@ -2248,11 +2251,12 @@ i40e_apply_link_speed(struct rte_eth_dev *dev) ETH_LINK_SPEED_10G | ETH_LINK_SPEED_1G | ETH_LINK_SPEED_100M; + + abilities |= I40E_AQ_PHY_AN_ENABLED; + } else { + abilities &= ~I40E_AQ_PHY_AN_ENABLED; } speed = i40e_parse_link_speeds(conf->link_speeds); - abilities |= I40E_AQ_PHY_ENABLE_ATOMIC_LINK | - I40E_AQ_PHY_AN_ENABLED | - I40E_AQ_PHY_LINK_ENABLED; return i40e_phy_conf_link(hw, abilities, speed, true); } @@ -2271,13 +2275,6 @@ i40e_dev_start(struct rte_eth_dev *dev) hw->adapter_stopped = 0; - if (dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED) { - PMD_INIT_LOG(ERR, - "Invalid link_speeds for port %u, autonegotiation disabled", - dev->data->port_id); - return -EINVAL; - } - rte_intr_disable(intr_handle); if ((rte_intr_cap_multiple(intr_handle) || -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:40.817648459 +0000 +++ 0050-net-i40e-set-fixed-flag-for-exact-link-speed.patch 2020-02-11 11:17:38.412001571 +0000 @@ -1,8 +1,10 @@ -From dc73db27bb617a2755f27f243cf698e111d9e609 Mon Sep 17 00:00:00 2001 +From 9283d11504cc32e99ade0d92d68c5b21250be47b Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Tue, 3 Dec 2019 16:59:27 +0000 Subject: [PATCH] net/i40e: set fixed flag for exact link speed +[ upstream commit dc73db27bb617a2755f27f243cf698e111d9e609 ] + Setting exact link speed makes sense if auto-negotiation is disabled. Fixed flag is required to disable auto-negotiation.