From patchwork Fri Jul 1 02:20:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 113585 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 A55F7A0093; Fri, 1 Jul 2022 04:21:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5E398427F2; Fri, 1 Jul 2022 04:21:14 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 44AAB42836 for ; Fri, 1 Jul 2022 04:21:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CSu/MxC+hdvYBi/9RjU6iW1vBPcYIRNkvQ3qSF+Zejfbpk2blsZ6IvBYtFanj4JkY9p/yNbqlnKOTUmOwjplnDCSth56kxAabRwBfXi+jur/dIWvg+V4hTexBXvAPMpYFXAmfQbZSQ7YLSRAV9cK6JCmbh/z/nXg+PHEJLwR++1PPTenzZZIVsMhbyLVKa3ySxOr+YlznZqApYwE7KpJ016kYbdiN7Lpj4fmksQXGR5Ck06T4KQF4MYOwmtmFAlRj2mT+C+NpycLr8r9neW3R+gXyWTEsmqXjL0DwOvnTchri2J41MvK5wADF7U3oVuuqPhzt8K6hc9ZFIKkZANwGQ== 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=xm+osS83/vIi4Loqb7jrKJm55KK86k6ftxN5ZQDoP7M=; b=M4Wry2HbDHNT8XOrzArJVc6c1iGKMzH6JT08X7jH2Arpr1q9oSHLiJLw9tZc5XZKAnuqB3jlack4eUtdov59IrN6JdlqmSZOuA8bnIvlQ2e6iuFnYV+L87P1s0rDJehIyndWfjcZXBbGmrKf5/V8aQbgBn5/nj6RqXg79gwLIjMTEugPWyBRQiBbiMT58+BICqiCmrCpH9yycfAplWD2A6fwCd+eIbHZru/bap3to+oGI0OgTLph1AmAmntp3vxBIFAMRA3X5kkyAyY5Cllk6D6CuTX6nMbrzlJXpSvjqgYKFcoViP5eidue6YekcShDoCRfFbgbqlXktr7jb4vGGw== 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=xm+osS83/vIi4Loqb7jrKJm55KK86k6ftxN5ZQDoP7M=; b=O4oyh67LNF9HnDL7arhU6BODVZFBEAUIFSQTio8pNPvabybvVUXkLesCsGt3Q57NJeHCwJZ544pCucaLGEd2FNiL+xpDImS2smYu/WduAxxx1+7rYpN8gwG++5jBM+YHHRZIHT7Xwn6ocd4+wZSdBZYOJE5f/NPsRcSNZgevg30= 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 CH2PR13MB4459.namprd13.prod.outlook.com (2603:10b6:610:35::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.11; Fri, 1 Jul 2022 02:21:11 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5d9e:9ce5:51d1:2021]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5d9e:9ce5:51d1:2021%9]) with mapi id 15.20.5395.014; Fri, 1 Jul 2022 02:21:10 +0000 From: Chaoyong He To: dev@dpdk.org Cc: niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v4 03/12] net/nfp: move app specific init logic to own function Date: Fri, 1 Jul 2022 10:20:08 +0800 Message-Id: <1656642017-8992-4-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1656642017-8992-1-git-send-email-chaoyong.he@corigine.com> References: <1656642017-8992-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR02CA0079.apcprd02.prod.outlook.com (2603:1096:4:90::19) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 292f7f25-0efe-4a89-1932-08da5b085d16 X-MS-TrafficTypeDiagnostic: CH2PR13MB4459:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tn2rnIpAJhj4GSU7kYRhP1Re0qauYzyArn/7aPffa2R9VR3dUZ9zcPDGbWKpMsubnvEtv7WJ3fpZb8pzkujWE8ErXtzvGu9vpEms3/jVTBYp2v9Z/8ryZLxFuN8PVGv4F3x4XwzYnJmM1bGvxfH8Ar9DxFfyME4IeLp98POBFKeDOWdzb5QPcehbpp9jWfLJc1fwRF903SjYBUWSBDG/J7pkU3QSnSARwItu9HPdu7r+ehGiHK5gjohI5Mymc5GtZNqrSBIReLDAaugzJM5onmssLAhKrFm4yKhkqtw68a+wRrX0iYfi7Qz1J3kTl4fKOsSAZmfztT2nWyA/thkHO9P1wB40+qVH5eV/ZLpCUS3Q9BMYZk05eXYNB5m/kDyYg3A+7hlOnBltRNhgkhg4qSrE2cOycQx7yv0eiFSyuE8txcza3Bi9diRflXTIk3qVw3jegk6KkTnFwtZfQrcp9LfwBrfUey+jqCIZ3wRIk/4BB5bCuB3oyhrM72FTbtAGglNnPcdBgSjJr0bH7AUkHNhAgmht1O/vgNRDSpzeOYDhdytsE75LQ2zDvHwQdqezobEgAAltXkYIkt6TfwDil5nvvS4C0hwl6+7dnvBN9eCh32XzNcBkYSm8jUByZIdvhx3u0LKv3lTSRhMgXLOs6ksfyzxn3W0MedHdjR9Ske8WiHTYmyqr4kza5NQ7DY9TQ76bSD1M1Q85aXjbhHaUF+J85OG30hfp5Re52LVo7UHaw/xCIDRlsiu7yVTBTABW4karXw6fUYyOFKv7gAfdftf7OEq3eChbcSfkHo55JsulQsaT1RiWvm4orANJvH0uLlzYJlRGhjoTAueAqVcHK2UeHCHVGyi/dlTfUiykdcWprr9B8kZtEx2fMW9YDBog 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:(13230016)(4636009)(39840400004)(346002)(376002)(366004)(396003)(136003)(6486002)(4326008)(186003)(36756003)(26005)(66476007)(66556008)(2616005)(8676002)(83380400001)(6512007)(107886003)(38350700002)(5660300002)(66946007)(8936002)(38100700002)(2906002)(478600001)(44832011)(6916009)(6506007)(316002)(52116002)(41300700001)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?3yXHOsij1g/DCzLcz0PlvZyNvexr?= =?utf-8?q?gdN1jSROCRqEVOlt7OTIFSXOLqbA4jhzmS7pk5a7xIz1pFUYM1gZ7gsuMT8qsPbgj?= =?utf-8?q?ZeMyf7FqUhu6SMmImGr/D7nYr2aN2zXXj/LPsOkgdEOlonPSV283dcGTtpQ3oOJKu?= =?utf-8?q?BEFrKO4szKOVbxQo+ktdW796y4o7ic7D0oCWEIrVoBQsC6FCh6VHuIwtQoDWvFuck?= =?utf-8?q?Jeb22iSL+wT63zW9Dczwfle5RsY5fthqC04Q+IxIZKNWmo6Uk9BPaY7nZA5D17D6h?= =?utf-8?q?QM/klkuOQTe6ZdbkRGlO7lBy3MqAZcIjTisM+HAX4qrb+U+CpBdCzLBkq5J76NYol?= =?utf-8?q?enBBS+UkXXudeXgF20//TvUVoONf8/lFfxSg5Mxa3CPJm9OL1KxwHHzGvePdtjuvq?= =?utf-8?q?jKZUFuCIumbllzCErdCGcKROUpcgwIECVRMeKZ2cM84mm9IbbwjUGqVTBwIOW4cZu?= =?utf-8?q?dXa2akS5kVaO6qwTuiSQ7MzVdTl/7HmJeSiatu1hlIHp0Nwypp5aiDuAjnBiJ+ILY?= =?utf-8?q?1EOoNx4rTE9VnzkrV8JECj68h4Hy9WPy29R6oSeRnOFvpFFmgv+1LWDhyZgzZKfPj?= =?utf-8?q?coN/CHaixMn9FxPne2sXB7EUJ/art1RC8ROzolUlFpcM23g+sHM8rdqbj0wSulj/Y?= =?utf-8?q?+VLHoXObK9kWtmC7EPI3xwSOWWS4svWAx5mWZBilORJsu4eRjzcmfGK7gsMNT2mby?= =?utf-8?q?YvvbSHcg93LbZa/cKNtBllylX8iXs065aqp/T4cJIM1xJJLmCAIuwOGWadcMLzy/B?= =?utf-8?q?oAqjZMbqhFUdXr294kgkJLima5aoF7YowUdJxqu6nY2MezH33nbQzjSZm7KhgmrXI?= =?utf-8?q?5kGUpl3vEFVh8W1IqOzJXte+m7E1R2TWbkCTQeyOEyijbJQivVFLkLhFHhus2oqz6?= =?utf-8?q?SDzmSoaduWDnObK+eWd318cf23HMsCqsWvKNsrm8OFTHYAAjjEXHekr4kt9Txtd4+?= =?utf-8?q?k8rZqJEt3kRQm0Qf5MaW8qmHE29tGQCa+NuxgJPh9CnV29CsZs8KmjngA2606AK1F?= =?utf-8?q?KmCwrFiDK+DJl9DC2e+o/ka6bBVjfZL0GY26nsNZTh1bHJBgsLYSJ1lSjgLJVgtX6?= =?utf-8?q?vSdNvANmpuKMafsXPIn3HB3DnMkzgEUf2Uwi+dUVdFWhlFHZj1qJXdSc1WgSw0bew?= =?utf-8?q?1cc6aVGrMMxOvJVr+4pjQuP1NPwdoEZ953JO2c26P6AcMUCuy7iYjxgyfy8cj87hc?= =?utf-8?q?ByR+mrafHuyfi2hZCC0+VGnKCJSpyh1FOOs6Mdcu/VgEdkF8xWioQWJMbOna3p+rT?= =?utf-8?q?l1KcGH2DaGfa8+O1hnc6dmHEmmzFCNI4wrK7nQYEmgNYkDxC8mJMI5glMIken9n/g?= =?utf-8?q?MwjI8F2u98Dt4BHMvp9MOSsPR8zjkeNGqtIH9P0xit89ShHMzFIhVDvv+k/lIBG/O?= =?utf-8?q?gW9LXUMZaSSJOBdr7STrK95a+Ym2e7fplwXJa17MLIyigc73G/VQYhxXhDUCicDu3?= =?utf-8?q?J57T5tUB3TqTXsvl1NVjTAqIHNqErLkBco+lOmANvhTM9dn2ybNL/X8+k2ILKhHMp?= =?utf-8?q?EmR7BNV60yiqnfG6Yu7NTRLGBMz7wGV58w=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 292f7f25-0efe-4a89-1932-08da5b085d16 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 02:21:10.8455 (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: YMzRrQqrP35dKeqfNQTgFPgWKxpGRyqkgf/p91mCpaK4+6mfNMNyMnkL6IIeOVa9rWQxwl5Zd827Vorn8cPCSt/uwtHB0EMQ/d7BKPZHvhM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR13MB4459 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 The NFP card can load different firmware applications. This commit move the init logic of corenic app of the secondary process into its own function. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_ethdev.c | 93 +++++++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 31 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 2c5607c..90dd01e 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -936,7 +936,7 @@ break; default: PMD_INIT_LOG(ERR, "nfp_net: no device ID matching"); - err = -ENODEV; + ret = -ENODEV; goto pf_cleanup; } @@ -991,6 +991,50 @@ return ret; } +static int +nfp_secondary_init_app_nic(struct rte_pci_device *pci_dev, + struct nfp_rtsym_table *sym_tbl, + struct nfp_cpp *cpp) +{ + int i; + int err = 0; + int ret = 0; + int total_vnics; + struct nfp_net_hw *hw; + + /* Read the number of vNIC's created for the PF */ + total_vnics = nfp_rtsym_read_le(sym_tbl, "nfd_cfg_pf0_num_ports", &err); + if (err || total_vnics <= 0 || total_vnics > 8) { + PMD_INIT_LOG(ERR, "nfd_cfg_pf0_num_ports symbol with wrong value"); + return -ENODEV; + } + + for (i = 0; i < total_vnics; i++) { + struct rte_eth_dev *eth_dev; + char port_name[RTE_ETH_NAME_MAX_LEN]; + snprintf(port_name, sizeof(port_name), "%s_port%d", + pci_dev->device.name, i); + + PMD_DRV_LOG(DEBUG, "Secondary attaching to port %s", port_name); + eth_dev = rte_eth_dev_attach_secondary(port_name); + if (eth_dev == NULL) { + RTE_LOG(ERR, EAL, + "secondary process attach failed, ethdev doesn't exist"); + ret = -ENODEV; + break; + } + + eth_dev->process_private = cpp; + hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + if (nfp_net_ethdev_ops_mount(hw, eth_dev)) + return -EINVAL; + + rte_eth_dev_probing_finish(eth_dev); + } + + return ret; +} + /* * When attaching to the NFP4000/6000 PF on a secondary process there * is no need to initialise the PF again. Only minimal work is required @@ -999,12 +1043,10 @@ static int nfp_pf_secondary_init(struct rte_pci_device *pci_dev) { - int i; int err = 0; int ret = 0; - int total_ports; + enum nfp_app_id app_id; struct nfp_cpp *cpp; - struct nfp_net_hw *hw; struct nfp_rtsym_table *sym_tbl; if (pci_dev == NULL) @@ -1038,37 +1080,26 @@ return -EIO; } - total_ports = nfp_rtsym_read_le(sym_tbl, "nfd_cfg_pf0_num_ports", &err); - if (err || total_ports <= 0 || total_ports > 8) { - PMD_INIT_LOG(ERR, "nfd_cfg_pf0_num_ports symbol with wrong value"); - ret = -ENODEV; + /* Read the app ID of the firmware loaded */ + app_id = nfp_rtsym_read_le(sym_tbl, "_pf0_net_app_id", &err); + if (err) { + PMD_INIT_LOG(ERR, "Couldn't read app_id from fw"); goto sym_tbl_cleanup; } - for (i = 0; i < total_ports; i++) { - struct rte_eth_dev *eth_dev; - char port_name[RTE_ETH_NAME_MAX_LEN]; - - snprintf(port_name, sizeof(port_name), "%s_port%d", - pci_dev->device.name, i); - - PMD_DRV_LOG(DEBUG, "Secondary attaching to port %s", port_name); - eth_dev = rte_eth_dev_attach_secondary(port_name); - if (eth_dev == NULL) { - RTE_LOG(ERR, EAL, - "secondary process attach failed, ethdev doesn't exist"); - ret = -ENODEV; - break; + switch (app_id) { + case NFP_APP_CORE_NIC: + PMD_INIT_LOG(INFO, "Initializing coreNIC"); + ret = nfp_secondary_init_app_nic(pci_dev, sym_tbl, cpp); + if (ret) { + PMD_INIT_LOG(ERR, "Could not initialize coreNIC!"); + goto sym_tbl_cleanup; } - - hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); - - if (nfp_net_ethdev_ops_mount(hw, eth_dev)) - return -EINVAL; - - eth_dev->process_private = cpp; - - rte_eth_dev_probing_finish(eth_dev); + break; + default: + PMD_INIT_LOG(ERR, "Unsupported Firmware loaded"); + ret = -EINVAL; + goto sym_tbl_cleanup; } if (ret)