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 F134545B90; Mon, 21 Oct 2024 08:33:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 947B74060C; Mon, 21 Oct 2024 08:33:32 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2122.outbound.protection.outlook.com [40.107.95.122]) by mails.dpdk.org (Postfix) with ESMTP id 1E56A402EA for ; Mon, 21 Oct 2024 08:33:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cG9LnxPYK1UD/btFfwrTSLogkS45aWXBzhaycju/noGRm5oUn04L2MckzlP0HACGObvxEudpGJKmsuMmKyLLmKBBLW75H6k8tCKk1JPeUSffbD01J8PlF2bDqPft8VeFKmzb+YXCQ4BD+phNxmIckul1tuwaE2YM1kFhrRebbwjC7g1v0gbIf3u4ITk8hloQRCBHI6UO5ym9eRw6XcLR+Hre8qR6QxRbrKXnxiOFHaniYJRg3q79GS7aRdz74YdnhRC76tsO6SgflI5ADBAheNGFPjuUiSJOjtDTtdkb8V7kc897A0BTlLEc1Ki0jxKIMPRhzN0EiH14lnrtFpZPyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=sq1bQbUGBcKfsQ1cmFl/Au3TtZgacqZ0wusZ9IRQJJk=; b=TyXL1aASrOESEstpLUs8ltXV+2bQa2QQBuX5uXYH7jyJMF7r5Di1Ap+ZgmTBESm+WrfM7uMXZeNL4iDErQoSeSiIo/1uUfh5gDCxqiPe7d+T/aw5QGJQhHmRmZ8I95yiIFJ2O2/oUnk14AdD/jsGbJMGG0KuhoHwtWe2BOW7LXg1aNGJrIj8q2AaaBnuWxwpj+DOgb2Qxlvuqx09prPErzi0qFSotFFt+95LkuxD0v3KZzbRD75MU7lvwzf6O1v+krtEyrB/cL4re+0sHuakQN7eHCuNB8FUqZ04k/0TTbZBcP1bepfq0m7h1mcEauQenxoPwozVHwyXyuc563xRBA== 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=sq1bQbUGBcKfsQ1cmFl/Au3TtZgacqZ0wusZ9IRQJJk=; b=nfEAr/DgoaMbM2ZYMCmvhFMJUlr5Bmqx8ckSAL1Lq6Mumzvkdfgk7d5XzPBYHAz3H51Aa59tZLF3x5GwoDF6BgucWmghCVPi+B5pIq43RSYo6X3TDgqNfYtqOGrk6W+Xfy2azaSbyqMK8PtHHdhiw2ZoMTNpPhWRu70zSapDj2k= 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 CH3PR13MB7023.namprd13.prod.outlook.com (2603:10b6:610:20a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Mon, 21 Oct 2024 06:33:26 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833%5]) with mapi id 15.20.8069.024; Mon, 21 Oct 2024 06:33:26 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Peng Zhang , Chaoyong He , Long Wu Subject: [PATCH 3/9] net/nfp: extract the function to allocate PF Date: Mon, 21 Oct 2024 14:32:55 +0800 Message-Id: <20241021063301.4146214-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20241021063301.4146214-1-chaoyong.he@corigine.com> References: <20241021063301.4146214-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR03CA0118.apcprd03.prod.outlook.com (2603:1096:4:91::22) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CH3PR13MB7023:EE_ X-MS-Office365-Filtering-Correlation-Id: 4068356c-ab75-4e5e-ee9a-08dcf19a44d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?w/a0pA7+qPFmd9L8Dov8m9up3O9C9OXGR9Tb9t7I5ctW5nUih42iFl+t2He7?= =?us-ascii?Q?oycR/OgOXA2gdSBYN3gNNewtScDQez7VTviHJp6wbxL73JXjYQ1QQi2SYAeu?= =?us-ascii?Q?2r5+QKkzEuwU7kd9OdxaIqWEp64AyRD6gHwzCRI5XF1S+VOUsSertIhs0wPq?= =?us-ascii?Q?jKI5p7DgGHwWsQQezkE4U6XSdnIUusxRA2vLinyW4NBOvhZNj5rgjJfVHWVt?= =?us-ascii?Q?ycACWE6hZU60SfQmeGZIhVuekOjSW6GWy2WjiMszOtmjUuo/1JwfgZXB30oI?= =?us-ascii?Q?wOlyWRNYduZuGYFzhNuhXchIM/zhbNjczOM+QEWEm92t7sy+DcIYQtvttZ3j?= =?us-ascii?Q?ZK2LegidQXAwLPWAZTZ6wEMqWtYrn61Zp+wXn3dHgq/fDn+uUAVfHcYvnHZv?= =?us-ascii?Q?B42M84v0jaXF6hbKKhUsrIerQ/YOuIF9VCqQhiS7tW9sXHlL2D5WgLrROJu4?= =?us-ascii?Q?yWInz929RN2bsq2Dg5bjMlvDPH/v7pTVYkT10pZN7MauD3hAt2qgTSLOgj9z?= =?us-ascii?Q?K6xFkBk2deUAxWDGf0ZastG70Hm0vOFDDn1c8Z45kPHsaIvGfJ51jOPrJ7MU?= =?us-ascii?Q?8cQYUwJ8oP1B6Ak7ZzSjqhQcIaiqSue6oGZx/5dBHhyMBtIdyHl8xoN0zbnY?= =?us-ascii?Q?Q9T277uQ20RNc+DYEVKygSX/qQhzhhjZvPzc1u4PQA4wQNhKz/pA0I4YxRxk?= =?us-ascii?Q?HIeI2vdmYLytnkw5Ukl0Yh95rFYx7lRF5BsNluGzZOkbkuZ/7cekqkcFszy+?= =?us-ascii?Q?HhAKblSNY/njNUYioEI/YY9TFDq9AjlUiUjeBtsbVySOcWf2nTTBebjx2LK6?= =?us-ascii?Q?yvIeqPz9KLeCTO3vKnlKiTJr2kXrsMFMzkReivMVwew9IOxYoIuJZ6fgs2bX?= =?us-ascii?Q?QQvhKvhr9Iz/eseD9RRiqFCWRJVIz+nFGqPBq8UYuQxjGW9XeXRnn12CC7Kv?= =?us-ascii?Q?xbIxCqzca1ZWDEHv9an90Fay6ZppmEGQiXA7QKbthsWZwILNCJjWGcVEP6/P?= =?us-ascii?Q?putlvGEMeYM5Oi6gMdQdAl4icUJYc8FL6ybSvgcFLKOpwnvNeA5/vmIZEvj8?= =?us-ascii?Q?GsAqKm9ewOVVp98cjEg8ASOMs0P9BJ3aYhpLI0gpQfwcdLILqPuHWekyiRa8?= =?us-ascii?Q?WZDE8RtFMRBe+WYgmV/NebYRrG9IbZ1B8sCu3VmXU8mZ38NoBA/LVw9n1pje?= =?us-ascii?Q?Bhdo93LktcUnYjGw3CxzyFyKZl5mSt2OGGvdlZYhu/ZgEsTLJjKLu7T6sS8S?= =?us-ascii?Q?yxRQ74CPY+89m+FB8FZDiITXJ/HeD4xgnMInZaF5Efkpam36AMu31HbZhhKC?= =?us-ascii?Q?pymvwQbw9lFBCXA/mM6G5wmISrvf0xCWojn+a9UcYlLVpjhjD5iqf9kbU3q5?= =?us-ascii?Q?uB0/LaA=3D?= 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:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ghAXLMVej5ExNSekcH5aJR/l2QMse+jvQjdKcZ6eaD+WEpJ+0pltUgdkke2Z?= =?us-ascii?Q?AaAEpAx2aSPnkc8j5gGgdj0jUkUQxP5w0OZfuS6aVy8gaorg/2GEhvDRkbnc?= =?us-ascii?Q?5fsUFtnxZKhPqMS8EEIsnTscOqcLbu2SCh11dF85Wt4rwavDoIm8lXHwowcA?= =?us-ascii?Q?Pvux7XJRntNOKYO1mWfrTO3UN6An7n37eZSCnZ4Hukah5umiCt0e7LOuthHs?= =?us-ascii?Q?xfOFI++mvMt7eYrVh5+6yzUlsdMA4CMGU3UMImePTkbLf9sfZm5IRY18ENOG?= =?us-ascii?Q?CJoXISlSIckbWu+d9Ad2IAmHuM36twezGh/HT7WCYRCuJKh3FbXR1EWd8mva?= =?us-ascii?Q?OQtI/kx3jEWAAoPyAPWJYI9iXnfbMaSRsDgLfPo5k74rponQiCRCO5SzL0O5?= =?us-ascii?Q?iVAf4O4VyfO8Fz6vQNA1njrt8lAiThp5W4K93VLrR7uU/x68hPG9dTlIyYkw?= =?us-ascii?Q?1uSuSLZMwuykzcv/up6Yyrrp7Hfe6o3CWN98X5oQKB9s5QHKhoOe1a8MRl1H?= =?us-ascii?Q?+2wLlBqp3v90rRMbUYmMdnUT3rF+S+aYZL7anq37YUI/NEcS+D8xyRFTsYm1?= =?us-ascii?Q?Ph3UYBmind9hRGaVER5q21acYHwDExZCgPh4FtR8jkObzB3c+7iaptNGqpQs?= =?us-ascii?Q?+8jV5OMYjrizVg++Iqh3HnMEy8aIM4TZt9zD9gMHEvw98YluLqoWycjYi1Uv?= =?us-ascii?Q?uJ8hSf6EJKTHrYnx/xijrrVzZMhT4CLEJlPr3jgONXEb1+2RCrnm2zR7i1Gl?= =?us-ascii?Q?YGZ9L4/bbe6NrirmVUWdmYJpCGGsDdgcYfnQ6p+tuhl2JMH/ctmKTiYIOBgg?= =?us-ascii?Q?o9Pnjlzsi3VK5tfNWcUOT+nxSITlwDROCfAvjKixzBAanbT28FchEfM5BCdO?= =?us-ascii?Q?QrcTiV8ZgjHXZ45ZUYrUU+uSxlUYiNZ0lD5hK9oT/JAZdjh8onsdZJyVo/78?= =?us-ascii?Q?wZihwm5wYgxyYm4rAwjVZ2itUkCOTeVa2aJfTy1Nfg28e+kj5ZjSTTW3M7fi?= =?us-ascii?Q?VD3WMaHSBhVnUnhzZQCA5KqbmKQmsk73rBd/ak4sR3r0sTRKaPrYe1SWkqfk?= =?us-ascii?Q?mAQg3YJLJ3qrYY5UG8Af/pvO5kXM69nUm6jkoQV/Yw2eAqU2fWIhiF0eUxW1?= =?us-ascii?Q?r+IkuPY2qyZWWaDVF7WycXtY59bwK9r1NOvHMSG+AYUxpVXq4haQz/5gDD5K?= =?us-ascii?Q?dX5THvDr2+dpoa36KNOIlyy6uvsy5BCNoko57tVYznGifs8WZI58HqJkTmND?= =?us-ascii?Q?FmOvaHwtHlfCwOgHu7ggF7XnrVT0Dn5OPmqKbYIQEZ9GTZCQwdAC05DNd7QI?= =?us-ascii?Q?om6tq2ib3K+aCzqSetHGEm2tcNiixESbcRLr8AlO8/u4VAAy4LUAgK+CzpbR?= =?us-ascii?Q?7uvO/RAnSNBrL5zgDYfYvCvQFTVcHNgUDA6yWk99FBKNA260ASoD6En7wnjK?= =?us-ascii?Q?iVZOCMgTB0S3HRU2QWqTQ6s51gl3mLkTmKEYehZa2IsP95Lldgg7BikGFwPo?= =?us-ascii?Q?0Py2ZaQbO6Lg9rS7kuMTreKlbgb5JSlbzTcq5SA6kfUV6j/l0kPfqLH4dNG9?= =?us-ascii?Q?Yiu0kESC2DHbd5y7Jh04nTmyBlX64AaAAKq2pz0oPXKmC/Ogyp0fka1p4ZLs?= =?us-ascii?Q?gg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4068356c-ab75-4e5e-ee9a-08dcf19a44d8 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2024 06:33:26.4732 (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: X7auk0aZdbe4CBTuCJHJZZl+YnZyL20wg685+gfYfJFssrSQcJQsRB4ugEBURnYsheMEXFvoJP/EfKxxhmTgWbMCW/rSWYoTK+jAOdBnoYg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR13MB7023 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 Extract the helper function to allocate the PF representor port. Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Long Wu --- .../net/nfp/flower/nfp_flower_representor.c | 58 ++++++++++++------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index f76e780840..2045076b4b 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -873,6 +873,41 @@ nfp_flower_phy_repr_alloc(struct nfp_net_hw_priv *hw_priv, return 0; } +static int +nfp_flower_pf_repr_alloc(struct nfp_net_hw_priv *hw_priv, + struct nfp_flower_representor *flower_repr, + const char *pci_name) +{ + int ret; + struct nfp_pf_dev *pf_dev; + + pf_dev = hw_priv->pf_dev; + + /* Create a rte_eth_dev for PF vNIC representor */ + flower_repr->repr_type = NFP_REPR_TYPE_PF; + + /* PF vNIC reprs get a random MAC address */ + rte_eth_random_addr(flower_repr->mac_addr.addr_bytes); + + if (pf_dev->multi_pf.enabled) + snprintf(flower_repr->name, sizeof(flower_repr->name), + "%s_repr_pf%d", pci_name, pf_dev->multi_pf.function_id); + else + snprintf(flower_repr->name, sizeof(flower_repr->name), + "%s_repr_pf", pci_name); + + /* Create a eth_dev for this representor */ + ret = rte_eth_dev_create(&pf_dev->pci_dev->device, flower_repr->name, + sizeof(struct nfp_flower_representor), + NULL, NULL, nfp_flower_pf_repr_init, flower_repr); + if (ret != 0) { + PMD_INIT_LOG(ERR, "Failed to init the pf repr."); + return -EINVAL; + } + + return 0; +} + static int nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower, struct nfp_net_hw_priv *hw_priv) @@ -898,31 +933,14 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower, return ret; } - /* Create a rte_eth_dev for PF vNIC representor */ - flower_repr.repr_type = NFP_REPR_TYPE_PF; - flower_repr.idx = 0; - - /* PF vNIC reprs get a random MAC address */ - rte_eth_random_addr(flower_repr.mac_addr.addr_bytes); - pci_dev = pf_dev->pci_dev; pci_name = strchr(pci_dev->name, ':') + 1; - if (pf_dev->multi_pf.enabled) - snprintf(flower_repr.name, sizeof(flower_repr.name), - "%s_repr_pf%d", pci_name, pf_dev->multi_pf.function_id); - else - snprintf(flower_repr.name, sizeof(flower_repr.name), - "%s_repr_pf", pci_name); - - /* Create a eth_dev for this representor */ - ret = rte_eth_dev_create(&pci_dev->device, flower_repr.name, - sizeof(struct nfp_flower_representor), - NULL, NULL, nfp_flower_pf_repr_init, &flower_repr); + ret = nfp_flower_pf_repr_alloc(hw_priv, &flower_repr, pci_name); if (ret != 0) { - PMD_INIT_LOG(ERR, "Failed to init the pf repr."); - return -EINVAL; + PMD_INIT_LOG(ERR, "Could not alloc pf repr."); + return ret; } /* Create a rte_eth_dev for every phyport representor */ -- 2.39.1