Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/139521/?format=api
{ "id": 139521, "url": "http://patches.dpdk.org/api/patches/139521/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240419031226.1191069-7-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20240419031226.1191069-7-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240419031226.1191069-7-chaoyong.he@corigine.com", "date": "2024-04-19T03:12:24", "name": "[6/8] net/nfp: unify CPP acquire method", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7087b549661168aac7da4621616e5f692a4bfe5c", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20240419031226.1191069-7-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 31786, "url": "http://patches.dpdk.org/api/series/31786/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31786", "date": "2024-04-19T03:12:18", "name": "refactor logic to support secondary process", "version": 1, "mbox": "http://patches.dpdk.org/series/31786/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/139521/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/139521/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 737D743EA9;\n\tFri, 19 Apr 2024 05:13:42 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7AFBD409FA;\n\tFri, 19 Apr 2024 05:13:05 +0200 (CEST)", "from NAM12-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam12on2108.outbound.protection.outlook.com [40.107.237.108])\n by mails.dpdk.org (Postfix) with ESMTP id EBB9E406B7\n for <dev@dpdk.org>; Fri, 19 Apr 2024 05:13:03 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by BY1PR13MB6310.namprd13.prod.outlook.com (2603:10b6:a03:52e::10)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.38; Fri, 19 Apr\n 2024 03:13:02 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7472.042; Fri, 19 Apr 2024\n 03:13:02 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=EkVsnfqhMBexg1Gl32RTOTWO28N+fkA5VltEPcYrT6KAe8ZZaa07NzuuW47E9O2Dull66lEFgirURXz6ttZva9aIdtlXSn3xpmSdyQ8jT1D5BtztbqzHboeqMKTrCzM+pPjAwOVN9IMLyukFepuE9IVg8ctuZLfSr3dth24f51yjN9SE4Zdvy5An2vOp47ZirRadZtOKfE2ZDsoPZWQlhu4c5rrKNsZ2RiBrSdc5pBeukGHMrmPRZMpkCmv5YwMKIihWndSe/XFbu3SqQiW57wLHqPjTcZSfczkABzLiVfc2/5AoqBli4USqjDkymMoOtxW8QwcUaH8Ylho57PLHSg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=9NVoX1e63mjnSOAbUSblBCC/Qvc6mNbIxAgojDYAa2M=;\n b=nIagI9gZfK9bu+VBQWNHtein2m8AahaORrxNFBmR7XuYbexiEci9i/PTEaf5Vu04ToLkTvj78l8cTKIUmFHV6Iz0yiTy3sXAWlGJIq/KNB+dNV/XcjSLzMNUwG1XuXxQi/7R3FC8xZ3abrM7pX6NepXo7DczZxz4tYm+G5Em5D+QbdCmPkpu8WX54oJsvJ69LBrEkNzQ3Geh4j6BXjU8e2BcFcAR3GSf73S/sjKh+TiBRnaGZqcQ6qjhdrBloc9Zik4YAf/RxiVVmBRqBJQ07QN2KBYSUYp6IlW5pZEds3ZiOZdhK+aRBRJ57dGak32Rwodi3QPQV8DFQ+17650jvw==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=9NVoX1e63mjnSOAbUSblBCC/Qvc6mNbIxAgojDYAa2M=;\n b=OSerQCdrWX/u1uXUqi7J7tZf68RsSncX2hYN/LriGIwtnjOt+VH8v1Kz1GeDD7n+bk+TedDHPdoZhkdu0GR9VqhrOp6ngW/o5NLjm+Ru1aS2Bk/AsrTIzJlH579b4+xzJ4DQfdK1MpmoaKuIp9FZGCKuSGAUvQnIfiRMuqt16u4=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>,\n Long Wu <long.wu@corigine.com>, Peng Zhang <peng.zhang@corigine.com>", "Subject": "[PATCH 6/8] net/nfp: unify CPP acquire method", "Date": "Fri, 19 Apr 2024 11:12:24 +0800", "Message-Id": "<20240419031226.1191069-7-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20240419031226.1191069-1-chaoyong.he@corigine.com>", "References": "<20240419031226.1191069-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "SI2PR01CA0044.apcprd01.prod.exchangelabs.com\n (2603:1096:4:193::8) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|BY1PR13MB6310:EE_", "X-MS-Office365-Filtering-Correlation-Id": "d8fa3dae-d2d9-488a-9b57-08dc601e9f78", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n Wb3bP69zmIn7vx4q8ZrBjTuR45iFgFUzwaESgdTQAHL3wvQ97uK0ohlb5/cCpHYLpc+xKC/G+7TWRs6eVH06Lq9MTOGtPfDUZTJ+p9BlbD2RKboJWrsc8PEpySL5cpp9SFuBs9gG/TEZMaXUzp1y0Tlaqf5JcrdPEJi1clcxxgSmfE30qcsxmmpOQCxZQUa2o4R97J6T1stg1oSvPaZ91yZm5vLSI7rWP6zI8DjmJRwnU8ocRyQXaZ7RNXcGZ0C3WjmMghc0kTl1deCVRtyNHuf9U7yiXFNeBkJ938Cja6AR23VfTxz1H8m75C6MiJIvXft9kysPAe4l7sshCnngbRC5OPmJD0APKOae9sKn/sWJylvL+Se4XROUbtlLi/1S0ahXLiP26F8e7mmMCXdZdBfjfKkWfTM1Faadvsa6cnQRcckh75HPSotEKbkWml0hGuNgI7eYdlZdZpYu3RyLFfVBMG0peiQmqaZ41WRV1Zp0VfaJehhHa/9yNOjh6hfI+SHPSwruaJSvAYcTcpdKNvyveLZORB9zvvdHJGUwTzIhXqzQ69h4CeZW+48lfrNuGWwf9p7aIZZpaYRrpI3IMT22swS7HXv7wi1Ypd2NzKB81m0o2C/HNIfs5RiGIjwiKqCvXEpw49gxr0sDt0RoROMyUp4um3c/OcvSTOld8I5m4+JcXfa6fI0KI+9BWC2K+d6ifO16KgxzSGeMjBWPj/XciHTDYsa9su/nrVdEyj7d0HCUQDqugeIeDTC6dokqDp3H9jl669Na1svQzN0wzmfRve4iJDxK5BJW2VW/EnmuxPx+7SQl+stHhTzs4996glqu3scpTyhZ0zsnofhldP0Tu0qLmOIfW/bpsZg80uTmSA6io8Y2bRbHCTM2D5FC3CXvOyZOm+rIVan8I5G6pIa04Zihzgy0QIZDD4ban1qzzftciCCs7zOl14xk61GPIV/rbXOld2NeGASrJ/P/72k93VGipKXpTZfu3Hu/vC8EvwOZ2XMCPSaxDx+8ia37bpN2aY8NqWj0+pg+WCUEJl0rRasHrY5fkr0pe+nXKaZcdGw9wpguqM1NptVhy8m07e2C/uaWZIYBc8RaiIWyWHGnpynskkQK5Nz+BFYSYeRtOjKl6kfHVHSwe173w1EHwtfUw+pqLq3NXi+PYqV1Vu6r+YJlL8vbDhTfAdDoDqM2HPB/Vfa8ROCuiSmQjeMZFFT5YWj4YpLvB+blWmTsgNQRxK6CMCPc5NYsRtc2Ezt0EzzCug/Ap6zNJMAkzoSS5nvx5h0n/hLO7Q1i/MKYNduSvLSEcSCBzj92HWJUK286ETIDfx2bq5nS2HsM0Ew2l6FtllfgQefn573ufi+BVg==", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(366007)(52116005)(376005)(1800799015)(38350700005); DIR:OUT;\n SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n LeIXzIzGxRZjHxCRDTl4Uwao+pcJmdKl+IyOYfZAjFtPiWCr6Ux0nyrkHyMSea+LXiEptDajjvH/mbQ3h232IEcwhnvfqEGB+0VaxATOBubgdI6ut9GaFP7dAQVpSJ/G8TyPzR+AujC2pU1NewgeZXwa54bwCdv3O138AVOSoQLgyqwdY2oQL2dR6HFQzR3qqSXrPqVX+wu0LZLSxKKocnGYGcDspllAd29yLM3BbBHsJXPnVGwJ/qkAXWKSxpDa1hYXc52MZCS8pqZTVsxLQ+1Xyxmov7MEqd+PBggMiSmELpr1xGH00FGo78tf3SBqJwKei/vPNV96gkDGsUthpikumqGdrpC/yjUb63WpDdUnAvI/P7pfXveBuSPRWhoJDTwAgOuPITf1F4ulk9j8eBEONEFGENs63ZNau61jcXY8R7XXGl5jTMznYo/WWnLSYzRUeh4NQH3yZK6gSmFGMBGkR1wzKZDROKCMyXz6N3vtFWIDY+fW802XkmGG6FPh+flCLMX9Qow091RZKEp5mu3So8cmzlDs7FEYthbwULGwHORhuSfY7nk9eO2hHgA5XXucdkp/n75JyB2vASCMgGodt16Sjf7gsczlB+JqkazNkOEGsyz9c08of96p3efOCIBNItfwuHyWbGzEtJrry1ShiRbSytL0WVP6JOOQgGMeXVVK3sDaQKjLQOfZ1hDTsEoQCKeDDn7V++LJaC5HySU9dLG6Wzmm4i53BJ4kkbBhScMvgKq3BBuGEyyGqswSBnDkN5jbhIwc60RIbIlitgMS33pHcVdpVT0Y5jTpuCw19SGy/VBf+gOdY3ozrozWhJkf282dv1cgUd+7ikRl+boy1EQO2IRkFEq+SoaHFbgcprmL9kEx0CAyEvfRlEsjELwBTu+VK9N1effV6Tw4xsFuTkQfEBNVayp9+PY3t1OSlthj48CfsAjEaLYOFL8SO5XbM3N9rBmtdN7LwavR38EhXWlvm3tmuxM5/jKvTJvJe5r7UQuUvNLA2RF+yGYTASMUp6G7kDFekszBML/SbYkmZCDZsP/FNEmbhCdqHpOCLPR0M2lVTriYNy5WYWsysZelmoR1qdKMBIjVzYCQ6bXehkwMX98TQ27m7hoTlEUUH47GObyrfMk9BSynHiWLTW4CHJBPIYledW7qTpTT3kjT77D/O/aV09DodfHdH90m6CTP0CYCDSLXe2oTN5l+8axkk+gD3wEJ2PNq4CvB98WcA/AK1vCPvev+t270doiq/2m/GJkyV8B+PzdjEVtsAbiUREzr9dr3riSzJUH7G8fp19w59IGpyeW+wqAjNV1Ky31GFhGy2Npb8Ujxuspz8fRu6Cd5d9w0PGl8PyhbiEfyNZNfex02boUlJhaW3j7KQWfV0ub3XFCsXIIlKJptG4eKl9dajpwFfwS6SEDMV9zCpQPl6uw+MBZls92pntTKp1NPmTkkL0HlR6M+PYfPhM3LJsUhDZN9EGn1ccqdXN8Hxk05b8iu4qp6sDR0b9FEMPVux7XGpAVQwMmPClFOlG7zl5esog53RVGzrU0pt64C5GCEMhh7vlOen+KpK1TRsZ9XkqJW6pRyMrk6YepJUsuEwoC7MjNC+7b9CvAWJw==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n d8fa3dae-d2d9-488a-9b57-08dc601e9f78", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "19 Apr 2024 03:13:02.3249 (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": "\n Zh6otjr9vLhSvsqS+EzWnDoSjVuLQnn/fYTIMqW04RA/X0eBEAqxmcgF4BoYh5N8vOyjp8zcKuvoSdrllWmPiXTIsmJG7wE40h8sWw9rFBI=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BY1PR13MB6310", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Getting CPP from 'struct nfp_net_hw' is not right in multiple process\nuser case. Modify the data structure and related logic to get it from\nprocess private data structure.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nSigned-off-by: Long Wu <long.wu@corigine.com>\nReviewed-by: Peng Zhang <peng.zhang@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower.c | 4 ---\n .../net/nfp/flower/nfp_flower_representor.c | 2 +-\n drivers/net/nfp/nfp_ethdev.c | 31 +++-------------\n drivers/net/nfp/nfp_net_common.c | 36 ++++++++-----------\n drivers/net/nfp/nfp_net_common.h | 3 +-\n 5 files changed, 22 insertions(+), 54 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex 41678c93b5..e472daa5a5 100644\n--- a/drivers/net/nfp/flower/nfp_flower.c\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -707,7 +707,6 @@ nfp_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv)\n \t/* Fill in the PF vNIC and populate app struct */\n \tapp_fw_flower->pf_hw = pf_hw;\n \tpf_hw->super.ctrl_bar = pf_dev->ctrl_bar;\n-\tpf_hw->cpp = pf_dev->cpp;\n \n \tret = nfp_flower_init_vnic_common(hw_priv, pf_hw, \"pf_vnic\");\n \tif (ret != 0) {\n@@ -730,9 +729,6 @@ nfp_init_app_fw_flower(struct nfp_net_hw_priv *hw_priv)\n \t\tgoto pf_cpp_area_cleanup;\n \t}\n \n-\t/* Now populate the ctrl vNIC */\n-\tctrl_hw->cpp = pf_dev->cpp;\n-\n \tret = nfp_flower_init_ctrl_vnic(app_fw_flower, hw_priv);\n \tif (ret != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Could not initialize flower ctrl vNIC\");\ndiff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c\nindex 934f078dca..0e19723f57 100644\n--- a/drivers/net/nfp/flower/nfp_flower_representor.c\n+++ b/drivers/net/nfp/flower/nfp_flower_representor.c\n@@ -826,7 +826,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower,\n \t */\n \tfor (i = 0; i < app_fw_flower->num_vf_reprs; i++) {\n \t\tflower_repr.repr_type = NFP_REPR_TYPE_VF;\n-\t\tflower_repr.port_id = nfp_get_pcie_port_id(app_fw_flower->pf_hw->cpp,\n+\t\tflower_repr.port_id = nfp_get_pcie_port_id(hw_priv->pf_dev->cpp,\n \t\t\t\tNFP_FLOWER_CMSG_PORT_VNIC_TYPE_VF, i, 0);\n \t\tflower_repr.nfp_idx = 0;\n \t\tflower_repr.vf_id = i;\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 38fe153ab4..258b617eb2 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -224,7 +224,7 @@ nfp_net_speed_configure(struct rte_eth_dev *dev)\n \t\t}\n \t}\n \n-\tnsp = nfp_eth_config_start(net_hw->cpp, eth_port->index);\n+\tnsp = nfp_eth_config_start(hw_priv->pf_dev->cpp, eth_port->index);\n \tif (nsp == NULL) {\n \t\tPMD_DRV_LOG(ERR, \"Couldn't get NSP.\");\n \t\treturn -EIO;\n@@ -267,7 +267,6 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tuint16_t i;\n \tstruct nfp_hw *hw;\n \tuint32_t new_ctrl;\n-\tstruct nfp_cpp *cpp;\n \tuint32_t update = 0;\n \tuint32_t cap_extend;\n \tuint32_t intr_vector;\n@@ -402,13 +401,8 @@ nfp_net_start(struct rte_eth_dev *dev)\n \t\tgoto error;\n \t}\n \n-\tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n-\t\tcpp = net_hw->cpp;\n-\telse\n-\t\tcpp = pf_dev->cpp;\n-\n \t/* Configure the physical port up */\n-\tnfp_eth_set_configured(cpp, net_hw->nfp_idx, 1);\n+\tnfp_eth_set_configured(pf_dev->cpp, net_hw->nfp_idx, 1);\n \n \tfor (i = 0; i < dev->data->nb_rx_queues; i++)\n \t\tdev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;\n@@ -440,38 +434,26 @@ nfp_net_start(struct rte_eth_dev *dev)\n static int\n nfp_net_set_link_up(struct rte_eth_dev *dev)\n {\n-\tstruct nfp_cpp *cpp;\n \tstruct nfp_net_hw *hw;\n \tstruct nfp_net_hw_priv *hw_priv;\n \n \thw = dev->data->dev_private;\n \thw_priv = dev->process_private;\n \n-\tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n-\t\tcpp = hw->cpp;\n-\telse\n-\t\tcpp = hw_priv->pf_dev->cpp;\n-\n-\treturn nfp_eth_set_configured(cpp, hw->nfp_idx, 1);\n+\treturn nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 1);\n }\n \n /* Set the link down. */\n static int\n nfp_net_set_link_down(struct rte_eth_dev *dev)\n {\n-\tstruct nfp_cpp *cpp;\n \tstruct nfp_net_hw *hw;\n \tstruct nfp_net_hw_priv *hw_priv;\n \n \thw = dev->data->dev_private;\n \thw_priv = dev->process_private;\n \n-\tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n-\t\tcpp = hw->cpp;\n-\telse\n-\t\tcpp = hw_priv->pf_dev->cpp;\n-\n-\treturn nfp_eth_set_configured(cpp, hw->nfp_idx, 0);\n+\treturn nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 0);\n }\n \n static uint8_t\n@@ -1178,7 +1160,6 @@ nfp_fw_check_change(struct nfp_cpp *cpp,\n \t\tbool *fw_changed)\n {\n \tint ret;\n-\tstruct nfp_net_hw hw;\n \tuint32_t new_version = 0;\n \tuint32_t old_version = 0;\n \n@@ -1186,8 +1167,7 @@ nfp_fw_check_change(struct nfp_cpp *cpp,\n \tif (ret != 0)\n \t\treturn ret;\n \n-\thw.cpp = cpp;\n-\tnfp_net_get_fw_version(&hw, &old_version);\n+\tnfp_net_get_fw_version(cpp, &old_version);\n \n \tif (new_version != old_version) {\n \t\tPMD_DRV_LOG(INFO, \"FW version is changed, new %u, old %u\",\n@@ -1600,7 +1580,6 @@ nfp_init_app_fw_nic(struct nfp_net_hw_priv *hw_priv)\n \t\t/* Add this device to the PF's array of physical ports */\n \t\tapp_fw_nic->ports[id] = hw;\n \n-\t\thw->cpp = pf_dev->cpp;\n \t\thw->eth_dev = eth_dev;\n \t\thw->idx = id;\n \t\thw->nfp_idx = nfp_eth_table->ports[id].index;\ndiff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c\nindex 8cc8b77318..7541afa235 100644\n--- a/drivers/net/nfp/nfp_net_common.c\n+++ b/drivers/net/nfp/nfp_net_common.c\n@@ -695,7 +695,7 @@ nfp_net_speed_aneg_update(struct rte_eth_dev *dev,\n \n \t/* Compare whether the current status has changed. */\n \tif (dev->data->dev_link.link_status != link->link_status) {\n-\t\tnfp_eth_table = nfp_eth_read_ports(hw->cpp);\n+\t\tnfp_eth_table = nfp_eth_read_ports(hw_priv->pf_dev->cpp);\n \t\tif (nfp_eth_table == NULL) {\n \t\t\tPMD_DRV_LOG(DEBUG, \"Error reading NFP ethernet table.\");\n \t\t\treturn -EIO;\n@@ -2094,12 +2094,12 @@ nfp_net_cfg_read_version(struct nfp_net_hw *hw)\n }\n \n static void\n-nfp_net_get_nsp_info(struct nfp_net_hw *hw,\n+nfp_net_get_nsp_info(struct nfp_net_hw_priv *hw_priv,\n \t\tchar *nsp_version)\n {\n \tstruct nfp_nsp *nsp;\n \n-\tnsp = nfp_nsp_open(hw->cpp);\n+\tnsp = nfp_nsp_open(hw_priv->pf_dev->cpp);\n \tif (nsp == NULL)\n \t\treturn;\n \n@@ -2111,12 +2111,12 @@ nfp_net_get_nsp_info(struct nfp_net_hw *hw,\n }\n \n void\n-nfp_net_get_fw_version(struct nfp_net_hw *hw,\n+nfp_net_get_fw_version(struct nfp_cpp *cpp,\n \t\tuint32_t *mip_version)\n {\n \tstruct nfp_mip *mip;\n \n-\tmip = nfp_mip_open(hw->cpp);\n+\tmip = nfp_mip_open(cpp);\n \tif (mip == NULL) {\n \t\t*mip_version = 0;\n \t\treturn;\n@@ -2128,12 +2128,12 @@ nfp_net_get_fw_version(struct nfp_net_hw *hw,\n }\n \n static void\n-nfp_net_get_mip_name(struct nfp_net_hw *hw,\n+nfp_net_get_mip_name(struct nfp_net_hw_priv *hw_priv,\n \t\tchar *mip_name)\n {\n \tstruct nfp_mip *mip;\n \n-\tmip = nfp_mip_open(hw->cpp);\n+\tmip = nfp_mip_open(hw_priv->pf_dev->cpp);\n \tif (mip == NULL)\n \t\treturn;\n \n@@ -2185,8 +2185,8 @@ nfp_net_firmware_version_get(struct rte_eth_dev *dev,\n \t\tsnprintf(vnic_version, FW_VER_LEN, \"*\");\n \t}\n \n-\tnfp_net_get_nsp_info(hw, nsp_version);\n-\tnfp_net_get_mip_name(hw, mip_name);\n+\tnfp_net_get_nsp_info(hw_priv, nsp_version);\n+\tnfp_net_get_mip_name(hw_priv, mip_name);\n \tnfp_net_get_app_name(hw_priv, app_name);\n \n \tsnprintf(fw_version, FW_VER_LEN, \"%s %s %s %s\",\n@@ -2220,7 +2220,6 @@ nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver version)\n int\n nfp_net_stop(struct rte_eth_dev *dev)\n {\n-\tstruct nfp_cpp *cpp;\n \tstruct nfp_net_hw *hw;\n \tstruct nfp_net_hw_priv *hw_priv;\n \n@@ -2233,12 +2232,7 @@ nfp_net_stop(struct rte_eth_dev *dev)\n \tnfp_net_stop_tx_queue(dev);\n \tnfp_net_stop_rx_queue(dev);\n \n-\tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n-\t\tcpp = hw->cpp;\n-\telse\n-\t\tcpp = hw_priv->pf_dev->cpp;\n-\n-\tnfp_eth_set_configured(cpp, hw->nfp_idx, 0);\n+\tnfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 0);\n \n \treturn 0;\n }\n@@ -2285,7 +2279,7 @@ nfp_net_flow_ctrl_get(struct rte_eth_dev *dev,\n }\n \n static int\n-nfp_net_pause_frame_set(struct nfp_net_hw *net_hw,\n+nfp_net_pause_frame_set(struct nfp_net_hw_priv *hw_priv,\n \t\tstruct nfp_eth_table_port *eth_port,\n \t\tenum rte_eth_fc_mode mode)\n {\n@@ -2293,7 +2287,7 @@ nfp_net_pause_frame_set(struct nfp_net_hw *net_hw,\n \tbool flag;\n \tstruct nfp_nsp *nsp;\n \n-\tnsp = nfp_eth_config_start(net_hw->cpp, eth_port->index);\n+\tnsp = nfp_eth_config_start(hw_priv->pf_dev->cpp, eth_port->index);\n \tif (nsp == NULL) {\n \t\tPMD_DRV_LOG(ERR, \"NFP error when obtaining NSP handle.\");\n \t\treturn -EIO;\n@@ -2350,7 +2344,7 @@ nfp_net_flow_ctrl_set(struct rte_eth_dev *dev,\n \tif (set_mode == original_mode)\n \t\treturn 0;\n \n-\tret = nfp_net_pause_frame_set(net_hw, eth_port, set_mode);\n+\tret = nfp_net_pause_frame_set(hw_priv, eth_port, set_mode);\n \tif (ret != 0)\n \t\treturn ret;\n \n@@ -2438,7 +2432,7 @@ nfp_net_fec_get(struct rte_eth_dev *dev,\n \t\treturn -EINVAL;\n \n \tif (dev->data->dev_link.link_status == RTE_ETH_LINK_DOWN) {\n-\t\tnfp_eth_table = nfp_eth_read_ports(hw->cpp);\n+\t\tnfp_eth_table = nfp_eth_read_ports(hw_priv->pf_dev->cpp);\n \t\thw_priv->pf_dev->nfp_eth_table->ports[hw->idx] = nfp_eth_table->ports[hw->idx];\n \t\tfree(nfp_eth_table);\n \t}\n@@ -2520,5 +2514,5 @@ nfp_net_fec_set(struct rte_eth_dev *dev,\n \t\treturn -EIO;\n \t}\n \n-\treturn nfp_eth_set_fec(hw->cpp, eth_port->index, fec);\n+\treturn nfp_eth_set_fec(hw_priv->pf_dev->cpp, eth_port->index, fec);\n }\ndiff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h\nindex 31deeb43ce..40f314af0a 100644\n--- a/drivers/net/nfp/nfp_net_common.h\n+++ b/drivers/net/nfp/nfp_net_common.h\n@@ -201,7 +201,6 @@ struct nfp_net_hw {\n \tstruct rte_eth_stats eth_stats_base;\n \tstruct rte_eth_xstat *eth_xstats_base;\n \n-\tstruct nfp_cpp *cpp;\n \tstruct nfp_cpp_area *ctrl_area;\n \tstruct nfp_cpp_area *mac_stats_area;\n \tuint8_t *mac_stats_bar;\n@@ -322,7 +321,7 @@ int nfp_net_fec_get(struct rte_eth_dev *dev,\n \t\tuint32_t *fec_capa);\n int nfp_net_fec_set(struct rte_eth_dev *dev,\n \t\tuint32_t fec_capa);\n-void nfp_net_get_fw_version(struct nfp_net_hw *hw,\n+void nfp_net_get_fw_version(struct nfp_cpp *cpp,\n \t\tuint32_t *fw_version);\n int nfp_net_txrwb_alloc(struct rte_eth_dev *eth_dev);\n void nfp_net_txrwb_free(struct rte_eth_dev *eth_dev);\n", "prefixes": [ "6/8" ] }