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 B73D2A0A02 for ; Mon, 17 May 2021 18:16:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B001D410F9; Mon, 17 May 2021 18:16:36 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 5768D40041 for ; Mon, 17 May 2021 18:16:35 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifv1-0008MW-5x; Mon, 17 May 2021 16:16:35 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , dpdk stable Date: Mon, 17 May 2021 18:09:43 +0200 Message-Id: <20210517161039.3132619-154-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix mailbox error message' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/b13a99c6de1a3c42ac0c6c6d08ec502b75f973f3 Thanks. Christian Ehrhardt --- >From b13a99c6de1a3c42ac0c6c6d08ec502b75f973f3 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Thu, 22 Apr 2021 09:55:49 +0800 Subject: [PATCH] net/hns3: fix mailbox error message [ upstream commit 871aa63542cedab7b920f2dd54fc3dc8ef82f3ca ] The hns3_dev_handle_mbx_msg() could be called under both PF and VF, but the error messages show VF. Fixes: 109e4dd1bd7a ("net/hns3: get link state change through mailbox") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_mbx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c index f289d57012..a47cb3e0ff 100644 --- a/drivers/net/hns3/hns3_mbx.c +++ b/drivers/net/hns3/hns3_mbx.c @@ -454,8 +454,7 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw) hns3_handle_link_change_event(hw, req); break; default: - hns3_err(hw, - "VF received unsupported(%d) mbx msg from PF", + hns3_err(hw, "received unsupported(%d) mbx msg", req->msg[0]); break; } -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:35.436273296 +0200 +++ 0154-net-hns3-fix-mailbox-error-message.patch 2021-05-17 17:40:29.431811524 +0200 @@ -1 +1 @@ -From 871aa63542cedab7b920f2dd54fc3dc8ef82f3ca Mon Sep 17 00:00:00 2001 +From b13a99c6de1a3c42ac0c6c6d08ec502b75f973f3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 871aa63542cedab7b920f2dd54fc3dc8ef82f3ca ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index eb202dd60e..3b35c0277f 100644 +index f289d57012..a47cb3e0ff 100644 @@ -22,2 +23,2 @@ -@@ -528,8 +528,7 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw) - hns3_handle_promisc_info(hw, req->msg[1]); +@@ -454,8 +454,7 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw) + hns3_handle_link_change_event(hw, req); @@ -27,2 +28,2 @@ -- "VF received unsupported(%u) mbx msg from PF", -+ hns3_err(hw, "received unsupported(%u) mbx msg", +- "VF received unsupported(%d) mbx msg from PF", ++ hns3_err(hw, "received unsupported(%d) mbx msg",