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 3D64BA0C3F for ; Sat, 12 Jun 2021 01:12:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3162E4003F; Sat, 12 Jun 2021 01:12:11 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2050.outbound.protection.outlook.com [40.107.93.50]) by mails.dpdk.org (Postfix) with ESMTP id C97184003F for ; Sat, 12 Jun 2021 01:12:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WK4ySse05nulO7iil9vAzV2HYYcVrbuNjV3f8DuYp0qTQiO+SfV8dsYDWqwCF9WmyzSgY6LZPRDn51QUUuUjdsIHdLkCzfXSHNSp2iCuI+3tXp1LDun1rbX5s3aCqrSE/Enug6QuT9pzZCl7j2MAQEKl3jOFs79vB827XAgIRcNbKvR8ueJUyB3bgWvysxWuDsW+RXpea5rX1g62jLsqSnmQ+HoGunJsSYd/pSdAvKr1kb3bqmyNOqXMVhh1ZIyDCXvvym7Ajh/WpscUIRZcG0df7OUm/UPUQ+Piq5BAZHh9sdPU/sO5Ymc25sD+ZXU0iccDEVDujK8QA/Dt9E9LsQ== 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=h0ck/SSfCRkHc3Dpdb1o0sJcUzGr1NNzpGMWiBZmxc4=; b=IxEm8TAb/TMD4mVxPtVWQ92iHb9aXBt3ci8IUM/Mm5OcUSewnIviP4K8SzqCC62mc7/jMfGm/cHZD9JlohiV+yBM73hoU8MhzKCv0WA1mMSqfQVyHuZ4y8iElLGY/a+Ki+GNtDxI4hDV64ZrfMvc+gkyyOAZd/mp7iGfY3xb64D5ABkJzBGpIJpS9dLPhNtxszNz5dlmZArXGDTogf6kZ06DgDMhLy7mi92iQghSs+9FqFucJZ+yB4DXCC7jqzI1LdxNKMWvbSpJakRP1ClWlwuKTsJOcfSIO1m0W8EapKcWhFoaN67mm60HuP1QqSu61vDoWnuGiKTo3Rfg0z11lw== 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=h0ck/SSfCRkHc3Dpdb1o0sJcUzGr1NNzpGMWiBZmxc4=; b=XoVDVEZ+JQHimmjdVxO923obMUyNzfyqofg8OLV2S9S66UJ7vIU0mfcWwbSNKb+9Lc1xy6CNgJF11rjuHrknIirGFhFkC0HehewQcoV6GWhtC78QooJh2BKGRwDe0YyUtvfqLc1ZpNOI/JlbnKuUTyWQCjmcbojK5tHGAqJnjrXLYtbVXkF/McYUeSvDpV4Ed4twZdoF7dqk79jtRHV0QE/2rQMtZtYq2mKlkflffc3f77ujledfmE4y/X8RE4m1VH3fQVEe5FaMXwk7E8mUX1BjpqdX47ZLTXW1M1rQyRwDoS1yxPniHFFNrqUzL3xn3CuQIn5TTaaN5Y7ncMuUhw== Received: from CO1PR15CA0077.namprd15.prod.outlook.com (2603:10b6:101:20::21) by DM8PR12MB5463.namprd12.prod.outlook.com (2603:10b6:8:27::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Fri, 11 Jun 2021 23:12:08 +0000 Received: from CO1NAM11FT049.eop-nam11.prod.protection.outlook.com (2603:10b6:101:20:cafe::21) by CO1PR15CA0077.outlook.office365.com (2603:10b6:101:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:12:08 +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 CO1NAM11FT049.mail.protection.outlook.com (10.13.175.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:12:08 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:12:06 +0000 From: Xueming Li To: Kalesh AP CC: Luca Boccassi , Somnath Kotur , Ajit Khaparde , dpdk stable Date: Sat, 12 Jun 2021 07:02:50 +0800 Message-ID: <20210611230433.8208-76-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f723dec8-a6ef-457e-bfb6-08d92d2e5610 X-MS-TrafficTypeDiagnostic: DM8PR12MB5463: 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: HKKVKd1/hS4PlxJnV9TDT+LrInLar+wJiv7Ja0EnUSuMUcFShdF3ZLuol5iJSNUDMP/ur0dM4H9tMsW5MEX3fZrCMyJg4eaxOJq95TJ1i9IsBDALkRVwZpXw358HNN8OsX2U3Vz5DFidOBKjhWkiu5wr4273wDXCUcrlhAMZ1f0oWaPVsnT2mNdF5lHO8jcAgTnAAe1uruaYTwhItA2/QonssNgF26F+MsYFD+JpJiPyh0G9HYIM6Y0lBguf4KwTz6u3y/fdr/3tO3oyGAS2vEP2xIckSNGUZ2VAHwdY2lKgpkv+fejp5V/A2naZ7jl7qhv2Dn/bIN570WajyHb1boMptOXoL5LKiKIgP8TsOeRNDGNNNS68ktgkcHo0DztVZm6mUHF61/FeEgW+fIoWm7ilqf/QxSyCbsejQwoewNn4bOY+Up13kQNk+QOnEhZ+5AKDY4tXZeBB7XHoEghHwXJqQGT7A1YBBLHhmr2s82D7xDoD5dh55cCdAr8rZ2EFfsM7FkSRdabppQGTeJjl8Kz46T6c5/tW/lLPnvgK3XZzQPbG5GM2XELsLOitUNFMWHgoADKFeueXCiSZ49xV4gYgSF+QY+MDz1raybv2Wmhs6s5f6WS1zAcmWl1w8N39MCSqFYcpP2pUht9WXD+/qs5t/zn9TWK8/ukRKZ+qfhBzYQnoA6PmjiLZsUhZWbbJ6efG2wVBpLmZF0yd/A8SdUdWwq56MBPcbvsh0KUgJeoZoZ60eMqNKzSPfe219+/ft9s+diAIk6X5G8KFYg6BewNsxAWMkyey4a4TGrGA3rWJLodyyidR5QrZIDa6LpbW 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)(376002)(136003)(396003)(39860400002)(46966006)(36840700001)(186003)(54906003)(16526019)(7696005)(2616005)(478600001)(8676002)(966005)(5660300002)(7636003)(6916009)(356005)(83380400001)(36756003)(86362001)(4326008)(82740400003)(1076003)(70586007)(55016002)(6286002)(2906002)(316002)(82310400003)(47076005)(26005)(426003)(336012)(53546011)(36906005)(6666004)(36860700001)(70206006)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:12:08.4190 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f723dec8-a6ef-457e-bfb6-08d92d2e5610 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: CO1NAM11FT049.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR12MB5463 Subject: [dpdk-stable] patch 'net/bnxt: fix single PF per port check' 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 06/14/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/1cfcaccb0bd4729daf626be7959346dc2f9d5bc7 Thanks. Xueming Li --- >From 1cfcaccb0bd4729daf626be7959346dc2f9d5bc7 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 29 Apr 2021 11:23:00 +0530 Subject: [PATCH] net/bnxt: fix single PF per port check Cc: Luca Boccassi [ upstream commit 7712a39cc4e8cc677da47c53e90e1b4d0fce7826 ] The check BNXT_SINGLE_PF(bp) returns false for a VF. So there is no extra check needed for VF along with BNXT_SINGLE_PF(bp). Also make error messages more explicit. Fixes: ff947c6ce15f ("net/bnxt: add check for multi host PF per port") Fixes: f86febfb46da ("net/bnxt: support VF") Fixes: 3e12fdb78e82 ("net/bnxt: support VLAN pvid") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 5d15116d8a..e042466995 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -2166,8 +2166,9 @@ static int bnxt_flow_ctrl_set_op(struct rte_eth_dev *dev, if (rc) return rc; - if (!BNXT_SINGLE_PF(bp) || BNXT_VF(bp)) { - PMD_DRV_LOG(ERR, "Flow Control Settings cannot be modified\n"); + if (!BNXT_SINGLE_PF(bp)) { + PMD_DRV_LOG(ERR, + "Flow Control Settings cannot be modified on VF or on shared PF\n"); return -ENOTSUP; } @@ -2963,9 +2964,8 @@ bnxt_vlan_pvid_set_op(struct rte_eth_dev *dev, uint16_t pvid, int on) if (rc) return rc; - if (!BNXT_SINGLE_PF(bp) || BNXT_VF(bp)) { - PMD_DRV_LOG(ERR, - "PVID cannot be modified for this function\n"); + if (!BNXT_SINGLE_PF(bp)) { + PMD_DRV_LOG(ERR, "PVID cannot be modified on VF or on shared PF\n"); return -ENOTSUP; } bp->vlan = on ? pvid : 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.567491200 +0800 +++ 0076-net-bnxt-fix-single-PF-per-port-check.patch 2021-06-12 06:53:56.360000000 +0800 @@ -1 +1 @@ -From 7712a39cc4e8cc677da47c53e90e1b4d0fce7826 Mon Sep 17 00:00:00 2001 +From 1cfcaccb0bd4729daf626be7959346dc2f9d5bc7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 7712a39cc4e8cc677da47c53e90e1b4d0fce7826 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 748b766969..9c3e0f9f36 100644 +index 5d15116d8a..e042466995 100644 @@ -27 +29 @@ -@@ -2197,8 +2197,9 @@ static int bnxt_flow_ctrl_set_op(struct rte_eth_dev *dev, +@@ -2166,8 +2166,9 @@ static int bnxt_flow_ctrl_set_op(struct rte_eth_dev *dev, @@ -39 +41 @@ -@@ -2994,9 +2995,8 @@ bnxt_vlan_pvid_set_op(struct rte_eth_dev *dev, uint16_t pvid, int on) +@@ -2963,9 +2964,8 @@ bnxt_vlan_pvid_set_op(struct rte_eth_dev *dev, uint16_t pvid, int on)