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 6C468A0548 for ; Sun, 28 Nov 2021 15:57:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6543942732; Sun, 28 Nov 2021 15:57:27 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2057.outbound.protection.outlook.com [40.107.244.57]) by mails.dpdk.org (Postfix) with ESMTP id 9043E4068A for ; Sun, 28 Nov 2021 15:57:25 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b3QMpEZsp834Mf8BKaNayr0S54sPrGm5Kz9YWPjjRz0D/XC5+XNWIONmUZWZKfPVJRrnnGyQNswH55ih+mz2w77xYsYsFS/wNLHdP4RLwMQQaiaTJNx/9RQsaJ6pUE+Ntp/dLBreIMbV7jVjHLt1mgiM5th6PzXj7zt+pLC35wU9S+BaClrMccHHCpfU3B5YR/UrU+cdYeYaMT0TWitkCRCCINaWTzgwXrNgqrkm6FSw4XMptyCaRx3K5WLO328WoRdnn+MxGwJEryp8M7st1GoZgIOU1fFv/YnRbNcRupPcO+jt+qTkFuCgD/a3R0qHRKjgT6kkjaiPnHwCNRpv+A== 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=1IOUm25qy9ArtcvcejjtWIpvwLl+TYZgFYKKARQ1yWU=; b=h/CdLjkMta2zfs1rPgOxBlCZTZ8Gop/u+KSScdNBNt170LaM4MKxUMpg10e2YnguKBTNikZCrh1CBnX6UXN8S5xPdDAsmIUJP8n/hofHAGr3u+NZ1+dKFD7op4GaHJi7PmlYch03QMswtQid0TcIcyampaOJLjVLvxwp3O21JuKu2s4cDRcz8qIMgsgQpnR/+eOzt3DBXSENnTwToZZcqa9CbYMBOy2fVW+9OshqgTl27QfveWih/owEMAIH0g2m4UwTpTMXs5VdWG3uoadju6Owa8HmE6qPtYstwYhOPdhOLoNIe+vEu/HJ/EWUGaWPtzfNhopWE41PakVdB6vcLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=broadcom.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=1IOUm25qy9ArtcvcejjtWIpvwLl+TYZgFYKKARQ1yWU=; b=Dy1SPzembBQrkLpLgLgdXg7a7k+oZHJGHa61vqOYAfz3kJlbxghW7P4qWiF47v/ut0KCQS6ecO0AJMnLEgathJx9qTRCdJnOCwUGMJgnPHPYODYgL5nj331EM69hBfC+OEcx//T3RaqCHJ/GzH/BOK2tN7wllDPy9zG5rmGLn4JAhPyNZucDiDshC9k5qptiEwGoDgsNE/eP50PUNF6T2sEzwdOZKUWA5O+UDmxqd58UsnHCEQ9YVMYnFgAJOz8+IDVpqGHPMXffdtZLKhLDAYlWlz/GI2/sD3WtPcTTQc4rBTP47Vc2XZLrgf6ga1nAtGIPBynJuYipYVZXbhPtXQ== Received: from DM6PR02CA0134.namprd02.prod.outlook.com (2603:10b6:5:1b4::36) by BN6PR12MB1794.namprd12.prod.outlook.com (2603:10b6:404:100::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20; Sun, 28 Nov 2021 14:57:23 +0000 Received: from DM6NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1b4:cafe::b5) by DM6PR02CA0134.outlook.office365.com (2603:10b6:5:1b4::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21 via Frontend Transport; Sun, 28 Nov 2021 14:57:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT059.mail.protection.outlook.com (10.13.172.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 14:57:23 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov 2021 14:57:20 +0000 From: Xueming Li To: Conor Walsh CC: Luca Boccassi , Liang Longfeng , Somnath Kotur , Ajit Khaparde , David Marchand , dpdk stable Subject: patch 'net/bnxt: remove some unused variables' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:53:26 +0800 Message-ID: <20211128145423.3974892-23-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ae715ac-2ac1-4466-934d-08d9b27f6277 X-MS-TrafficTypeDiagnostic: BN6PR12MB1794: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dwfna6+JsiASGqp+F+6iISbyK+WeLq9NRFXOgitH6+naMSy7/LVaMNbg9kN5C2aBuHvWqHMbVHpLaLdyKRaYb9vqyllkyi5+hRRWq39R8lXfUoCWBB4oy3Wp0dXC/rBn0+/Rc/6QrrirH+ew4VlgfDmx4KdivvZuP+CBOMxHO6OSZUzVvL/xxua1WDKlSw62osBVQj8dcDmkXbleXgj+8GElXPSXkkeWH97upJiFSltepbZgBOZWnSTExvu4d/77mKRT4z4YAig5G8p0BRIp5VeS/RqKdtTBphkmM2IWnf0dUHBsxBuZ2O8gfZ1AgLwS3Lpemhna+IVyK8O/YkQvfFuKPZcrQTTpLxCh0JVZxW+a71NNovujWXZQweQpxpQGJ4RswBahNxhzGDKrwu8hcmNJPLkgrOqy0YJu4kJQuEz/pDy9WhaW7cKOtnXD/wIlIBf4WJDtmYaoePEuvEbm10k5CsMk30fpEi3V/zpljyhwFuzUJg35wmv2gSTpNgeMYFSAIQjoR1eFFkGjuMVhorHbdKQ8NBYH6JqZaIhA0mHn/5wE5gjHuxsaJwa7XXMPmB/UMvXeVq3ZcnYCTheP7L9qnoTly4oPYw/+7Xt7IL6FBtXHUWn8FgGrqOCGtzZ35TJvyqHt0GbBDw8D9W0dkJbrM31+YvXYLZEckfdVJAuwwEG8DZGglXy8mf4ZG9XCrwXgDla8lfIVt/mor6UlwBUdSK1EB6w5DDEoVuQjYLwDrDPYkauEME+xOKRTYbQPw3LgG7FsxE6ddnXJCxCGiNkFxOKaRYnKUWJ+lidNjObV501vh/q0Jz1Aay1uEup3nUewV8pctWNe/cT9G9n4Zw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(508600001)(55016003)(53546011)(316002)(83380400001)(6916009)(186003)(426003)(36860700001)(7696005)(6286002)(2906002)(47076005)(966005)(5660300002)(1076003)(82310400004)(2616005)(4326008)(86362001)(7636003)(26005)(336012)(8676002)(70206006)(36756003)(4001150100001)(8936002)(70586007)(54906003)(356005)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 14:57:23.1150 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ae715ac-2ac1-4466-934d-08d9b27f6277 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1794 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.4 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/30/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/415c636992bd80539713a30b6a0b1189389cb91e Thanks. Xueming Li --- >From 415c636992bd80539713a30b6a0b1189389cb91e Mon Sep 17 00:00:00 2001 From: Conor Walsh Date: Mon, 15 Nov 2021 17:58:54 +0000 Subject: [PATCH] net/bnxt: remove some unused variables Cc: Xueming Li [ upstream commit 2d72ec8dabd02c1fae159f5222e5a2d0d0a07db3 ] Reported by clang 13. Bugzilla ID: 881 Fixes: b87abb2e55cb ("net/bnxt: support marking packet") Fixes: 88badb3aef94 ("net/bnxt: add helper functions for blob/regfile ops") Reported-by: Liang Longfeng Signed-off-by: Conor Walsh Acked-by: Somnath Kotur Acked-by: Ajit Khaparde Reviewed-by: David Marchand --- drivers/net/bnxt/bnxt_rxr.c | 22 ---------------------- drivers/net/bnxt/tf_ulp/ulp_utils.c | 3 --- 2 files changed, 25 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 67181b0fa9..e847af9fff 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -759,9 +759,6 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp, struct rte_mbuf *mbuf) { uint32_t cfa_code = 0; - uint8_t meta_fmt = 0; - uint16_t flags2 = 0; - uint32_t meta = 0; cfa_code = rte_le_to_cpu_16(rxcmp1->cfa_code); if (!cfa_code) @@ -770,25 +767,6 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp, if (cfa_code && !bp->mark_table[cfa_code].valid) return; - flags2 = rte_le_to_cpu_16(rxcmp1->flags2); - meta = rte_le_to_cpu_32(rxcmp1->metadata); - if (meta) { - meta >>= BNXT_RX_META_CFA_CODE_SHIFT; - - /* The flags field holds extra bits of info from [6:4] - * which indicate if the flow is in TCAM or EM or EEM - */ - meta_fmt = (flags2 & BNXT_CFA_META_FMT_MASK) >> - BNXT_CFA_META_FMT_SHFT; - - /* meta_fmt == 4 => 'b100 => 'b10x => EM. - * meta_fmt == 5 => 'b101 => 'b10x => EM + VLAN - * meta_fmt == 6 => 'b110 => 'b11x => EEM - * meta_fmt == 7 => 'b111 => 'b11x => EEM + VLAN. - */ - meta_fmt >>= BNXT_CFA_META_FMT_EM_EEM_SHFT; - } - mbuf->hash.fdir.hi = bp->mark_table[cfa_code].mark_id; mbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID; } diff --git a/drivers/net/bnxt/tf_ulp/ulp_utils.c b/drivers/net/bnxt/tf_ulp/ulp_utils.c index a13a3bbf65..ac9ce97ff2 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_utils.c +++ b/drivers/net/bnxt/tf_ulp/ulp_utils.c @@ -175,7 +175,6 @@ ulp_bs_push_msb(uint8_t *bs, uint16_t pos, uint8_t len, uint8_t *val) { int i; int cnt = (len + 7) / 8; - int tlen = len; /* Handle any remainder bits */ int tmp = len % 8; @@ -186,12 +185,10 @@ ulp_bs_push_msb(uint8_t *bs, uint16_t pos, uint8_t len, uint8_t *val) ulp_bs_put_msb(bs, pos, tmp, val[0]); pos += tmp; - tlen -= tmp; for (i = 1; i < cnt; i++) { ulp_bs_put_msb(bs, pos, 8, val[i]); pos += 8; - tlen -= 8; } return len; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:04.605481955 +0800 +++ 0022-net-bnxt-remove-some-unused-variables.patch 2021-11-28 22:41:03.233542549 +0800 @@ -1 +1 @@ -From 2d72ec8dabd02c1fae159f5222e5a2d0d0a07db3 Mon Sep 17 00:00:00 2001 +From 415c636992bd80539713a30b6a0b1189389cb91e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 2d72ec8dabd02c1fae159f5222e5a2d0d0a07db3 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 8bc8ddc353..157297bc64 100644 +index 67181b0fa9..e847af9fff 100644 @@ -27 +29 @@ -@@ -823,9 +823,6 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp, +@@ -759,9 +759,6 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp, @@ -37 +39 @@ -@@ -834,25 +831,6 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp, +@@ -770,25 +767,6 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp, @@ -61 +63 @@ - mbuf->ol_flags |= RTE_MBUF_F_RX_FDIR | RTE_MBUF_F_RX_FDIR_ID; + mbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID; @@ -64 +66 @@ -index df3afaa6fd..c60d81d14a 100644 +index a13a3bbf65..ac9ce97ff2 100644 @@ -67 +69 @@ -@@ -200,7 +200,6 @@ ulp_bs_push_msb(uint8_t *bs, uint16_t pos, uint8_t len, uint8_t *val) +@@ -175,7 +175,6 @@ ulp_bs_push_msb(uint8_t *bs, uint16_t pos, uint8_t len, uint8_t *val) @@ -75 +77 @@ -@@ -211,12 +210,10 @@ ulp_bs_push_msb(uint8_t *bs, uint16_t pos, uint8_t len, uint8_t *val) +@@ -186,12 +185,10 @@ ulp_bs_push_msb(uint8_t *bs, uint16_t pos, uint8_t len, uint8_t *val)