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 695CCA0518 for ; Fri, 24 Jul 2020 14:09:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 61D4C1C1F3; Fri, 24 Jul 2020 14:09:28 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id D10DC1C1C6 for ; Fri, 24 Jul 2020 14:09:27 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id r12so8058003wrj.13 for ; Fri, 24 Jul 2020 05:09:27 -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 :mime-version:content-transfer-encoding; bh=VvEWSeen2t7msn1dT3sJd3MqsYa21eZPFhbbmyMkvR0=; b=hMUxEZyCm9yZ6IVWefBouhJrPe0V5SpSgEXsgBh4B73TvtbqKQhccOI1Arjl0vw8lg O0H9BSSh77ZnxxKfcUZmH9xjZ7LcuWuTLl0HEthgWlpGV05m3T5GmS8nms8URe7NPaYm 05Hr7D37g4Enca+jHkl4qjlo5iMzzjD9ErTcZhJIyUAYarmZD9K2uwtHMfeVPFRezN5Z kA+qxWV05tuzOmPGVW1JIHPwFO52OaXMTvzBRFhz/LQhSk8NG3kHHxwsiRVw/KdW9/+o kZH9KAyddVNVaG2RFWw1SQ4vCnFxMOXO1UiEWhVuzhNIMBByp++F9CT16p035rtZnu4D T+bg== 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=VvEWSeen2t7msn1dT3sJd3MqsYa21eZPFhbbmyMkvR0=; b=Fe0Dl2cXtUSY0/BALxikssNVq7ypxUWzbqE1lSOKWjgKuHMyWz81NKemGQKoImMLxS 7EfHHhG63zWJ+D8vIt6nuRjnTRwuTzYZQ1ilNIcA8SmMVxC612+t5NTen614HL87lYOq xGk4uU0ZfjhXPHZU1kqNqipSsp9OUg5n85M14UR/e6JP5OlXHTKdYFVe8wqe32loDWod TvScnX1VpeNUaWgeAEr/3Sr5xuhTAb3abj0YJzjWWL95KqrYzYNxzYfVpICy4GWIUxxs 47KtIqKds63BuusIshFWp6omDEf6/ncq1dLzxNB0mwovN0YEbHenO8hNAZg/P8sNLeNq Zp5g== X-Gm-Message-State: AOAM530PgQ3u2+X3okju3BZvSPKty486DMLUbunzRw0qYfjFSkV6PtT8 +W3eQ6U0JG+ByXyB5B+RrEUif/IEHMYOLw== X-Google-Smtp-Source: ABdhPJyPeWgbmjjLOuxfZctdSSgpOR83J246vkcwxH1rH86JzipJZIq3nxanemGbU5ZqdHHMfjPZog== X-Received: by 2002:a5d:55d2:: with SMTP id i18mr5528163wrw.378.1595592567603; Fri, 24 Jul 2020 05:09:27 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g3sm1419820wrb.59.2020.07.24.05.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:09:26 -0700 (PDT) From: luca.boccassi@gmail.com To: Guinan Sun Cc: Piotr Skajewski , Wei Zhao , dpdk stable Date: Fri, 24 Jul 2020 12:59:33 +0100 Message-Id: <20200724120030.1863487-135-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe/base: fix x550em 10G NIC link status' has been queued to stable release 19.11.4 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.4 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/26/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 e60d1157ced8462de2da5a8c38e0228fc0b210cf Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Thu, 9 Jul 2020 08:00:30 +0000 Subject: [PATCH] net/ixgbe/base: fix x550em 10G NIC link status [ upstream commit fb03b51da940f1d56d701776fd85a0dfc1ace098 ] With the NVM image for x550em XFI will not report the auto-negotiation feature correctly. The auto-negotiation should be "No" for supports and advertised items. At the same time update speed makes it support 1G and 10G. Fixes: 833df43399e7 ("net/ixgbe/base: add SGMII link for X550") Signed-off-by: Piotr Skajewski Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao --- drivers/net/ixgbe/base/ixgbe_x550.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c index 3de406fd3..9fa999e01 100644 --- a/drivers/net/ixgbe/base/ixgbe_x550.c +++ b/drivers/net/ixgbe/base/ixgbe_x550.c @@ -1891,7 +1891,14 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw, else *speed = IXGBE_LINK_SPEED_10GB_FULL; } else { + *autoneg = true; + switch (hw->phy.type) { + case ixgbe_phy_x550em_xfi: + *speed = IXGBE_LINK_SPEED_1GB_FULL | + IXGBE_LINK_SPEED_10GB_FULL; + *autoneg = false; + break; case ixgbe_phy_ext_1g_t: #ifdef PREBOOT_SUPPORT *speed = IXGBE_LINK_SPEED_1GB_FULL; @@ -1925,7 +1932,6 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw, IXGBE_LINK_SPEED_1GB_FULL; break; } - *autoneg = true; } return IXGBE_SUCCESS; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:53.734845671 +0100 +++ 0135-net-ixgbe-base-fix-x550em-10G-NIC-link-status.patch 2020-07-24 12:53:48.435009217 +0100 @@ -1,15 +1,16 @@ -From fb03b51da940f1d56d701776fd85a0dfc1ace098 Mon Sep 17 00:00:00 2001 +From e60d1157ced8462de2da5a8c38e0228fc0b210cf Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Thu, 9 Jul 2020 08:00:30 +0000 Subject: [PATCH] net/ixgbe/base: fix x550em 10G NIC link status +[ upstream commit fb03b51da940f1d56d701776fd85a0dfc1ace098 ] + With the NVM image for x550em XFI will not report the auto-negotiation feature correctly. The auto-negotiation should be "No" for supports and advertised items. At the same time update speed makes it support 1G and 10G. Fixes: 833df43399e7 ("net/ixgbe/base: add SGMII link for X550") -Cc: stable@dpdk.org Signed-off-by: Piotr Skajewski Signed-off-by: Guinan Sun