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 43E23454A2; Wed, 19 Jun 2024 05:07:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 265D842D35; Wed, 19 Jun 2024 05:07:24 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2124.outbound.protection.outlook.com [40.107.95.124]) by mails.dpdk.org (Postfix) with ESMTP id 54024427D9 for ; Wed, 19 Jun 2024 05:07:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ew6faA5WeaJTLF8hs51wT3ZZgkSSuICdBysjjqffn0MUgi/ltnLzqzs+AxqH+6zDiIxuMuDgzdRopL9zPOGGEFZ4I1+tQuu8Temdd93x4Kk/6WL/lKQ0/m9KWY8A9CmWqhHeWaGUTRVcDntThsJC7oJsw3qfU5rP78nhebnM9QChoyACUh85lk7oXp7jn5KUMz7LuWb64LzyOgEyJ8V3rYBQ7sp7rbCvckV8Ch6r8y6VlwDHWvSNdcCwOinPkfvOAGytjsep3dU1aUN/6PJ/VEwuqg0J9O5WfL1as7Dn1FMOl52Y8CgsM7rJzIVixE6otJSq9OmHHZ1bMgxIXEZLPw== 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=0scHa1lis5D+uGyl7mLPWpUzwGanCw7TOQiLIXYrcL4=; b=VyA25Ay+KbV1Ye0kOuUZNJLNsU4lUJxAFXSx1StHWCV1huP85nnlsZB4pkBCShTqHqvGSz9lExSxmO+v54aqFWlHQzf7jHFdVWPdueDoZhtdIiPIsVANx9T2huVFSawMi0I9Iuiv2kOHkxN8EYD81IGtFRXHiKWzLeh6q7QdCjPaLDGPq/1MYTZ6NKINmzUXpP5MccbZ4CZrwRgfy3Wfl/ILKVBNI2hMNoqGxSnyOA1z5WzrGuGCTjqCcLRAdIWkA6IIW5dTYnzUHLXdxz8J+hXGRvMSvV3oP84fcFgSAgnu1iFgbiTvMNDBUkxt0Mp0vdcp30imG0kIy/8k+dBMIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0scHa1lis5D+uGyl7mLPWpUzwGanCw7TOQiLIXYrcL4=; b=YgSSfy9UHu/OYMqLu1yzom8qqCOkenmOAn1rJm1DAmji2XCktNFVNCueGqlloZ+OGpzxpYpDYZ85bipdOlHRnAjWmIQ+nPksaDHehzUy90nxRKea7041XLIvPJyRCk45e4aNLQ5LnJYVHzuO/zpPfZ9oI9+MVFLsftznHaj8UAQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SN4PR13MB5789.namprd13.prod.outlook.com (2603:10b6:806:218::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.19; Wed, 19 Jun 2024 03:07:21 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833%4]) with mapi id 15.20.7677.030; Wed, 19 Jun 2024 03:07:21 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , Peng Zhang , Chaoyong He Subject: [PATCH 5/6] net/nfp: add CPP service enable option Date: Wed, 19 Jun 2024 11:06:54 +0800 Message-Id: <20240619030655.3216268-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240619030655.3216268-1-chaoyong.he@corigine.com> References: <20240619030655.3216268-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SJ0PR03CA0239.namprd03.prod.outlook.com (2603:10b6:a03:39f::34) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SN4PR13MB5789:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c120bf6-fe00-4b08-36cb-08dc900cef40 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230037|52116011|376011|1800799021|366013|38350700011; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vVOrsG5eSwi9mkeZcVhgKVzOhXSlairc6wFKB0K8+qnn2ezQX+I8SnoNhNGw?= =?us-ascii?Q?vu5udkXmA7r4wQDO1sUAkhrYN4K0VZuZskmLTj77FAoNHomGxHYe+odksEpQ?= =?us-ascii?Q?NVtWHl4QVEz6aD4E9sK7S+azm0MG/wWPumOB+S/iLNC03RxNtDoT49yde6tg?= =?us-ascii?Q?+C/RCe+clHUTcgmdYITanVBDGTd9Jf/L1PnYtiR2gA/w4LwognBlKS0XF0Uc?= =?us-ascii?Q?mVSs4NjqbW9NH3CFQLt0T3lJbnIMjHZ5gSbgtDkCYVbs1/5FrOVZ7hjfv8SQ?= =?us-ascii?Q?2kdRtmDkqix/8UR6hI4xN/LwJ0+nYRfFz938wGa0AdZyUxjj1tbItyWryoyg?= =?us-ascii?Q?A5gZ2g6DuqV+vadY3Ir4mRqFvg+ZeGPw5jUtUrnLx5GIBEOSvaW89CfWtMah?= =?us-ascii?Q?o+U2cOWCpSYJtFu1nZdJo7yfIOcrqKDfuwDfgRXKZkcKynEDBhUr8dedFTPQ?= =?us-ascii?Q?uszw6eX9Ao6nkwYjNQ+xFSHmoHJ30Z55RbwRQUXANjO2fRlNhrPcpsUch7DN?= =?us-ascii?Q?euFoQZB4tylu+oq74reOesZNYmM/zqhpMv3d2cRFSEqIQIiNNeBeeEptFjnJ?= =?us-ascii?Q?8elNex3w4K99oqieska1ERCJ7sOEV65dKZpFO3MddqGuYe1PQDhLSWBUqfF3?= =?us-ascii?Q?EARoa3O5uw7TGsRm7WVXelg7J5Grg4gaFXkX0KqrfIXGlpeMcqPqMh1qoY8j?= =?us-ascii?Q?K6z5pggxEclQHVjoqEPv5NIKZWqcCtGvkR1YW4Dz7TSGbV7fp/h61G06qgAd?= =?us-ascii?Q?xDLSkxE92BI69IE5UEDcLu7Si8hPxG2uvZpNYgyOgwXfJ+MwvwYh1UZZnWkG?= =?us-ascii?Q?xIpt1YZEmO2XyHsem4VlIdh6AuR2WDgb2r3Bg/dsEgZMmP/IzBLeu4CUWwNw?= =?us-ascii?Q?PrjkehmHGwOZSPQyo2s58FUnstU9DjbSfpgTZxZycda+G+LZuMTSPInqoxpe?= =?us-ascii?Q?49ukyaMmSsDbATBQE5Gii7+AD58Otvtd7nCcYkha8qo/Cdrlmfzi7iZCVcZF?= =?us-ascii?Q?AJUjeimcX7XuRJ33cFsRTSjcUhFpfGWUIfb1voo69wmRcPoK7Kj2Jvk5YIih?= =?us-ascii?Q?2zmp8+xoeO+XYJMfDdd5GcliaMdXcuR9i5VUQ88gc48kbhlKY7egvTY3MAZA?= =?us-ascii?Q?0LvbdEuAUKfVMeHfyC2yNyBjypF9JG9udGD9x4ynyu+qoKuIJjqhoAv6WWQJ?= =?us-ascii?Q?L+TXbmunNuccWEzR1hSgnWhBM5S2K61BI3xOlXSuRxUdeBvFjIxtXp5G/8Zx?= =?us-ascii?Q?AUaTOVMnV4+5IM5aBztepJ2EuQpaWuCknRBVkKQ2oQGZtfNSuV+YS5nGxJhm?= =?us-ascii?Q?BgrNQjg9CcGmT0p3PSzSW+RDu9yT20qZzMLyQ0rOtDd2d1yfMcposambvCXd?= =?us-ascii?Q?VpflUyo=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230037)(52116011)(376011)(1800799021)(366013)(38350700011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fCW0uQxWk2GsVft0l1T6Oe2dyuAMGwh411kWMnIrcTfOlDi4yjjUt/02VC9L?= =?us-ascii?Q?jsSZIqz0X6oaU7Uo96dRhhq8XOlEHzB5leaqidyY6RdwfHVe/QqZfztyK0OV?= =?us-ascii?Q?1d8c/clNB+M7TDTfcuNdRr+5cTNkcFmEirkXl1PchtVIB36X3K94P4lPDMg7?= =?us-ascii?Q?hbUV1nRn2nww/UJWwyjULYsR2HL60DMmLslxD7rKMtjQR+i/npuHBiK4OhRX?= =?us-ascii?Q?4ZZ7u/XcFVpIETpaLezTYn0/djhX98cbBclkhgdps2ZPL4Sd55Fn3aSqPyAw?= =?us-ascii?Q?ZRCvICJo9L5R5O4sK2211Yq9pRpr6BXWhKmMWIoXSbIE+TVJByl1p8wI9JSz?= =?us-ascii?Q?JltyKAoBohmxpfbERT5pmiSVI8Fo2VeM/9ZsKQp1nWlsz1RXx86/cLZ+yGiV?= =?us-ascii?Q?qs9eKgSTDni8KgSoeFiDj2Geq3FdvkWBdvP3BG8mUXy+bpJTW3Dlk6GApBNE?= =?us-ascii?Q?qighBTAjUGfljcf4vOm2gqHNieS8QHbopKzGk26fbJBmibY6YWctWDadbw4Y?= =?us-ascii?Q?l5QQBEVChkf3Y5/QM5JWdIY8p7Lz3SCiZnNTq+RVT5ddi/nXj7BsnNOj0ImD?= =?us-ascii?Q?grRQbqE6R2+Pym0rDNobDv+VL+EJFQni4uQ5Gr3w7QVU3STMmDOBSEhUELZH?= =?us-ascii?Q?VuJaHpM7uyROkigkRmjLy0ndrVW1KKxrmQJguK2nWmKhlY7c8yd2/7ANCJ82?= =?us-ascii?Q?GBlDmyKbxkk558HO1Zvxqh4aC9ybkLm43CC96FyjXsU7hf/ZHyNA6zu+csaV?= =?us-ascii?Q?N7pXMdo7lp2MGuvrYyoc20YfwiDOJR2mNLn0y1v2iasguMCDIWR6LonT6ns7?= =?us-ascii?Q?eaZU+eG3U9mBp/9Ie3wMgHnfjHrS57WacVKJkMt+0v3fUrw9s6/OZ4Cb9H5T?= =?us-ascii?Q?+BdTGeBi/UGXWui4HIsXJFK99CoEYKrGYfFEr/bb80Aah6VVUd4K/h8L25Cp?= =?us-ascii?Q?dyPwJ4P+czuMs2x7HF3kNXA4o6d+mEKSfQMLkS4fkK5ZW3XFM5rBGeSeB6IJ?= =?us-ascii?Q?IHiYpiHeepI4m2ubgQxLiKhUAy9/4w4Z5WsBrOrwSjk7xMFEDY4kGCgoHzGB?= =?us-ascii?Q?hNWhpzuMPq9ddfEmTk8zkoZOUlLxicHYMlZnG/nf9aVY6mezrFRPUgDIKHA1?= =?us-ascii?Q?aIKJlh0Kt8NlFNR82iuhCiswwJH2kgkmnRjIBD/DCnF54+kWot+xmqEYZglR?= =?us-ascii?Q?dLz+3Ra0Zg8qNk0axtfQ+8wAnlPPXa0b9hdGeCs9o4t5nsSIJgKGfNk8nbM3?= =?us-ascii?Q?h86BZlq+zqLI2FgTSNkGCUrtNxyX30njGHeVOYwZs3iQladV+lo+rfZlxsey?= =?us-ascii?Q?1D4y7bPfVLs0jmGCKiWGqfqI1vd4nhG9QlgQhJB5S0jDSkKv3EDslt8uYBrP?= =?us-ascii?Q?CqEq5kCYRaxLAX/9FbRNIalag22OjT7Ra1MhMGysLO9TQBucgWcEbIhzCm91?= =?us-ascii?Q?uHcIWQseesqTlIreaFXB1jPG0ccwaofYnhma6Fb91vh6616MT+iKI2biTUOg?= =?us-ascii?Q?u8q2ZgPkka+69P2LBfIZ+Wuc3+RqclbY9gjS7/cK8IvdnZfYZE1T0Yn7WoVF?= =?us-ascii?Q?VORxtc8pdm4/nqxbj75SJr2dqQ4KzUJ9jnvuh/ze5qcLMFyquSpwhACHIE9u?= =?us-ascii?Q?Lg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c120bf6-fe00-4b08-36cb-08dc900cef40 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2024 03:07:21.0356 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0yXZfWKAMoGG2R7caMzJX/bvZuD+K+OgYHRYI5cf9gXEKxkgwIuOrX/D4M40y6lsr7HPFpggc8jgm8+2HrgvIz0kOfLGtwAxiQS8dU/88O4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR13MB5789 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Long Wu The CPP service is not necessary for NFP PMD, so add an option as the switch of it. Signed-off-by: Long Wu Reviewed-by: Peng Zhang Reviewed-by: Chaoyong He --- doc/guides/nics/nfp.rst | 9 +++++++++ drivers/net/nfp/nfp_ethdev.c | 21 ++++++++++++++++----- drivers/net/nfp/nfp_net_common.h | 3 +++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst index 22692bedc0..ed9548de0b 100644 --- a/doc/guides/nics/nfp.rst +++ b/doc/guides/nics/nfp.rst @@ -246,6 +246,15 @@ NFP devargs firmware option, only the first one will cause the firmware reload and the second one will be ignored. +- ``cpp_service_enable`` (default **0**) + + The NFP PF PMD supports enable CPP service. For example, user let a PF with + PCI ID 0000:af:00.0 enable CPP service by: + + .. code-block:: console + + -a af:00.0,cpp_service_enable=1 -- -i + Metadata Format --------------- diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 76bbaf1f50..696a301650 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -34,6 +34,7 @@ #define NFP_PF_DRIVER_NAME net_nfp_pf #define NFP_PF_FORCE_RELOAD_FW "force_reload_fw" +#define NFP_CPP_SERVICE_ENABLE "cpp_service_enable" struct nfp_net_init { /** Sequential physical port number, only valid for CoreNIC firmware */ @@ -121,6 +122,11 @@ nfp_devargs_parse(struct nfp_devargs *nfp_devargs_param, if (ret != 0) goto exit; + ret = nfp_devarg_parse_bool_para(kvlist, NFP_CPP_SERVICE_ENABLE, + &nfp_devargs_param->cpp_service_enable); + if (ret != 0) + goto exit; + exit: rte_kvargs_free(kvlist); @@ -641,7 +647,8 @@ nfp_pf_uninit(struct nfp_net_hw_priv *hw_priv) { struct nfp_pf_dev *pf_dev = hw_priv->pf_dev; - nfp_disable_cpp_service(pf_dev); + if (pf_dev->devargs.cpp_service_enable) + nfp_disable_cpp_service(pf_dev); nfp_cpp_area_release_free(pf_dev->mac_stats_area); nfp_cpp_area_release_free(pf_dev->qc_area); free(pf_dev->sym_tbl); @@ -1993,9 +2000,11 @@ nfp_pf_init(struct rte_pci_device *pci_dev) } /* Register the CPP bridge service here for primary use */ - ret = nfp_enable_cpp_service(pf_dev); - if (ret != 0) - PMD_INIT_LOG(INFO, "Enable cpp service failed."); + if (pf_dev->devargs.cpp_service_enable) { + ret = nfp_enable_cpp_service(pf_dev); + if (ret != 0) + PMD_INIT_LOG(INFO, "Enable cpp service failed."); + } return 0; @@ -2302,4 +2311,6 @@ static struct rte_pci_driver rte_nfp_net_pf_pmd = { RTE_PMD_REGISTER_PCI(NFP_PF_DRIVER_NAME, rte_nfp_net_pf_pmd); RTE_PMD_REGISTER_PCI_TABLE(NFP_PF_DRIVER_NAME, pci_id_nfp_pf_net_map); RTE_PMD_REGISTER_KMOD_DEP(NFP_PF_DRIVER_NAME, "* igb_uio | uio_pci_generic | vfio"); -RTE_PMD_REGISTER_PARAM_STRING(NFP_PF_DRIVER_NAME, NFP_PF_FORCE_RELOAD_FW "=<0|1>"); +RTE_PMD_REGISTER_PARAM_STRING(NFP_PF_DRIVER_NAME, + NFP_PF_FORCE_RELOAD_FW "=<0|1>" + NFP_CPP_SERVICE_ENABLE "=<0|1>"); diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 8d9851f969..2feeb6f5bd 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -94,6 +94,9 @@ struct nfp_process_share { struct nfp_devargs { /** Force reload firmware */ bool force_reload_fw; + + /** Enable CPP bridge service */ + bool cpp_service_enable; }; struct nfp_pf_dev { -- 2.39.1