From patchwork Thu Nov 2 02:23:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133753 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E657F43267; Thu, 2 Nov 2023 03:24:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08D9C42E75; Thu, 2 Nov 2023 03:23:58 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2132.outbound.protection.outlook.com [40.107.96.132]) by mails.dpdk.org (Postfix) with ESMTP id 3E80942E72 for ; Thu, 2 Nov 2023 03:23:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j3DPRi0k2R2Em23k8bKqp0WVp89bWjp7zLrvoKCgo4ygzdgV9+VWJW7HjF0JmySkFxa4irC/Aj9YlXjdLDX8qVtDeB2iQIxdwO0LTnr+mPhvelqxVlZaUoKAIC6rxNOLsw2dp+g/zKu7nw+jH9jU+yNwrdIgBvn+okSU8chX61DdBPTIN1x1dJwXF+bPtTJp3l7GueSeb0iLc38lXciHSAQXZr6fQZlHyibAggmdfwYumnDNJZirMIXt+Yp22FdMx9Zv6brRm9mGaNxbNhdo9IqKMiNFi7AkIZ0Xv3tbrpvmVCvuJoFsbXOitX3b45I4D7otjAVDnFTrYUWF3bFYFw== 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=jM8v7ZpP+kufta9mVZqaarhCHMyOdoZow0vIkfyJ+PE=; b=RtvS/e92bb2j7JBSVMd7uryI738VTMVAZLQhPcguAidE3H/A/DPXye+jPhISwB9f91FJBT+yRIdIDu6DEIfUYP3rYZjJRCXXAV/nVOkawQThsitSx0QCC9UaiD/mnDDRWAUMYubysPZMMwEXwjOpWGkiRRElFD+oxcCKrkzIjkUznXiYd+wnq0OB8kYxO1jWrQ141Be/PeKYJt12NFwzPxQ7UPruafIcAbR94M/wJBh9v6TGu0wfaKS/gq5M6jG+s/e1x7r5QUAdcI7xkVRAksaOVSlzex6Dt0oSLwctIWeFHf/ld3a8jjc8qDXI6VH7guP4wAcJfl4UctHo/iJPpQ== 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=jM8v7ZpP+kufta9mVZqaarhCHMyOdoZow0vIkfyJ+PE=; b=ecJtVNvPpJ63DJ2yWRgkRBh/3JI3FukvfZhXKYevbeefMUDslFBHDcCDIguo8lKY/F6ht+w2zN6pDUv56kyByes/IhQ+He98zuSbeIPVSVj1WSUToIdnHjK+Gjz0kubvN8myUat2GYgbAWj9lHCdDkiDrgBTQJTf4zRIeL4Mf9c= 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 BY5PR13MB4455.namprd13.prod.outlook.com (2603:10b6:a03:1d4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Thu, 2 Nov 2023 02:23:55 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.027; Thu, 2 Nov 2023 02:23:54 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Peng Zhang , Chaoyong He , Long Wu Subject: [PATCH 06/11] net/nfp: adjust physical port check for multiple PFs Date: Thu, 2 Nov 2023 10:23:16 +0800 Message-Id: <20231102022321.2254224-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231102022321.2254224-1-chaoyong.he@corigine.com> References: <20231102022321.2254224-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BY5PR20CA0030.namprd20.prod.outlook.com (2603:10b6:a03:1f4::43) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BY5PR13MB4455:EE_ X-MS-Office365-Filtering-Correlation-Id: 984ef38b-1e15-4ee0-e533-08dbdb4ac2df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 83gOb9dWmhtQBGk6mq5wp3qmQBmd5no0sCYs2LKnlINTLrw6vHQL80fLTT9H6srsEM8+Z8pNVaCegpBobE99yStcz7fClrnXTsbNk5+cbSTUBtiMjR9XTlUaoFf3H6YlwXb0Loc55/CbINS1kb+6m9mr0eNAyjJsOLkEAXcVTFeg3V9DjoWGMtuR20lLSg8ahI/Ev08Du9MEjJ15lclpmh3yiuVWajtDno1fE/e9lY+s9+RANFbj+vFy0cIkgtCVmViiGZMPPnIydhRwJpHeH7c7kjc14agdU+jPaSfuDWBZe+i+fCI+zpeV4kL252vTNh3N/c1Y/j0sp7VKZYmmsPDAxI9M9pPley3QVG1mZ+4Of/ciApxqDqHOADWAQ/ZEiBASDinU3V8WYwHpEnivyAJqggN1xn6DLB6jORVshEk2Gxa3glHHGto+NtGPEoAD5VQ+ATT/bV7b4cTQEm9hNCZ9bV/xpbkmQGTbe6vKJXbW+WW5T4tUSgt2F1s4UkFbJPTcW4qDMoLTlSRnTx9Wx1F5mrLsbeEe/KmhX/4a00OtPQb7MJYFt1uvJwDF3KdtTQg2lskVIp6OS4V/tmuA6OjxoN7d5D2C1W2lRrLXJ1adPbTebn4MlnpV952KqD8SFPVXUPM1DrKkf+nNRgII7L8lq/GMPhlNSx501oX5iDc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(396003)(136003)(39830400003)(376002)(366004)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(2906002)(8936002)(4326008)(8676002)(44832011)(6666004)(41300700001)(6486002)(478600001)(66556008)(316002)(66476007)(6916009)(54906003)(5660300002)(66946007)(6506007)(52116002)(107886003)(1076003)(26005)(2616005)(83380400001)(38350700005)(6512007)(36756003)(86362001)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2/aaO83csmPAVwJp7WXtXaI6zQtqFKK3Ltl7PaA7X2FWhyeSOz5GBjwX6P1KYYc+opmlNB+r5A3mAVAcb/mWbfOOQwfgmP+8m7ghSGUcb7Hc+uzj8rPwDZV18MKYn5femT3XeLrS6tWV9KQhM6Gp6485Z2PfGLMlZsdIThopkAP6MpRMuQS1OlWV7rz5hZiQrwS3Ds/5Oiabt9hCN153eRs2lcp4uwnr/Fd9NWkL8WmdBbagM6Ld5DSf4hQk3pfO6uw2nJki/eQDxK/NErSYR0MXRUeIWv9gMBSDJtH1PX9luHfd5uwb6+m9yu6lacVoyEj9XN9A3bLOP/1ZP7OtUXU537YZq6fm4GHR58PSz62lcGbL60fAHLRN8p+coBOcseoavg9I9KveCMfRvMK+thPwdjs9lPnX/O3qoCsu/CBh9+pspGwNUHaiXLen35YEgNiQPrwu096JIPVGfR/MB/tUXHjythEW3CZDavRMpfc00M59uZp5wgnRM/c1tkYKI60agC+/oGZT4gX1VjCILKM6hoywAgpH3vZiWC/IJhYSUs1+Mshsq7JatyAOGNa0AAmbsgq98wiTTbDF6hvwA7ssYwV8G4ZO3dVoEfZBqE3Ep5D8B8GGst1C1D6LGGxHbmrxwg/m5ClkW2xanqLrVpTY3V7sQDPHcjfG3JJbrbL+7yCxHaZxhVCFs0lTUHrse/vzeKp5fBobAkL8OO6YcL/g0irNynHvN4A1coQp7747jO5uXl9r/DMMNUsNhTwCAhHye5HgQjcaGDVB4ZMII14C+O2k+ktQ9UKQTA4rG7EgLzRYIjtGeH8HTOiBIS2i9aoOX5dhQkVVXqPRdx0+EioJ2wgakCpm31G0y7czO6IkwXpWGhF02Ha1KVL2E6vshVkGLdL6Yc4WbhznB57Mf4dYbI0ehwlGqHGeAj2su/YzF5faUGf60PJIfW3DPszo0PDZTHZf2lAA2eUVLnpekp/jVvsSja5sLFhc68BtZYAtp4qHchZVm1KpM3vur/3Hqgc0iBetJbK3bj7p3MohFxvn4Nstlvm0zBV0OyyV092EakGxKxqNN69zzyRujEd9boZSPKj6vT8FA/XrL14yYUeFViVx7BtoYGwMt5mkMrlMctt7iqgTTm4ygJGcT33gaI/9JA/y5fEJZY7xK+QBm+9R46Drvv5eJbC4IcauNS+pIKHXLRlljbswk9zPEnDFPuIzxTOEg9Xd2xK05grZAHczuYoAKg/RVvY73Y69aGr/cpHJbk/9NLik71E1Ht3k9B0Vc/0bd5jFIzwAcWL747nPYnQDOoKrhXEtEE2cMKvn2Oo/S/VY+jRsp7dz1zMxo/hAeQ40MfPMTuTJ+GH+tTjTfE77TOVezlHEH9oePpeWOImSaT2yjp2Na/EH6KiHebSgf1SY7tIKNeA8362ypSABm7fpyava0HtKxDQ2Wrh1cz7MtZvw538fApMGItg4i81RaOU5w8nfyf1/haEH1PnroZ9UaRgcjdujlKzHGN/9kLaPuTsDSouskJZx8+DCV2J6AkkLUasHWZXZliogrNEmAF7cdKVj9oAx8VZO4JGM3KYLwImL2oVtWXRa7NUGVpvjx5r31QwPRVx7rW5k5g== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 984ef38b-1e15-4ee0-e533-08dbdb4ac2df X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 02:23:54.9552 (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: UK2yWIR6Fd+LhgsyqEbX2fZpW/EBz/2DxDwZ2pvYPPEvqXYwQJTI8zlbK2rUq56JuH0HwpS53hkoPiRkU4zZ9NntbHm2rS7neRoAXoPc9vs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR13MB4455 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: Peng Zhang If the firmware supports multiple PFs each PF is represented by a single physical port. While if the firmware only supports a single PF there might be one or more physical ports represented by a single PF. Adjust the check to handle both single and multiple PFs firmware. Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Long Wu --- drivers/net/nfp/nfp_ethdev.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 7022ef435f..3ebfd444b3 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -712,6 +712,15 @@ nfp_fw_setup(struct rte_pci_device *dev, return err; } +static inline bool +nfp_check_multi_pf_from_fw(uint32_t total_vnics) +{ + if (total_vnics == 1) + return true; + + return false; +} + static inline bool nfp_check_multi_pf_from_nsp(struct rte_pci_device *pci_dev, struct nfp_cpp *cpp) @@ -765,14 +774,22 @@ nfp_init_app_fw_nic(struct nfp_pf_dev *pf_dev, goto app_cleanup; } - /* - * For coreNIC the number of vNICs exposed should be the same as the - * number of physical ports. - */ - if (total_vnics != nfp_eth_table->count) { - PMD_INIT_LOG(ERR, "Total physical ports do not match number of vNICs"); - ret = -ENODEV; - goto app_cleanup; + if (pf_dev->multi_pf.enabled) { + if (!nfp_check_multi_pf_from_fw(total_vnics)) { + PMD_INIT_LOG(ERR, "NSP report multipf, but FW report not multipf"); + ret = -ENODEV; + goto app_cleanup; + } + } else { + /* + * For coreNIC the number of vNICs exposed should be the same as the + * number of physical ports. + */ + if (total_vnics != nfp_eth_table->count) { + PMD_INIT_LOG(ERR, "Total physical ports do not match number of vNICs"); + ret = -ENODEV; + goto app_cleanup; + } } /* Populate coreNIC app properties */