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 D7B0043345 for ; Thu, 16 Nov 2023 14:24:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D16D0402DD; Thu, 16 Nov 2023 14:24:37 +0100 (CET) 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 2E5D0402C6 for ; Thu, 16 Nov 2023 14:24:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141075; 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=ZP6fwvteirkiNJ0TRb8tVJbIGRoroZk4VUU2MloFUyg=; b=C3GKZyGYSZmKi90WQgfdjErXMwY8uejQtxi+Tux6JDCDliwzFwyuxgYpFDHyonDbdTiVSr 8zduhfRUevzxQ7WV/L7aZNoOUwpsHtDmCnha/VdJCQAw036k/RIsLzp4l3UClufIiKLvMn dLBjf5PnLL5S4c2jGo9h+gD7xlSguyA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-7-PIMjDnd4NuSam2cGxHtw2Q-1; Thu, 16 Nov 2023 08:24:32 -0500 X-MC-Unique: PIMjDnd4NuSam2cGxHtw2Q-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4109E811E93; Thu, 16 Nov 2023 13:24:32 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 829032166B27; Thu, 16 Nov 2023 13:24:31 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: dpdk stable Subject: patch 'net/hns3: keep set/get algo key functions local' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:06 +0000 Message-ID: <20231116132348.557257-24-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/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/8ca67530414dd63cfd8646d7e1e2cfcd6e026a21 Thanks. Kevin --- >From 8ca67530414dd63cfd8646d7e1e2cfcd6e026a21 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Tue, 31 Oct 2023 20:23:58 +0800 Subject: [PATCH] net/hns3: keep set/get algo key functions local [ upstream commit 4d996f3b2a1dcce2fff59a0a9490c04480e4c805 ] The functions "hns3_rss_set_algo_key()" and "hns3_rss_get_algo_key()" are the inner interfaces to set hardware. Driver already had an API, "hns3_update_rss_algo_key()", to export and to update RSS algo or key. So above two innter interface don't export. Fixes: 7da415d27d88 ("net/hns3: use hardware config to report hash key") Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_rss.c | 4 ++-- drivers/net/hns3/hns3_rss.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index 8bcc906e45..19d1ae24fd 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -284,5 +284,5 @@ static const struct { * Used to set algorithm and hash key of RSS. */ -int +static int hns3_rss_set_algo_key(struct hns3_hw *hw, uint8_t hash_algo, const uint8_t *key, uint8_t key_len) @@ -325,5 +325,5 @@ hns3_rss_set_algo_key(struct hns3_hw *hw, uint8_t hash_algo, } -int +static int hns3_rss_get_algo_key(struct hns3_hw *hw, uint8_t *hash_algo, uint8_t *key, uint8_t key_len) diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h index 931dacb813..5c0f0b75f0 100644 --- a/drivers/net/hns3/hns3_rss.h +++ b/drivers/net/hns3/hns3_rss.h @@ -189,8 +189,4 @@ int hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf); int hns3_set_rss_tuple_field(struct hns3_hw *hw, uint64_t tuple_fields); int hns3_get_rss_tuple_field(struct hns3_hw *hw, uint64_t *tuple_fields); -int hns3_rss_set_algo_key(struct hns3_hw *hw, uint8_t hash_algo, - const uint8_t *key, uint8_t key_len); -int hns3_rss_get_algo_key(struct hns3_hw *hw, uint8_t *hash_algo, - uint8_t *key, uint8_t key_len); uint64_t hns3_rss_calc_tuple_filed(uint64_t rss_hf); int hns3_update_rss_algo_key(struct hns3_hw *hw, uint8_t hash_algo, -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.139273149 +0000 +++ 0024-net-hns3-keep-set-get-algo-key-functions-local.patch 2023-11-16 13:21:52.449946372 +0000 @@ -1 +1 @@ -From 4d996f3b2a1dcce2fff59a0a9490c04480e4c805 Mon Sep 17 00:00:00 2001 +From 8ca67530414dd63cfd8646d7e1e2cfcd6e026a21 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4d996f3b2a1dcce2fff59a0a9490c04480e4c805 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 6126512bd7..9bb8426256 100644 +index 8bcc906e45..19d1ae24fd 100644 @@ -39 +40 @@ -index 415430a399..9d182a8025 100644 +index 931dacb813..5c0f0b75f0 100644 @@ -42 +43 @@ -@@ -191,8 +191,4 @@ int hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf); +@@ -189,8 +189,4 @@ int hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf);