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 004F242ECF for ; Thu, 20 Jul 2023 17:22:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F0DFC42D38; Thu, 20 Jul 2023 17:22:08 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 4464F42C54 for ; Thu, 20 Jul 2023 17:22:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866526; 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=ZS8Gx4ZTwVJ4h3/eSShOf2vEXc/M87Nco3BXAanEvwY=; b=hCltDxqXluOcUHjiFqox/B4lrZryfPNTrnNvwK+lK6OzeMhbpJCwUOdIeRLGkuVh7ykWty EJhqghI198OoT8KopM8KA/DOM/QumdX+MxqZNoZDdCQUhjYvEJWG0BdFyl7m3xgoILe1Rk DFosfx/gVvbv8OUIcCC8sdO0IUfdNpE= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-663-WK1S7xQnPOCn9jUVYOWXQQ-1; Thu, 20 Jul 2023 11:21:15 -0400 X-MC-Unique: WK1S7xQnPOCn9jUVYOWXQQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8494A29A9D5B; Thu, 20 Jul 2023 15:21:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 691CF4A9004; Thu, 20 Jul 2023 15:21:04 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix inaccurate log' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:57 +0100 Message-ID: <20230720151942.262154-46-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 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/25/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/44160c032b77622bcfacd76d0031452797a7b782 Thanks. Kevin --- >From 44160c032b77622bcfacd76d0031452797a7b782 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 f2ccade7b4..a758300060 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -590,5 +590,5 @@ 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; @@ -1647,5 +1647,5 @@ 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.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:00.592293731 +0100 +++ 0046-net-hns3-fix-inaccurate-log.patch 2023-07-20 16:17:54.688750618 +0100 @@ -1 +1 @@ -From 94e9574f0bc5c1b5c2ac15b86ffb28bdbdc238c4 Mon Sep 17 00:00:00 2001 +From 44160c032b77622bcfacd76d0031452797a7b782 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 f2ccade7b4..a758300060 100644 @@ -22 +23 @@ -@@ -587,5 +587,5 @@ hns3_tqp_enable(struct hns3_hw *hw, uint16_t queue_id, bool enable) +@@ -590,5 +590,5 @@ hns3_tqp_enable(struct hns3_hw *hw, uint16_t queue_id, bool enable) @@ -29 +30 @@ -@@ -1636,5 +1636,5 @@ hns3_set_fake_rx_or_tx_queues(struct rte_eth_dev *dev, uint16_t nb_rx_q, +@@ -1647,5 +1647,5 @@ hns3_set_fake_rx_or_tx_queues(struct rte_eth_dev *dev, uint16_t nb_rx_q,