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 09211A0543 for ; Tue, 21 Jun 2022 10:06:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 027CA4282A; Tue, 21 Jun 2022 10:06:54 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2076.outbound.protection.outlook.com [40.107.96.76]) by mails.dpdk.org (Postfix) with ESMTP id B69AB4280E for ; Tue, 21 Jun 2022 10:06:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xd4QZX6akHHV2Lr+ZToramPUsvKiTp89QJ1nUYVcAKo1NA9w1lZYpeKa54cOMtUAeou8SBOUGhv7gs48XY2SsVCjxIHUXYItNaFjUDHPP6RWLegT3WE6EPogV5Ovos3i6Tx+KdfF5AKLawqUZ3ZqC8lhDaOQlu6FFacoavgQG9AhCkWvlHh8+7VvSU875qUiH1sV6PqSttaVsSF+lQVL4ZhfYs5PEdOdpYkJHJ6lfamen+Cm8lRzcJcjpRFh2GZM+X8nAv/SvPK8o7XCozjxkKugGI2HdA7te5X+f2EGgU8iMz9N7e5mp4ZIRFmwhHMm2ohRDiaGfduIc45xXPAvFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=u665H3Q4pSuFc0lmNcGaOOzestargXP4tosH77qfiNc=; b=PLJQCpZnhJWhhdPQvgr5grXsRcM/IaFW1wV4DH+8B8SYkHyh/MH3EluoNf/87Xq0cB0UJAgnd3byPeUoomUN7EnIULug7OFbFeTvli0/LA4b41u7/RxixS7zRMZsXAcOuYHYV20fRWqBKtAYcRH3ei4o1nGsdU1Flmg5K4Y/Br0G2+n4cfFvWz1Ba6t2VhyMPzQGEzcvdIs86WjvGFp9UByLF69TddQOh0lUy35tCfu+seiAJyJCy06Llye11DkJoK0WgswYYX/s+pMjNcWuu8L3x8zyNx8dCHvFpCxW8yaTGH1oUOK2PnvNRi7tEdqQTfeq81traZz29akG9J0I+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=broadcom.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u665H3Q4pSuFc0lmNcGaOOzestargXP4tosH77qfiNc=; b=KDfeWSnPNfHodS4QtIag2bHaVapIxQdXQXwP19NIiZr6Uz0MbpWq7igGniYilaxl2YYCpozUOgFFwgNCJVrew1tOKERLGeb9734RtZmqdiJ67QcDUul32A4stohg7o2xbK6mmp/InZhSMUYnkpa50CWKpgbPJSK4HhUVyEBcDUz5K+GTh+KeQ20S1TJvujkuICqq7xvDl6pu9ooBq5z+LsW8zjLaKQP0KkM/foDxuyphSAfUkkmMHYhJhwZEwfLAx+wd8OCVmvLs5B5xlQ9sDEz6LlMtXpF9jEnD9ULENUxBQCIU+QybRT1X4p1642GYqfx9IHAgJwS+4v5mP2AB1g== Received: from MWHPR19CA0095.namprd19.prod.outlook.com (2603:10b6:320:1f::33) by SJ0PR12MB5504.namprd12.prod.outlook.com (2603:10b6:a03:3ad::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Tue, 21 Jun 2022 08:06:51 +0000 Received: from CO1NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:320:1f:cafe::2) by MWHPR19CA0095.outlook.office365.com (2603:10b6:320:1f::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22 via Frontend Transport; Tue, 21 Jun 2022 08:06:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by CO1NAM11FT056.mail.protection.outlook.com (10.13.175.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:06:50 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:06:50 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 21 Jun 2022 01:06:48 -0700 From: Xueming Li To: Kalesh AP CC: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: remove unused macro' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:49 +0300 Message-ID: <20220621080301.2315720-44-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 728be7c2-dc83-4d16-eee7-08da535cff2d X-MS-TrafficTypeDiagnostic: SJ0PR12MB5504:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GC86VlIpVjfeJzimymJHzvinCBE993pVzX9NQW8LwkIR1Db5x3wXRFnS/p7/NtE25LU0+cQW9D+VjEcE+LOuoq+bXGjFK/WGDj3BR0hD3O77SVWgzHDSi/XGZaaT9GqOIIaPF0H6WYxJmg3xildksJQ8NGV4tcp+Yh0i7qIbXAkBTqzUKwG/sUXtjmeHQ9mXJojABy9XiuNrEFk2FkFIGEa5Ko94S/o0gqjhG4c9kg2VKnKhaN5VTnZD7618TPDQLEaxjcLs4E9yfFkX0sPPMr52Se8cj8HazwuwImE7EXL+46ND1WH+89rClrVqWsmuJkSt+RUr7UJ/2Dg1bGSVVnPWwWricYT9k4kVPp9KdtvxRr1Ul2+EO3AigqKrUJRKhkR8ifFEM+UhmGN/3CK7zxaSqadu5a9xwnD7gi1ydQ51UECMm2eLXYiOj6ARK2p+lGK93GfTqzvBGpDNrWOGh/d7XIdlizhlRR4d8X48Cw2MFu2qqQilyymuXFL51uNHJYsBxt9WkBKyhtuLBMwXUrYyDhjyZHwF1ts4ZKCoSctz0A1Xj7T/5AQaQbS1MEOwCfzGFhuFhw9BnMV7Fyj123dKEECykXO07O2OWLTCfHGpnd10gNXV+qnmpmVGWdizfB6pSrH/QAH/OFnJHrZS/a+4XqS8TI9dMEireNK1KRAWBHwZSj+ZOg9BrmIEiwxV+JlTkdKOE9QeS9proF3ebhSUM0ncdIo3TaDp/QkKl8ZkHkCe+QGJlFm6rl8V2r6++4uKpKAuqS+TS7mde+ADT8mqDyMhWNO++Ee0ppDSU83zMIRg3/SwZDLLqkPT5NzG6KEN05FnOL0uzaBai/vIS83B1O82j1fUXy8asYAIWEM= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(136003)(39860400002)(396003)(376002)(346002)(40470700004)(46966006)(36840700001)(5660300002)(40480700001)(36756003)(55016003)(36860700001)(8936002)(478600001)(81166007)(966005)(426003)(41300700001)(356005)(83380400001)(40460700003)(16526019)(186003)(47076005)(336012)(82740400003)(8676002)(316002)(2616005)(6286002)(26005)(7696005)(86362001)(53546011)(2906002)(70586007)(70206006)(82310400005)(4326008)(6916009)(1076003)(54906003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:06:50.8706 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 728be7c2-dc83-4d16-eee7-08da535cff2d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5504 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.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 06/23/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/ae5516cd7a3ee2ec4b53772ade4ed06ebe85cabf Thanks. Xueming Li --- >From ae5516cd7a3ee2ec4b53772ade4ed06ebe85cabf 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 Cc: Xueming Li [ 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 30265d245b..c24a9ca92a 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -659,7 +659,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 5fd159e2db..58198f96be 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -2079,8 +2079,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 = BNXT_GET_DEFAULT_VNIC(bp); 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 e057393b2b..73e0ba36f6 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++) { uint32_t lvl = ETH_RSS_LEVEL(rss->rss_hf); -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:51.276402320 +0800 +++ 0043-net-bnxt-remove-unused-macro.patch 2022-06-21 15:37:49.044451276 +0800 @@ -1 +1 @@ -From c29aa80fb54addbda9a5c841472d7584d3ab9108 Mon Sep 17 00:00:00 2001 +From ae5516cd7a3ee2ec4b53772ade4ed06ebe85cabf Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c29aa80fb54addbda9a5c841472d7584d3ab9108 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 5eddb4f000..9e5ff7496e 100644 +index 30265d245b..c24a9ca92a 100644 @@ -24 +26 @@ -@@ -648,7 +648,6 @@ struct bnxt { +@@ -659,7 +659,6 @@ struct bnxt { @@ -33 +35 @@ -index fac3925469..181de42d15 100644 +index 5fd159e2db..58198f96be 100644 @@ -36 +38 @@ -@@ -2125,8 +2125,6 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev, +@@ -2079,8 +2079,6 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev, @@ -46 +48 @@ -index 0cfd0e588f..3c2283b8c6 100644 +index e057393b2b..73e0ba36f6 100644 @@ -49,2 +51,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 +59 @@ - uint32_t lvl = RTE_ETH_RSS_LEVEL(rss->rss_hf); + uint32_t lvl = ETH_RSS_LEVEL(rss->rss_hf);