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 2412EA04F0 for ; Tue, 10 Dec 2019 16:02:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1A50B1BF6E; Tue, 10 Dec 2019 16:02:05 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 103A21BF6E for ; Tue, 10 Dec 2019 16:02:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990123; 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=A/JUHSF7PZIQ5VwP08M200cnYjhyubnzPBtnhFoDtuo=; b=hppf5HRsvC2XbQsdpiN4tW6TtK+oKBPol3GecsBfGt2AZSwz7BmmZi2/BY1sLTyeWDJeKG G8o7kDPkC87h78sL1ii5WgGZbd/SRYeDgKwBn2sEQOiygqQFLZ5+nMZDn0Ecg5Iwh4WEB4 YhxkDHx4AMB1Jg2mS/smkFGYbNMSvBo= 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-96-CKjqOSWrMFGnGeSaH4--sg-1; Tue, 10 Dec 2019 10:02:00 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C0261572963; Tue, 10 Dec 2019 15:01:59 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 371195DA7B; Tue, 10 Dec 2019 15:01:58 +0000 (UTC) From: Kevin Traynor To: Shweta Choudaha Cc: Xiaolong Ye , dpdk stable Date: Tue, 10 Dec 2019 14:59:35 +0000 Message-Id: <20191210145937.32755-61-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: CKjqOSWrMFGnGeSaH4--sg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/igb: fix PHY status if PHY reset is not blocked' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/16/19. 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 rebasi= ng (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/c9a19b57badadef772= 195cd0afc51630998ae7dc Thanks. Kevin. --- >From c9a19b57badadef772195cd0afc51630998ae7dc Mon Sep 17 00:00:00 2001 From: Shweta Choudaha Date: Thu, 16 May 2019 23:03:31 +0100 Subject: [PATCH] net/igb: fix PHY status if PHY reset is not blocked [ upstream commit 260dd6952600b5b44d0a1ce70a582116e6bd74fa ] When PHY reset is blocked as is the case when BMC is connected via NC-SI do not set GO_LINKD bit in PHY power management register in dev_stop as this will disconnect the PHY. Also, in dev_close clear the GO_LINKD bit only if PHY reset is not blocked Fixes: 3af34dec0b41 ("igb: force phy power up/down") Signed-off-by: Shweta Choudaha Reviewed-by: Xiaolong Ye --- drivers/net/e1000/igb_ethdev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.= c index 96ccf9763..23b48d161 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -1515,6 +1515,7 @@ eth_igb_stop(struct rte_eth_dev *dev) =09E1000_WRITE_REG(hw, E1000_WUC, 0); =20 -=09/* Set bit for Go Link disconnect */ -=09if (hw->mac.type >=3D e1000_82580) { +=09/* Set bit for Go Link disconnect if PHY reset is not blocked */ +=09if (hw->mac.type >=3D e1000_82580 && +=09 (e1000_check_reset_block(hw) !=3D E1000_BLK_PHY_RESET)) { =09=09uint32_t phpm_reg; =20 @@ -1590,6 +1591,7 @@ eth_igb_close(struct rte_eth_dev *dev) =09igb_hw_control_release(hw); =20 -=09/* Clear bit for Go Link disconnect */ -=09if (hw->mac.type >=3D e1000_82580) { +=09/* Clear bit for Go Link disconnect if PHY reset is not blocked */ +=09if (hw->mac.type >=3D e1000_82580 && +=09 (e1000_check_reset_block(hw) !=3D E1000_BLK_PHY_RESET)) { =09=09uint32_t phpm_reg; =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:43.086003085 +0000 +++ 0061-net-igb-fix-PHY-status-if-PHY-reset-is-not-blocked.patch=092019-12= -10 14:49:39.108456723 +0000 @@ -1 +1 @@ -From 260dd6952600b5b44d0a1ce70a582116e6bd74fa Mon Sep 17 00:00:00 2001 +From c9a19b57badadef772195cd0afc51630998ae7dc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 260dd6952600b5b44d0a1ce70a582116e6bd74fa ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index ce7c9e664..53e83d5ec 100644 +index 96ccf9763..23b48d161 100644 @@ -24 +25 @@ -@@ -1469,6 +1469,7 @@ eth_igb_stop(struct rte_eth_dev *dev) +@@ -1515,6 +1515,7 @@ eth_igb_stop(struct rte_eth_dev *dev) @@ -34 +35 @@ -@@ -1545,6 +1546,7 @@ eth_igb_close(struct rte_eth_dev *dev) +@@ -1590,6 +1591,7 @@ eth_igb_close(struct rte_eth_dev *dev)