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 5CBD7A051C for ; Tue, 11 Feb 2020 12:28:12 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 574121BE9E; Tue, 11 Feb 2020 12:28:12 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 8D4ED1BF9C for ; Tue, 11 Feb 2020 12:28:10 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id u6so11927062wrt.0 for ; Tue, 11 Feb 2020 03:28:10 -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=CYo5+iGnoSzpoxmpPFQD+gscT5VYIdf/yMQHfSIEtPc=; b=C5KuyNObzRJ2Ep4nBStyI9MRFLMtaR2NmtoXNlaOWgHZx7bXrQw1DmXQ4MkRO5nhf0 ZFkf4dCHoaVH0LlOznrpOCiVyeDEx9lDzxOFmecDE56CEFj3K8jI1d9D2v/PiImq7A70 Abx+1yG3JxyuPfuRzaiyC40uG9FSN7aKb0vJszTH5YFfKL+M+HXHSogPHM7cR0EnF8VW zA2XpHKjHz96xRbPpjUl9u1SsJ17NPpUjO5pUZUgFNA/d99KWQ5D8VzUXBSursmUiI18 xgQNrEsBr2am78hsmWkes9lbF8MZsQ+bcAov16D2gIPuBwEzpQ6wxCp/Q82ZZ/ROEowd wJ0A== 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=CYo5+iGnoSzpoxmpPFQD+gscT5VYIdf/yMQHfSIEtPc=; b=IdqVWYCWSeJkBcMOoto53ifq9uJaVx/bHgFqByJbe7BjXkiPr/TJFUYvXdwyz4I06/ ycS1GWHIXtDDgYql9QxuHR+bSVt4LrcwcgDck5ENgTSeffIifohm9k5OUXuXyggGGGNK 9RGHmhAbh34E8EJPNtsgnekNQRbKqo8WP1nITmcKgr9clzAiao0dwgsDhbtMY60VhHFp BJi9s0Vmlv1UDFYMGhJPh6vK5jKuq48qzYmdwoZCC+UvPGizPSI9UBwhjhWf03OY4Me6 gfdfI11fK/F7ukVD7fWfloTbxcSm5V4Tsz9jgX2DW1Dg/OWYh1sw7qGtC0W1XL/D+l6S I/1g== X-Gm-Message-State: APjAAAX/AaXJWUenDOc47l/W1G54FAYK38EqY4O9qylU/CJrzoAHnOW6 arEP2bpqaJ66K3i+mKI7pupYz/BF1gY= X-Google-Smtp-Source: APXvYqxkUWdXt+DoFz01fNscchR2wpmACd3qdSfjAwYkBTiLheUWomdVMtFlA+OYzBrvY2Zd1lNMwA== X-Received: by 2002:a05:6000:1187:: with SMTP id g7mr8163691wrx.109.1581420490257; Tue, 11 Feb 2020 03:28:10 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m9sm4896483wrx.55.2020.02.11.03.28.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:28:09 -0800 (PST) From: luca.boccassi@gmail.com To: Xiaolong Ye Cc: Martyna Szapar , Qi Zhang , Beilei Xing , dpdk stable Date: Tue, 11 Feb 2020 11:20:15 +0000 Message-Id: <20200211112216.3929-69-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/base: fix missing link modes' 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 70fb846ac96dd44b3ef57fdb80d560dc2c493fd9 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Mon, 13 Jan 2020 10:39:26 +0800 Subject: [PATCH] net/i40e/base: fix missing link modes [ upstream commit 1da546c397055a4e6b93f3868f345a6ee6c07e71 ] Fix for missing "Supported link modes" and "Advertised link modes" info in ethtool after changed speed on X722 devices with BASE-T PHY with FW API version >= 1.7. The same FW API version on X710 and X722 does not mean the same feature set so the change was needed as mac type of the device should also be checked instead of FW API version only. Fixes: e8228f1a16b7 ("net/i40e/base: report supported link modes") Signed-off-by: Martyna Szapar Signed-off-by: Xiaolong Ye Acked-by: Qi Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 356c2da581..9d4330f35e 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -2025,8 +2025,8 @@ enum i40e_status_code i40e_aq_get_link_info(struct i40e_hw *hw, hw->aq.fw_min_ver < 40)) && hw_link_info->phy_type == 0xE) hw_link_info->phy_type = I40E_PHY_TYPE_10GBASE_SFPP_CU; - if (hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR && - hw->aq.api_min_ver >= 7) { + if (hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE && + hw->mac.type != I40E_MAC_X722) { __le32 tmp; i40e_memcpy(&tmp, resp->link_type, sizeof(tmp), -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:41.403425897 +0000 +++ 0069-net-i40e-base-fix-missing-link-modes.patch 2020-02-11 11:17:38.472002693 +0000 @@ -1,8 +1,10 @@ -From 1da546c397055a4e6b93f3868f345a6ee6c07e71 Mon Sep 17 00:00:00 2001 +From 70fb846ac96dd44b3ef57fdb80d560dc2c493fd9 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Mon, 13 Jan 2020 10:39:26 +0800 Subject: [PATCH] net/i40e/base: fix missing link modes +[ upstream commit 1da546c397055a4e6b93f3868f345a6ee6c07e71 ] + Fix for missing "Supported link modes" and "Advertised link modes" info in ethtool after changed speed on X722 devices with BASE-T PHY with FW API version >= 1.7. @@ -21,10 +23,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c -index f256651d70..e0028ac4dc 100644 +index 356c2da581..9d4330f35e 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c -@@ -2043,8 +2043,8 @@ enum i40e_status_code i40e_aq_get_link_info(struct i40e_hw *hw, +@@ -2025,8 +2025,8 @@ enum i40e_status_code i40e_aq_get_link_info(struct i40e_hw *hw, hw->aq.fw_min_ver < 40)) && hw_link_info->phy_type == 0xE) hw_link_info->phy_type = I40E_PHY_TYPE_10GBASE_SFPP_CU;