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 903DFA04B0 for ; Thu, 20 Aug 2020 17:34:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8A5371C0C4; Thu, 20 Aug 2020 17:34:56 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id ECEDF1E2B for ; Thu, 20 Aug 2020 17:34:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597937694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P2/3FtJ/dZeCpmrDR0W0v8OAPb5ZfbAiOyrj6UnUVY0=; b=IpqJKaIMl6jX78c4X+YUedkERcsJp4MsCjt7gngjquz4jPL2GET12Iga22cmHaeRsZ/AT8 fpXl2zGUBDvHb/QnV/EIFhkoaJRsuRKNswLuJ/mYlOlopWIyNqHZXkiO8eNHVxQuPrL0W0 STqIy+7z5UzHjsF34cEyuIjYfXQQTdc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-295-P0ZUbklfNNaA51IvLStE3Q-1; Thu, 20 Aug 2020 11:34:51 -0400 X-MC-Unique: P0ZUbklfNNaA51IvLStE3Q-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D6C4B80ED92; Thu, 20 Aug 2020 15:34:49 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B13E410098A5; Thu, 20 Aug 2020 15:34:48 +0000 (UTC) From: Kevin Traynor To: Guinan Sun Cc: Piotr Skajewski , Wei Zhao , dpdk stable Date: Thu, 20 Aug 2020 16:33:33 +0100 Message-Id: <20200820153341.171927-28-ktraynor@redhat.com> In-Reply-To: <20200820153341.171927-1-ktraynor@redhat.com> References: <20200820153341.171927-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe/base: fix x550em 10G NIC link status' has been queued to LTS release 18.11.10 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 LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/25/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/6af0060f513880664da242dd750b60682e162b92 Thanks. Kevin. --- >From 6af0060f513880664da242dd750b60682e162b92 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 f2c8e5425e..265b5704ee 100644 --- a/drivers/net/ixgbe/base/ixgbe_x550.c +++ b/drivers/net/ixgbe/base/ixgbe_x550.c @@ -1892,5 +1892,12 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw, *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 @@ -1926,5 +1933,4 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw, break; } - *autoneg = true; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-20 16:26:16.829505854 +0100 +++ 0028-net-ixgbe-base-fix-x550em-10G-NIC-link-status.patch 2020-08-20 16:26:15.820324288 +0100 @@ -1 +1 @@ -From fb03b51da940f1d56d701776fd85a0dfc1ace098 Mon Sep 17 00:00:00 2001 +From 6af0060f513880664da242dd750b60682e162b92 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fb03b51da940f1d56d701776fd85a0dfc1ace098 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 3de406fd35..9fa999e01d 100644 +index f2c8e5425e..265b5704ee 100644