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 358A7A0543 for ; Thu, 7 Jul 2022 09:56:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2DF2F4113C; Thu, 7 Jul 2022 09:56:35 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 3DDDB406B4 for ; Thu, 7 Jul 2022 09:56:34 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 076D440A91 for ; Thu, 7 Jul 2022 07:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180594; bh=W+IICYB1/eyY2Ppd3h6U16pqgCBXZaGcUHqTT3VUjvs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HVE1m5PHpi7V+MMq7iS+Wchg88R33fsprf56ZP5SFonlkt8PJYsStshhO6rYJK8kQ vc4X6zwz6resjM0AGGncg5S+3iZ95UwSkqlMMUxGRCH3fcm585rZPHoB5oMnE/m4Go sbK6GwjSvDKZeN7vTD4bfUl9Qb1/kpqLzdmusf/WQ7MK0bbUy2gCvl8bjQuuJ9UF7C 0Wvr/cpGE9tcacIGxEp0P7oM9zalizzSPI0qJ28shjt0WD+Ntx/gdTB9wwmNk/FvV8 6y12Sb78tneZESOA6Er7kb/uBOdYxbis3rmfqFt2CJBhEPMPDwnwkf5L42mUM+hGKw w2R40M5iW2ciA== Received: by mail-ed1-f72.google.com with SMTP id z20-20020a05640240d400b0043a82d9d65fso3884695edb.0 for ; Thu, 07 Jul 2022 00:56:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W+IICYB1/eyY2Ppd3h6U16pqgCBXZaGcUHqTT3VUjvs=; b=JJO6PFvMLnj2wAIpJQ1pvBDaUi5cUhedyP3Do12HRnKheRgkzcxkOrkWsi0wGM8yJe UMdzVqWIU9qJZIGLpAYjQjOVhvNHmSog2D6FDESOMaVvSUp0HKpp1C/Ak6yiaDg1H+bu wPziIV7ufCvqmsPGXnPAJmn5XPKfTmIIULOyFbJ660nca4JiR+xA0nXZUD3z25kAYpA0 KKheXKffwwyxafjPL30aOsK13Q3ddr0Mu2LYbo25guGrBNRFrAkp2ODou4/Au3ZOm14S 8WrA3GrBpT6LQ9ZMVvkU3Fti2U+CVxNWSl3yQ7cSrIgAS/YAA7srvoP2pUzmml/2LNDf 5/NA== X-Gm-Message-State: AJIora/kn+WrSM32wKgIg5cwLsgMoQQGflQK13YNbFW3EjjDJ7j+1u6D H8YzDGZrOQoL2YYCX5yMdAiKMDdgFpNRFb/AiN2QGoz4F2NAX2iuRv1DxPtr6TIilaK+eMUzFEd mIiXc1XQnmJpod2eBT/BC6XbB X-Received: by 2002:a17:907:6d14:b0:726:34db:89fc with SMTP id sa20-20020a1709076d1400b0072634db89fcmr43878132ejc.406.1657180593323; Thu, 07 Jul 2022 00:56:33 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s5nUjHt1HaPxuzk1fyDHPftsDinfJM5ddUhLklAbCZrfXNduEFTj/OsXwzHoc/QTTLxEAlnA== X-Received: by 2002:a17:907:6d14:b0:726:34db:89fc with SMTP id sa20-20020a1709076d1400b0072634db89fcmr43878112ejc.406.1657180593060; Thu, 07 Jul 2022 00:56:33 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id s16-20020a170906455000b00722bc0aa9e3sm12194041ejq.162.2022.07.07.00.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:56:32 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: remove unused macro' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:17 +0200 Message-Id: <20220707075522.194223-22-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 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/09/22. 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/fd3e0ac14cef10dbee29e4980ee81d92778b1824 Thanks. Christian Ehrhardt --- >From fd3e0ac14cef10dbee29e4980ee81d92778b1824 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 27 Apr 2022 20:28:07 +0530 Subject: [PATCH] net/bnxt: remove unused macro [ upstream commit c29aa80fb54addbda9a5c841472d7584d3ab9108 ] BNXT_FLAG_UPDATE_HASH is redundant now, remove it. Fixes: 1ebb765090a6 ("net/bnxt: fix config RSS update") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt.h | 1 - drivers/net/bnxt/bnxt_ethdev.c | 2 -- drivers/net/bnxt/bnxt_rxq.c | 3 --- 3 files changed, 6 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index fd362524b3..5ddf60313d 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -549,7 +549,6 @@ struct bnxt { #define BNXT_FLAG_PORT_STATS BIT(2) #define BNXT_FLAG_JUMBO BIT(3) #define BNXT_FLAG_SHORT_CMD BIT(4) -#define BNXT_FLAG_UPDATE_HASH BIT(5) #define BNXT_FLAG_PTP_SUPPORTED BIT(6) #define BNXT_FLAG_MULTI_HOST BIT(7) #define BNXT_FLAG_EXT_RX_PORT_STATS BIT(8) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 5994a33944..f51812f148 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1587,8 +1587,6 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev, return -EINVAL; } - bp->flags |= BNXT_FLAG_UPDATE_HASH; - /* Update the default RSS VNIC(s) */ vnic = &bp->vnic_info[0]; vnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss_conf->rss_hf); diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 993219a2a6..9d8efe0185 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -139,9 +139,6 @@ skip_filter_allocation: if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) { struct rte_eth_rss_conf *rss = &bp->rss_conf; - if (bp->flags & BNXT_FLAG_UPDATE_HASH) - bp->flags &= ~BNXT_FLAG_UPDATE_HASH; - for (i = 0; i < bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; vnic->hash_type = -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:12.157151387 +0200 +++ 0022-net-bnxt-remove-unused-macro.patch 2022-07-07 09:54:10.833823802 +0200 @@ -1 +1 @@ -From c29aa80fb54addbda9a5c841472d7584d3ab9108 Mon Sep 17 00:00:00 2001 +From fd3e0ac14cef10dbee29e4980ee81d92778b1824 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c29aa80fb54addbda9a5c841472d7584d3ab9108 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 5eddb4f000..9e5ff7496e 100644 +index fd362524b3..5ddf60313d 100644 @@ -24 +25 @@ -@@ -648,7 +648,6 @@ struct bnxt { +@@ -549,7 +549,6 @@ struct bnxt { @@ -33 +34 @@ -index fac3925469..181de42d15 100644 +index 5994a33944..f51812f148 100644 @@ -36 +37 @@ -@@ -2125,8 +2125,6 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev, +@@ -1587,8 +1587,6 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev, @@ -43 +44 @@ - vnic = BNXT_GET_DEFAULT_VNIC(bp); + vnic = &bp->vnic_info[0]; @@ -46 +47 @@ -index 0cfd0e588f..3c2283b8c6 100644 +index 993219a2a6..9d8efe0185 100644 @@ -49,2 +50,2 @@ -@@ -175,9 +175,6 @@ skip_filter_allocation: - if (dev_conf->rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) { +@@ -139,9 +139,6 @@ skip_filter_allocation: + if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) { @@ -57,2 +58,2 @@ - uint32_t lvl = RTE_ETH_RSS_LEVEL(rss->rss_hf); - + vnic = &bp->vnic_info[i]; + vnic->hash_type =