From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F1BA942CBC for ; Thu, 15 Jun 2023 03:34:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E226E42D2F; Thu, 15 Jun 2023 03:34:56 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id C54A940E0F for ; Thu, 15 Jun 2023 03:34:55 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-3f7e7fc9fe6so14484095e9.3 for ; Wed, 14 Jun 2023 18:34:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792895; x=1689384895; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1tUcIJZfXSqBmY6ei5LJ/2w+JyH42CI/JrpB14c4luc=; b=ik6aC8bv26L2fwXULUrfx2PVm4hJ418T41fjqvkIt3lZRvkCkO3YuWtCvzlpWf7EMN xTzA/doJI/1gc1RwQLf4m3ajE//iQ4KNMPsbfYzT5TGFI7L86iFmmSRA5DTNtC/8GDws EYJ/uj7+gpKIdR981owutgseVFmoIn3g3slYJPsDz+wg8aFv6pmqHYQ9zssXvmS+UT0q tI9vD2DfzwKZetyL76yFDdiR2ORu+bdxWKbCB3k6gzdF6n9UyGQKbnGy3r/xWca4dTje cU9uAKR3kOMTO8gOD8HO8uCl/NrH4hfIq05TXEznTKammtYtEgSEJdqJ66iDE95sPc7E jZWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792895; x=1689384895; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1tUcIJZfXSqBmY6ei5LJ/2w+JyH42CI/JrpB14c4luc=; b=NmoYIAxEQyidwz5rVNZm6omudsmOyFTSaWNM5kTW2NfFSDGClloqPBNhPGmKifvCzR J8Ig+ANEAi4SzXJjKSwYzfRW4lZKZ3rxvEcD0GKTWOY3EyDhrhxDUmfMXqB+yzyG4xn1 9IDuemnymZ2dg5xpUYl/nx3gkYFoAIeBw8V1Bfa4w3cL5nVqpdBwbLOTz/FWZax4jMq3 4+S6BMpRJ877+mHg4a0ha5q1XVR0Uh2rBCJLGcD7bgGY7YUnAbj8KWCiIxsmPFkIbcFg Nw+drkgixhhDpQ4zquVlEuoTfPUi3szYM65R2JK38NryAp9gN5zC+HfJClXO33wcqTAZ 6Yhg== X-Gm-Message-State: AC+VfDw8XuoJWK/3KtbzM5Nz5+OJVA1+65JLoHwV6ZS3lVF9pr3X9P/R Lq9nF3R4GuP6/BRMVLUxX6vYKnaG09A4+rOQ X-Google-Smtp-Source: ACHHUZ6OGTbKbczAH/8pHqSasAsCE5FoJCiZiH25QQOn/+k9uD+Vefo/+bEnM2EF57fArpBlS2VYbQ== X-Received: by 2002:a05:600c:2144:b0:3f7:5e07:ea54 with SMTP id v4-20020a05600c214400b003f75e07ea54mr13287861wml.13.1686792895500; Wed, 14 Jun 2023 18:34:55 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id z20-20020a1c4c14000000b003f80946116dsm17352680wmf.45.2023.06.14.18.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:34:55 -0700 (PDT) From: luca.boccassi@gmail.com To: Dengdui Huang Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix inaccurate log' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:31 +0100 Message-Id: <20230615013258.1439718-36-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/17/23. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/e765fbe6b8e9703ce8f10f5b637bc4e09a14e7be Thanks. Luca Boccassi --- >From e765fbe6b8e9703ce8f10f5b637bc4e09a14e7be Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Fri, 2 Jun 2023 19:42:04 +0800 Subject: [PATCH] net/hns3: fix inaccurate log [ upstream commit 94e9574f0bc5c1b5c2ac15b86ffb28bdbdc238c4 ] This patch fix inaccurate log Fixes: bba636698316 ("net/hns3: support Rx/Tx and related operations") Fixes: a951c1ed3ab5 ("net/hns3: support different numbers of Rx and Tx queues") Signed-off-by: Dengdui Huang Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index bf07a5071a..963a20627b 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -581,7 +581,7 @@ hns3_tqp_enable(struct hns3_hw *hw, uint16_t queue_id, bool enable) ret = hns3_cmd_send(hw, &desc, 1); if (ret) - hns3_err(hw, "TQP enable fail, ret = %d", ret); + hns3_err(hw, "TQP %s fail, ret = %d", enable ? "enable" : "disable", ret); return ret; } @@ -1638,7 +1638,7 @@ hns3_set_fake_rx_or_tx_queues(struct rte_eth_dev *dev, uint16_t nb_rx_q, ret = hns3_fake_tx_queue_config(hw, tx_need_add_nb_q); if (ret) { - hns3_err(hw, "Fail to configure fake rx queues: %d", ret); + hns3_err(hw, "Fail to configure fake tx queues: %d", ret); goto cfg_fake_tx_q_fail; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:36.583440573 +0100 +++ 0036-net-hns3-fix-inaccurate-log.patch 2023-06-15 01:56:34.623542527 +0100 @@ -1 +1 @@ -From 94e9574f0bc5c1b5c2ac15b86ffb28bdbdc238c4 Mon Sep 17 00:00:00 2001 +From e765fbe6b8e9703ce8f10f5b637bc4e09a14e7be Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 94e9574f0bc5c1b5c2ac15b86ffb28bdbdc238c4 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index cf04dc857e..f3c3b38c55 100644 +index bf07a5071a..963a20627b 100644 @@ -22 +23 @@ -@@ -586,7 +586,7 @@ hns3_tqp_enable(struct hns3_hw *hw, uint16_t queue_id, bool enable) +@@ -581,7 +581,7 @@ hns3_tqp_enable(struct hns3_hw *hw, uint16_t queue_id, bool enable) @@ -31 +32 @@ -@@ -1635,7 +1635,7 @@ hns3_set_fake_rx_or_tx_queues(struct rte_eth_dev *dev, uint16_t nb_rx_q, +@@ -1638,7 +1638,7 @@ hns3_set_fake_rx_or_tx_queues(struct rte_eth_dev *dev, uint16_t nb_rx_q,