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 27507A0518 for ; Fri, 24 Jul 2020 14:11:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1FFEE1C20A; Fri, 24 Jul 2020 14:11:20 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 0AE6D1C232 for ; Fri, 24 Jul 2020 14:11:19 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id f2so8089359wrp.7 for ; Fri, 24 Jul 2020 05:11:19 -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=Vp//mMHpwGv4aShzfDC/3Q1veARJ4hHXxIlPK3s6tUY=; b=nZu7faXyNPPTk7AN06elRsxh32PdaOG3kJ15ZExzunNXft4KDULOzV526uvEVl1EL2 UUQyvSmgF5NuBSli7KVv6T4VRohXZJ/Ff8Hy2MOgz4Zcw6nJctPzmuQMriE8mSFrl/Da IlVGFzma27g/uv6bPlPeTsfptldS2wBrJWk/jPW+lBS2Npd/8g0OYcWRk5XK71xYKbgu D117aMBb12Z3QiCgttLjWAkcxrCeRiz6Cy57FIFETrjY20vtWRvnPwJhDZ8+uZQ+inkV oIWC5JXL1276kpOK/Gde9eJ7hjsFkIMuUK0wuxbGffEAvpKcEE0yvUZDab0yVU+gjrMr 6vKg== 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=Vp//mMHpwGv4aShzfDC/3Q1veARJ4hHXxIlPK3s6tUY=; b=RCgePJ1rIpd5e6RgRpXpR60LeOAo/OWpBmMK9T2ix8IyCEqKKjlnDRPHNjS3magrRj opf4rRbp2n8vHiSvMt39J+w4Tr0xE3SwC/n473JGaz00vRcwO1ZL/BOaIrdW08tl2XDt DsxiaxQa7UpoFOfrdGY2Bn+4IZRQTaBznDPat77DZ2KUR3Qs7Xo/bCkKfsAN5YWxUzTe HxiH+v5YSSZtYOLiogUZXmcTyK9YpPqCchjYQ98oFK0oKKj2l58tNacHdIxpbya6+kiL V7VyoAkJycNvp4tIzI1qz0DO2Fntomuf4jgmTxpwCAKZPTyqdlvxqLHttXJ7Mkesm2Vt tGFw== X-Gm-Message-State: AOAM533w/t8/Sr2NE64KHbZMMB14gemnGlRSNwLPNHPo72+aoRwfilP2 xmJ/xU2zZz1uunqARe0mFzw= X-Google-Smtp-Source: ABdhPJwYhlVUXhccrJa+Z9Le3NGESYkVCchOF3UDKxNRwOEGNRet4AiaS5vrexTmE0ss6xB3O5z46Q== X-Received: by 2002:a5d:4947:: with SMTP id r7mr8304984wrs.165.1595592678812; Fri, 24 Jul 2020 05:11:18 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t3sm1290492wre.41.2020.07.24.05.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:11:17 -0700 (PDT) From: luca.boccassi@gmail.com To: Guinan Sun Cc: Wei Zhao , Qi Zhang , Bo Chen , dpdk stable Date: Fri, 24 Jul 2020 13:00:04 +0100 Message-Id: <20200724120030.1863487-166-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: fix flow control 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 c1d088135a4268c025c9ff95fc769f36c976f11e 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 ecbac8f18..875d4ee3d 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -4752,6 +4752,11 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) * MFLCN register. */ 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; else -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.966896367 +0100 +++ 0166-net-ixgbe-fix-flow-control-status.patch 2020-07-24 12:53:48.563011602 +0100 @@ -1,15 +1,16 @@ -From c778b7a39f30ffbb8326f81389668dc5f6f30888 Mon Sep 17 00:00:00 2001 +From c1d088135a4268c025c9ff95fc769f36c976f11e 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") -Cc: stable@dpdk.org Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao @@ -20,10 +21,10 @@ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c -index 74c3c6b5d..fd0cb9b0e 100644 +index ecbac8f18..875d4ee3d 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c -@@ -4743,6 +4743,11 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) +@@ -4752,6 +4752,11 @@ ixgbe_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) * MFLCN register. */ mflcn_reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);