From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id A600A378E for ; Fri, 27 Jul 2018 12:17:59 +0200 (CEST) Received: by mail-wm0-f66.google.com with SMTP id c14-v6so4736899wmb.4 for ; Fri, 27 Jul 2018 03:17:59 -0700 (PDT) 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; bh=JRvQwkGiCifx/xhGZ/Vhc/TlaVsoCHEivE+qrGV2TiY=; b=OFSYrXpe0n7HBbTySkZ/LJ+z8RLu27Ityk5uajf+Af0E+jThn2gS89SXZ7Y32cThJs AtrEqHDu8M8OJh2/tMr7/vlxE5YylNWgfRJKhQ4MaulXjX1Y1K2j4vgTZXge6LmNoHmG bu5rxkzIJK4MBBjVHHBkCosbqtqJ5WIW9hVyNx2DDakjvDZURyWNQl4r/DqXLsxBcovM mBI/Te7C8sTLN1ehpT0vgJBFQeWGyWoVCtrjy2Cr4mh0AHwANskW/QVn55wvjhP8JsRg L4ej8ZQi/d3yY+me22aENMt3i20+I5H5TMhYu/6+oAaZOIsqgPc1B52iB3qpuwNKw8Nt MeNA== 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; bh=JRvQwkGiCifx/xhGZ/Vhc/TlaVsoCHEivE+qrGV2TiY=; b=Kb8sO1oYjIabFyMaa7gymykHGKJk1F7iVCJ3UYMeUCEosGJnKKh9MqtCArYjbdfFxg eK5PL3gp/Q6Oo//jjgDJuCAkKecLmDdppkSNnwq0UUFbCzeQBG3z+JmgPnu3yIU0MnT5 0ATD1sC+uHQyMub5gwfC9Nt+uDsgPlYCrl6fVO8XZzQFQ9bX7Uv3xyplzgxgw5vx5LI+ eL3flwlshI+zj212ymoZnG4wzQr1SVcHJCeaM44h9K27yQF1ZWycgE+286JzyQF7ZM2m ymdQlfnCbemVnEi9uuWognOSYQXxkSs4im/pvZVPIewOyqqHu2NzAc9W3A2pdbVRfGnJ x9cQ== X-Gm-Message-State: AOUpUlG0c2O2cKxTqIHsp/kdjloJPQzKUfxVFYqw3sgKMCMtfkup6FFb xR6bi6OrQGnsBS3CzCk7nQtmu3Yz3VQ= X-Google-Smtp-Source: AAOMgpcdieiKzE8MrMfB5oKPxY15IBK2VLfNobRGCJdGrLX2o/ok+yqAsvd3OLpxFTZGizWLT2/pzg== X-Received: by 2002:a1c:c289:: with SMTP id s131-v6mr4254576wmf.65.1532686679377; Fri, 27 Jul 2018 03:17:59 -0700 (PDT) Received: from localhost ([2a00:23c5:be94:4600:7b12:f8a0:fd52:f87d]) by smtp.gmail.com with ESMTPSA id x124-v6sm4227455wmg.38.2018.07.27.03.17.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Jul 2018 03:17:58 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaoyun Li Cc: Qi Zhang , dpdk stable Date: Fri, 27 Jul 2018 11:17:39 +0100 Message-Id: <20180727101748.30228-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180727101748.30228-1-luca.boccassi@gmail.com> References: <20180724160752.20287-34-luca.boccassi@gmail.com> <20180727101748.30228-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/i40e: fix link speed' has been queued to LTS release 16.11.8 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: , X-List-Received-Date: Fri, 27 Jul 2018 10:17:59 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/29/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From f3dbe50c474771cf688f2dac948e67bcbbd107d9 Mon Sep 17 00:00:00 2001 From: Xiaoyun Li Date: Tue, 10 Jul 2018 17:30:54 +0800 Subject: [PATCH] net/i40e: fix link speed [ upstream commit 9214ee18eef97709eca481998cf7dca50520896c ] When link needs to go up, I40E_AQ_PHY_AN_ENABLED is always be set in DPDK. So all speeds are always set. This causes speed config never works. This patch fixes this issue and only allows to set available speeds. If link needs to go up and speed setting is not supported, it will print warning and set default available speeds. And when link needs to go down, link speed field should be set to non-zero to avoid link down issue when binding back to kernel driver. Fixes: ca7e599d4506 ("net/i40e: fix link management") Fixes: 1bb8f661168d ("net/i40e: fix link down and negotiation") Signed-off-by: Xiaoyun Li Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.c | 67 +++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 2eeb472d0..01f473c2b 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1708,27 +1708,40 @@ i40e_phy_conf_link(struct i40e_hw *hw, struct i40e_aq_get_phy_abilities_resp phy_ab; struct i40e_aq_set_phy_config phy_conf; enum i40e_aq_phy_type cnt; + uint8_t avail_speed; uint32_t phy_type_mask = 0; const uint8_t mask = I40E_AQ_PHY_FLAG_PAUSE_TX | I40E_AQ_PHY_FLAG_PAUSE_RX | I40E_AQ_PHY_FLAG_PAUSE_RX | I40E_AQ_PHY_FLAG_LOW_POWER; - const uint8_t advt = I40E_LINK_SPEED_40GB | - I40E_LINK_SPEED_25GB | - I40E_LINK_SPEED_10GB | - I40E_LINK_SPEED_1GB | - I40E_LINK_SPEED_100MB; int ret = -ENOTSUP; + /* To get phy capabilities of available speeds. */ + status = i40e_aq_get_phy_capabilities(hw, false, true, &phy_ab, + NULL); + if (status) { + PMD_DRV_LOG(ERR, "Failed to get PHY capabilities: %d\n", + status); + return ret; + } + avail_speed = phy_ab.link_speed; + /* To get the current phy config. */ status = i40e_aq_get_phy_capabilities(hw, false, false, &phy_ab, NULL); - if (status) + if (status) { + PMD_DRV_LOG(ERR, "Failed to get the current PHY config: %d\n", + status); return ret; + } - /* If link already up, no need to set up again */ - if (is_up && phy_ab.phy_type != 0) + /* If link needs to go up and it is in autoneg mode the speed is OK, + * no need to set up again. + */ + if (is_up && phy_ab.phy_type != 0 && + abilities & I40E_AQ_PHY_AN_ENABLED && + phy_ab.link_speed != 0) return I40E_SUCCESS; memset(&phy_conf, 0, sizeof(phy_conf)); @@ -1737,15 +1750,17 @@ i40e_phy_conf_link(struct i40e_hw *hw, abilities &= ~mask; abilities |= phy_ab.abilities & mask; - /* update ablities and speed */ - if (abilities & I40E_AQ_PHY_AN_ENABLED) - phy_conf.link_speed = advt; - else - phy_conf.link_speed = is_up ? force_speed : phy_ab.link_speed; - phy_conf.abilities = abilities; - + /* If link needs to go up, but the force speed is not supported, + * Warn users and config the default available speeds. + */ + if (is_up && !(force_speed & avail_speed)) { + PMD_DRV_LOG(WARNING, "Invalid speed setting, set to default!\n"); + phy_conf.link_speed = avail_speed; + } else { + phy_conf.link_speed = is_up ? force_speed : avail_speed; + } /* PHY type mask needs to include each type except PHY type extension */ for (cnt = I40E_PHY_TYPE_SGMII; cnt < I40E_PHY_TYPE_25GBASE_KR; cnt++) @@ -1781,11 +1796,18 @@ 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; + if (conf->link_speeds == ETH_LINK_SPEED_AUTONEG) { + conf->link_speeds = ETH_LINK_SPEED_40G | + ETH_LINK_SPEED_25G | + ETH_LINK_SPEED_20G | + ETH_LINK_SPEED_10G | + ETH_LINK_SPEED_1G | + ETH_LINK_SPEED_100M; + } speed = i40e_parse_link_speeds(conf->link_speeds); - abilities |= I40E_AQ_PHY_ENABLE_ATOMIC_LINK; - if (!(conf->link_speeds & ETH_LINK_SPEED_FIXED)) - abilities |= I40E_AQ_PHY_AN_ENABLED; - abilities |= I40E_AQ_PHY_LINK_ENABLED; + 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); } @@ -1876,13 +1898,6 @@ i40e_dev_start(struct rte_eth_dev *dev) } /* Apply link configure */ - if (dev->data->dev_conf.link_speeds & ~(ETH_LINK_SPEED_100M | - ETH_LINK_SPEED_1G | ETH_LINK_SPEED_10G | - ETH_LINK_SPEED_20G | ETH_LINK_SPEED_25G | - ETH_LINK_SPEED_40G)) { - PMD_DRV_LOG(ERR, "Invalid link setting"); - goto err_up; - } ret = i40e_apply_link_speed(dev); if (I40E_SUCCESS != ret) { PMD_DRV_LOG(ERR, "Fail to apply link setting"); -- 2.18.0