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 EE39DA0093 for ; Fri, 22 May 2020 11:41:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E15DA1D96F; Fri, 22 May 2020 11:41:05 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 0F2951D96A for ; Fri, 22 May 2020 11:41:04 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id f134so8077931wmf.1 for ; Fri, 22 May 2020 02:41:04 -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=bQEML+39qC0ekG6B888Gmk3VuR/Ubwx94MzI54ZuHU8=; b=P9Z69yF6ngAOd5LPzLrmtPsDpgUQC8P4lYDSIVoO210+L2mt2CHHz/PrpmnTQ2IJ65 4aTxtLo1coAqIzXkudZz9LKDCIcGrncqBjtTyPoy0K8oDryZEe6oRAni/9QdCG+z4LZy /dHnZJ/zRuu/rIuVkzpVBU8mHY/WTDK4eSl7P4PeX4ZRAgjvFa68X5QQvQrZvVADnLpa csghaE2VPJJAtzXRu4roqvl4hCXdqU2VKBmaby/RpXJEW655C3Fb8dn8sZDwLCvoG9Ri cX9bn0s7YK5rcBzdiHExy39JmrXs5VBEkcFF5l3EfBZ9EwXwwlU3oZll8u4xFZ9XRxze 31wA== 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=bQEML+39qC0ekG6B888Gmk3VuR/Ubwx94MzI54ZuHU8=; b=unMoOQr3eaAi0JiatddqaSoQ+UmKF1JPbK2zgoembVuF//blmKfmC5JA7yMT9b9jc0 o/Kzvb5m+GSvCBT7saZoL99E2yhuJuzKgjauGVx97/Iug8WyF8t+U3iqAYFBMmvA+4g8 pIO9uvLrZSSYculxWZFqNqRPMWyF3fxRMTnBBcDwbiK70oEOxD/QPoOxuHlCRpTwZjZD +CqcULnt73EgC8STaCeWVuxHZSvyuGFrBah6aJ9bv2RBIakBlGKpSK4dLleDzGErZR90 rKYdDNj0UYGb3XeeKUcNKSvgT+zYTs4ZYdip15siJmC94ZQrCQBCJPa7PMYASk7twHu2 R4FQ== X-Gm-Message-State: AOAM531KbJ8RX87DbBAMmrX39ATPwV5j81dIlmQ42LpVbvM499k2xPCi 9dgq0AsK3lZUdhMPKgT0Tng= X-Google-Smtp-Source: ABdhPJzDItfCyIDgtmcrFl/p8CWVzAt7f6kcgZ9zgWu/0p7fVrHaJshOe5cDULmGuO/m7lo34D2lbg== X-Received: by 2002:a7b:cf22:: with SMTP id m2mr13404615wmg.82.1590140463773; Fri, 22 May 2020 02:41:03 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r11sm8905530wrv.14.2020.05.22.02.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:41:03 -0700 (PDT) From: luca.boccassi@gmail.com To: Guinan Sun Cc: Wei Zhao , dpdk stable Date: Fri, 22 May 2020 10:39:52 +0100 Message-Id: <20200522094022.1025696-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: fix statistics in flow control mode' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/24/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 f98d3de91334216d2b9616ec987c0017473c66e0 Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Tue, 12 May 2020 08:13:06 +0000 Subject: [PATCH] net/ixgbe: fix statistics in flow control mode [ upstream commit 861ca8b1e97c68727cbafbb859cc6c2ff017801e ] The register autoneg can't be updated synchronously with flow control mode setting in the state of port start, so NIC statistics error occurs. AUTO_NEG Advt register should be updated by ixgbe_setup_fc() when enabling flow control. The patch fixes the issue. Fixes: a524f550da6e ("net/ixgbe: fix flow control mode setting") Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao --- drivers/net/ixgbe/ixgbe_ethdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index ce0c05fcc2..50edb69cb2 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2541,6 +2541,8 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw) int err; uint32_t mflcn; + ixgbe_setup_fc(hw); + err = ixgbe_fc_enable(hw); /* Not negotiated is not an error case */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:39.720114530 +0100 +++ 0013-net-ixgbe-fix-statistics-in-flow-control-mode.patch 2020-05-22 10:37:39.088411997 +0100 @@ -1,8 +1,10 @@ -From 861ca8b1e97c68727cbafbb859cc6c2ff017801e Mon Sep 17 00:00:00 2001 +From f98d3de91334216d2b9616ec987c0017473c66e0 Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Tue, 12 May 2020 08:13:06 +0000 Subject: [PATCH] net/ixgbe: fix statistics in flow control mode +[ upstream commit 861ca8b1e97c68727cbafbb859cc6c2ff017801e ] + The register autoneg can't be updated synchronously with flow control mode setting in the state of port start, so NIC statistics error occurs. AUTO_NEG Advt register should be updated by ixgbe_setup_fc() when @@ -10,7 +12,6 @@ The patch fixes the issue. Fixes: a524f550da6e ("net/ixgbe: fix flow control mode setting") -Cc: stable@dpdk.org Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao @@ -19,10 +20,10 @@ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c -index a4e5c539de..f8a84c565f 100644 +index ce0c05fcc2..50edb69cb2 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c -@@ -2543,6 +2543,8 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw) +@@ -2541,6 +2541,8 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw) int err; uint32_t mflcn;