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 4DFA2A0A0E for ; Mon, 10 May 2021 18:08:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 489464003E; Mon, 10 May 2021 18:08:25 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2052.outbound.protection.outlook.com [40.107.220.52]) by mails.dpdk.org (Postfix) with ESMTP id 6C54C4003E for ; Mon, 10 May 2021 18:08:24 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BovD+nlEURLPV2omoJAKPyzr2jnPQsios/wHNL+ULjHj7BITYEnl4dACca6cOAYAKpdjYVEjzPIRKc4qk36+m85ODaFoP0XVzxZazB+OjtruEV3LFTuVxe0T2w0qSaQLX0ih8otyDJvDX4KAzkTPk6cubr9f81qvJ4VBee11r6dQMIhjekKpXdAxFVpbfUAt+wc4Cqd0+ccfrbulSqYra1oja3yXv3HtOAGcDGYeikLF84HWJvsB2Aoa73rflc0iVRODeQRjfJhXN71A1yWttSYJhQ+FGGusaXqnVbSotBkdEnKgzn6R+EgA80g41hC7oFmvjRrzQnEUcwHKcyZAQw== 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-SenderADCheck; bh=fU6W7CDGGn1S9HPGIfSDK2nC2yRpULDnE/LqVJutYWk=; b=Y5Aqf8zSQQNKnzSo5lDcYcoBHnokADrI9zGGkdAZyb/M/hLYzFHdDWuxbK4eoPhxeznnEihLWunFFiK0dxHGN03dCyhzcZQYtHMzox3rxWGFzDdNQh7pvzVU2Q40I/GKwy3E58DNsRaSaVnkmjrf9kXR5A2vg/b7U+iDlIvc/hP/cwgDXidjt4eE6hIGrKPSC5rSOsbfzDIuVrdGI1KeYnFkIKvRxLWGllTIGB1gdQNBAsRxJjc8DxsWOadOrLvcdPDplqXfpTO6PMe+cvhb3v2hfLiXwID1z9xG64Ba8QwUTeyG/GxoSaZzbr3A7SKi+tk0o2wC6sXxiylKr//Vpw== 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=none sp=none 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=fU6W7CDGGn1S9HPGIfSDK2nC2yRpULDnE/LqVJutYWk=; b=f/reqqIsA91sEJaGWcC39ztXxBf30HNwElx9Z0255WSgqdpmt3wh/L6qRTEpg8spGN4irrSpF8c+aGxIQ/Q/6eakZa/RYM4mBkhRuT1DhhDhGvviBGUT4ezh03JeqblAUSJErKCa7y/q/tp1Z/FnVfCfpGe0HyclbG5j+0RjmjCfGiIShhgGI9INUf2AMUDirVdUjhSD2kpGcRyQLwq0vLP7/7MwcjkZjSlvQMDPaM8PZzSvwwXFUhPDZg56hjJvbtgoAsQ09GNghAjZUbunxBEeqpquVnV6Rx4HU4axLm5hHGcMKxqDs2TLsoeuvloYsDPz+NuRAv4AB9+uACspCg== Received: from BN0PR03CA0002.namprd03.prod.outlook.com (2603:10b6:408:e6::7) by CH2PR12MB5546.namprd12.prod.outlook.com (2603:10b6:610:63::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.31; Mon, 10 May 2021 16:08:23 +0000 Received: from BN8NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e6:cafe::d0) by BN0PR03CA0002.outlook.office365.com (2603:10b6:408:e6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:08:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; broadcom.com; dkim=none (message not signed) header.d=none;broadcom.com; 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 BN8NAM11FT024.mail.protection.outlook.com (10.13.177.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:08:22 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:08:19 +0000 From: Xueming Li To: Kalesh AP CC: Luca Boccassi , Ajit Khaparde , dpdk stable Date: Tue, 11 May 2021 00:00:00 +0800 Message-ID: <20210510160258.30982-51-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e669f56-748d-4ae7-8a87-08d913cdd607 X-MS-TrafficTypeDiagnostic: CH2PR12MB5546: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1+IqTxXCT8wg/aNdfQAXFs9zeFj8xNGrVLJqlKGTNeGTKu9QqxKqJUqBtGwhhPoFcO/ruVddS86/gx+tO3bgnfjWdYkyj20Do0zc2YLhY5dt83IyWAQmK8m6a7rXqTBXsOqcp5BC9AHY3v8LvBfVfH1XeYEbbHc8AIwonpIPjBT7Uxrq+ODrpjt5knnJC+psAa944lCZq4RVbhia4NsTW/Qa911Fogu2cWNCmowTBifBafOaunH734uq3g5GlGoraATZIMP1fl4L5BXi+Qwn51m0kDejK1L1ULgc2Iiw5DIedh5/ZmR66uguAclf6l6/9bipakqGEhVTPOVTiLv/DtT7q5NGEdlVY/QqV54/XeXRNUuXquzhr41nkZk/G1PaN11ztjzGIQFNskBaPRQFsgCo919iQRtU6+TfSsyStXmKtFxcQwC2FmKhFs92i7HP8i34gVw+XCIIKLP8/D2FeBEByGdWk+RwDNNEC+wpqgE1PUB4T/cCdud10WdiejakUFjnREfnAMO1Pq/0aydKj8PiYnjBk+yZib0XiXnC8kLys/05eaziYb2LhUM6UpiW6syhzYUk4K8e7m3qOFqD2PwFKZTg/YehXwjviWEbpA3XNIhi7y9El+AKt8mKHQFJpjSM0LT4oNSt9fpNOUuMr8AfoSRsbT8K2CQwjD+921XIkcopSz23aOrUZwDSPXgqg1QBFC9Y3WxYO0SylLRcvdJ6YRFwkXMBp6RBLyXVyWM= 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)(346002)(136003)(39860400002)(376002)(396003)(46966006)(36840700001)(6916009)(426003)(6666004)(82740400003)(356005)(7636003)(36860700001)(316002)(2616005)(5660300002)(54906003)(2906002)(16526019)(966005)(336012)(47076005)(26005)(55016002)(83380400001)(82310400003)(6286002)(478600001)(8936002)(8676002)(70586007)(186003)(4326008)(1076003)(53546011)(70206006)(36906005)(7696005)(86362001)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:08:22.7668 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e669f56-748d-4ae7-8a87-08d913cdd607 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: BN8NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB5546 Subject: [dpdk-stable] patch 'net/bnxt: fix VNIC configuration' has been queued to stable release 20.11.2 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 20.11.2 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/12/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/74451465f7baf3f25f8018dca59c07dea30b1f87 Thanks. Xueming Li --- >From 74451465f7baf3f25f8018dca59c07dea30b1f87 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 24 Feb 2021 21:25:44 +0530 Subject: [PATCH] net/bnxt: fix VNIC configuration Cc: Luca Boccassi [ upstream commit fc886d04bcf49ce2c623cfbbf3d4991aef5fb8ce ] PMD should not set any flags to receive RoCE traffic while configuring the vnic. Since the PMD does not support RoCE some of the flags and code is unused. Clean it up. Fixes: b7778e8a1c00 ("net/bnxt: refactor to properly allocate resources for PF/VF") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 10 ---------- drivers/net/bnxt/bnxt_vnic.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 344895843b..3dce024744 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1999,12 +1999,6 @@ config_mru: if (vnic->bd_stall) req.flags |= rte_cpu_to_le_32(HWRM_VNIC_CFG_INPUT_FLAGS_BD_STALL_MODE); - if (vnic->roce_dual) - req.flags |= rte_cpu_to_le_32( - HWRM_VNIC_QCFG_OUTPUT_FLAGS_ROCE_DUAL_VNIC_MODE); - if (vnic->roce_only) - req.flags |= rte_cpu_to_le_32( - HWRM_VNIC_QCFG_OUTPUT_FLAGS_ROCE_ONLY_VNIC_MODE); if (vnic->rss_dflt_cr) req.flags |= rte_cpu_to_le_32( HWRM_VNIC_QCFG_OUTPUT_FLAGS_RSS_DFLT_CR_MODE); @@ -2052,10 +2046,6 @@ int bnxt_hwrm_vnic_qcfg(struct bnxt *bp, struct bnxt_vnic_info *vnic, HWRM_VNIC_QCFG_OUTPUT_FLAGS_VLAN_STRIP_MODE; vnic->bd_stall = rte_le_to_cpu_32(resp->flags) & HWRM_VNIC_QCFG_OUTPUT_FLAGS_BD_STALL_MODE; - vnic->roce_dual = rte_le_to_cpu_32(resp->flags) & - HWRM_VNIC_QCFG_OUTPUT_FLAGS_ROCE_DUAL_VNIC_MODE; - vnic->roce_only = rte_le_to_cpu_32(resp->flags) & - HWRM_VNIC_QCFG_OUTPUT_FLAGS_ROCE_ONLY_VNIC_MODE; vnic->rss_dflt_cr = rte_le_to_cpu_32(resp->flags) & HWRM_VNIC_QCFG_OUTPUT_FLAGS_RSS_DFLT_CR_MODE; diff --git a/drivers/net/bnxt/bnxt_vnic.h b/drivers/net/bnxt/bnxt_vnic.h index 2a6f05d9e4..f173a02f97 100644 --- a/drivers/net/bnxt/bnxt_vnic.h +++ b/drivers/net/bnxt/bnxt_vnic.h @@ -52,8 +52,6 @@ struct bnxt_vnic_info { bool vlan_strip; bool func_default; bool bd_stall; - bool roce_dual; - bool roce_only; bool rss_dflt_cr; STAILQ_HEAD(, bnxt_filter_info) filter; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.987246300 +0800 +++ 0052-net-bnxt-fix-VNIC-configuration.patch 2021-05-10 23:59:26.390000000 +0800 @@ -1 +1 @@ -From fc886d04bcf49ce2c623cfbbf3d4991aef5fb8ce Mon Sep 17 00:00:00 2001 +From 74451465f7baf3f25f8018dca59c07dea30b1f87 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit fc886d04bcf49ce2c623cfbbf3d4991aef5fb8ce ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index cb8baa8776..5366fe72ca 100644 +index 344895843b..3dce024744 100644 @@ -24 +26 @@ -@@ -2013,12 +2013,6 @@ config_mru: +@@ -1999,12 +1999,6 @@ config_mru: @@ -37 +39 @@ -@@ -2066,10 +2060,6 @@ int bnxt_hwrm_vnic_qcfg(struct bnxt *bp, struct bnxt_vnic_info *vnic, +@@ -2052,10 +2046,6 @@ int bnxt_hwrm_vnic_qcfg(struct bnxt *bp, struct bnxt_vnic_info *vnic, @@ -49 +51 @@ -index 917b909284..00a664c8b8 100644 +index 2a6f05d9e4..f173a02f97 100644