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 344C5A04B1 for ; Fri, 28 Aug 2020 12:13:53 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2BA7F1C115; Fri, 28 Aug 2020 12:13:53 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 1915DA3 for ; Fri, 28 Aug 2020 12:13:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609631; 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=gX0gaiZt0DnPlicBbx1zsdUnOLKFlcLkIBwOH/pX8Pg=; b=UW/wZyR+z0MbjR69qvNO/zwjw/0Aw+TEIEagER968RiQ1IsWK/a2W0FcX1o2GuWg2amYok MIoXI/k5hHDU7vxFxl4gHM9HJAMC2PrudF95VGHmx9uqn4UBxo7rLHeXb3KcLAwYP17SLK nsdD5pOsbpniihFeWWmN9admMB0Hv/k= 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-521-x3D7N-jzOF2peUdF1H5afA-1; Fri, 28 Aug 2020 06:13:47 -0400 X-MC-Unique: x3D7N-jzOF2peUdF1H5afA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F099189E61A; Fri, 28 Aug 2020 10:13:46 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E7DF19D7C; Fri, 28 Aug 2020 10:13:44 +0000 (UTC) From: Kevin Traynor To: Guinan Sun Cc: Wei Zhao , Qi Zhang , Bo Chen , dpdk stable Date: Fri, 28 Aug 2020 11:12:35 +0100 Message-Id: <20200828101308.223767-9-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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: fix flow control 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 09/02/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/f04772a299067ae8264ce42b754cfb22607fe33f Thanks. Kevin. --- >From f04772a299067ae8264ce42b754cfb22607fe33f Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Sat, 23 May 2020 05:22:39 +0000 Subject: [PATCH] net/ixgbe: fix flow control status [ upstream commit c778b7a39f30ffbb8326f81389668dc5f6f30888 ] mac_ctrl_frame_fwd assignment is missing, so setting mac_ctrl_frame_fwd should be added in ixgbe_flow_ctrl_get(). The patch fixes the issue. Fixes: 56ea46a997b7 ("ethdev: retrieve flow control configuration") Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao Acked-by: Qi Zhang Tested-by: Bo Chen --- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index c1170cedb7..0ef3e01165 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -4658,4 +4658,9 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) */ mflcn_reg = IXGBE_READ_REG(hw, IXGBE_MFLCN); + if (mflcn_reg & IXGBE_MFLCN_PMCF) + fc_conf->mac_ctrl_frame_fwd = 1; + else + fc_conf->mac_ctrl_frame_fwd = 0; + if (mflcn_reg & (IXGBE_MFLCN_RPFCE | IXGBE_MFLCN_RFCE)) rx_pause = 1; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.197183915 +0100 +++ 0009-net-ixgbe-fix-flow-control-status.patch 2020-08-28 11:03:25.933955534 +0100 @@ -1 +1 @@ -From c778b7a39f30ffbb8326f81389668dc5f6f30888 Mon Sep 17 00:00:00 2001 +From f04772a299067ae8264ce42b754cfb22607fe33f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c778b7a39f30ffbb8326f81389668dc5f6f30888 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 74c3c6b5db..fd0cb9b0e2 100644 +index c1170cedb7..0ef3e01165 100644 @@ -26 +27 @@ -@@ -4744,4 +4744,9 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) +@@ -4658,4 +4658,9 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)