From patchwork Mon Apr 10 11:00:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 125876 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 B39CF42910; Mon, 10 Apr 2023 13:00:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8690840EDC; Mon, 10 Apr 2023 13:00:53 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2108.outbound.protection.outlook.com [40.107.243.108]) by mails.dpdk.org (Postfix) with ESMTP id 9D1CA40A81 for ; Mon, 10 Apr 2023 13:00:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ogTniWM/xwNBVa4CTpLk1FgvC2cO+7PMWZpcvqdqi9gV+nAqGLDyWTdh8I48X6IIWccBrMZTxmS0oWruuFfwSl+1K4cNHFyqe2TDkzDsUL/qfx2HnHWo1NXKdCdwEhG53uxacIJ/+7gmkmmWZAcd5SYIlzI/kg3MF9xFVq7o3cSgQgyNAadUaqm2dS9LZp4fBizft0CGOHUMKt7mz4sfCOmT2YKjhKhXBkiUKTgN/hPXmhsPcT+FVSG1YwW/135GfOs4LblWS8OIiR7PjsXU5qa+gIDaQRzZeiwmEOZjrGpsKoyovFewpFcplCUyIh0Cjcig0TbRcNRqDD8+Jpz2jg== 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=gOVWog9VE6A6YStoMPIg0JnW3wT205xOdPFPuAAjNQ0=; b=I5oK5bK92LUPHSdI4LLaB+toSQ9FQU+Pn6966otevS9qbe7RsX/hd05SXOPBt88ICJ7wa8OXn31D0OHCjd8L1ouq/lG5f5UYoj6tM2ie+HiDZm2n/1Q4Fz1huBRTagevJ6sf0NzZR8FPVWiYz1EtrU3Bw3cz8MvmacMfhEh/TxwTwsjwWbesRmPY0VNgIYQls+WqaR4iZH2e1ZQY/7arRT/Bbnqoj8VD8x5ZHTKALeU4unVHXOzx2E9/+nMDB13wDSblw0E1aYYgMcSFJuoghR1uPgyQ1A6OJbDtSeyZ3sQh8Fy35npjMtvkCIfT0H6MPXPpuH7L4sAEegZ1ZnLs5g== 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=gOVWog9VE6A6YStoMPIg0JnW3wT205xOdPFPuAAjNQ0=; b=v10yZVrydyx4M1M3VpDibCqQLGNztFkHC+lbGEQC4gsVh2pR8jqNm5ZNodvLPnNN4xr9gsD7V9hhydZ5CI9fOlIz886h2QloFIpLyf7rCy8+ocBAnzMvw1ZUF1iItxwILaa8tFDLfFDAoEoVjJ9bYWsIT6PW8X2f5BqFwJXhnzg= 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 DM6PR13MB3882.namprd13.prod.outlook.com (2603:10b6:5:22a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.31; Mon, 10 Apr 2023 11:00:48 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::baa6:b49:d2f4:c60e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::baa6:b49:d2f4:c60e%4]) with mapi id 15.20.6277.036; Mon, 10 Apr 2023 11:00:48 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 00/13] Sync the kernel driver logic Date: Mon, 10 Apr 2023 19:00:02 +0800 Message-Id: <20230410110015.2973660-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 X-ClientProxiedBy: SI2PR01CA0040.apcprd01.prod.exchangelabs.com (2603:1096:4:193::14) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB3882:EE_ X-MS-Office365-Filtering-Correlation-Id: b31d37a7-9d67-4c61-90f4-08db39b2d70f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BjV42IUlxz/m7X7rFx07exCDslR+8fUzVCjO2lxiDKHPeSn/gxVxa0BIdiGRspayUcWhvBxkoZCNuwTQwMcg+uysm73KVlw/aNjrAU6xjrikcrXkVXyN6t4Vd1IpnRQlO4FixaF64LlL7L4vP9yLy7dKOKH98c579CrrxLsSbYcvWchxdjmMA8TNDKXstuOnPK+IxjUbxVbE1L1v+8lU/0eLFbZq34PXGLWz9R65KV2CRIm21o5yad1qbyRms3/sQN8ixScADNqW1Xea3kqq3BsfwYG/oLtGHtTgkntQJH4iwWF9/ACkfCtPhDFFmrfCCzNWoAei3EE56UnzzWFIGMa5nYli97yGrLkaWs5W9nQmuGWJDleKHPOR5OeZAj19jHMvW9nujczvZu1JZtCDR1at0fZv/K3GC3iUa3UtNkaeY++XhR5Ckcww7KiRo0KAe6QPxnfXOCgaeqfyhOhBBov4Gc1TDbb8WwhuMoPuVJ48bxddjtvj8jxT0EYRmrcQURsoQSbg6K7vomEk015FQpVgB+h1ZotCy6rPDdT0WJ1L/WoM9c93A/uCP+ZBSTv/iiMo6X1mIfLnZ2pVKOCvuo1CHrNl8XEsERNre2gVYVp/q+BvsBoerf/pZyGLIubo 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:(13230028)(4636009)(396003)(39840400004)(366004)(376002)(136003)(346002)(451199021)(316002)(86362001)(66556008)(66476007)(478600001)(83380400001)(66946007)(38100700002)(38350700002)(36756003)(186003)(6512007)(4326008)(8676002)(2616005)(6916009)(41300700001)(2906002)(1076003)(6506007)(26005)(107886003)(8936002)(52116002)(6666004)(5660300002)(6486002)(44832011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?/ikpYSVEKJtDzuynfNVIyrLQwXiq?= =?utf-8?q?WrAF0QMRCB4xzgPrSH0XE/CwLUnvfc75UEulcr/EWSHd2NKTzY7CHq0FAOGw0CsIu?= =?utf-8?q?qsPJPXogZwCpKHami32bbaQmexaxE0sXZkOT1fYLmwSULWsgbo7xEj+7j8OjXLCGo?= =?utf-8?q?0kKW/Do04OyCVNWRARss/iK+jVUDyAXI7LU8+njt2spzSYQTthkGCsHr+ymjPJJWz?= =?utf-8?q?o5sutC+c9nKrylPnlcgi8xRvfRUltmB29prKmn1F1Pnp8DCpIxD71Jt3ikgRP/Lo+?= =?utf-8?q?i+FhQoEVi7tCuJCcVelIeOHFxxvV+Vx53XYti8cHSe/qjCDl0pxl2R6udzhyOH3qQ?= =?utf-8?q?wYzNEDNn5f2/kzFqGd7G95euadvLuJqmlGcNoQlzbcSrBln6H5+Xk0CACN62cUA/6?= =?utf-8?q?xjjOfdatd+QnSbZYGCEuZaDsFPk3txLTbGrWN5Dc8aEmPDHmfIhyGpIoEa7J+L0vP?= =?utf-8?q?eRBQIsiNJkgI2LvXaL6+yUy1CdrXsRxHNHf29XbB7jHzZquP5dmtYWvO/Hc/YXMr5?= =?utf-8?q?nixK7O+shsB9kNdWBqyHo2p7CnOeuX6Iw2pYLnZo1lQjboAmaEa1Pv3PFGzw+ukT3?= =?utf-8?q?zOmHMSwvNWZBPUNeu1tfCHdUHpjkuOldKlO4gg93aZ9PBOvUA5WOnUCt9BZIGGDTP?= =?utf-8?q?C/sE9e7N756AhpswVC+r2QAXCdEPdWD5BVPKnrrMPWtaiF91zdCUhxstrGPotRuO0?= =?utf-8?q?poZifyk1Gp85DvFfWlGXPYeELLOoB+2IJrwdliu2/DX3Md+9ZLYQ8v3vLPK+jRVTC?= =?utf-8?q?niXf9kgd5R3/dOtz/uyTSaYsA+Zcq+o2OFkFyXz9O3u+SqMmwqABYRc+3PqJwZtnN?= =?utf-8?q?hwCiRT2NE/K05Zu+dGx8g1UM2KUKLdIxdDFGdNngp+ipdFg/bzlVoURmOu5/QQPAs?= =?utf-8?q?IlaJxz7OYzDLmuqgo2I1LlDqMLM4D7AWVmRSGnGuGhDrwadCYwerYXG8s+rUb5vvG?= =?utf-8?q?6TGfT1CA1Jxp1EWxAMlH8BnuT9fGAuriJy3aU4gv8Y2cZqZwwIy4HpAuI+UxA6sGW?= =?utf-8?q?n1zdLYdNVYdf9RIC67syWlvO2FfSvNUVKhp7rdYtdXf2uZff3E7rYto9SkWT+Zam8?= =?utf-8?q?0kIHrEiYpDgKpXHmrO87Pf2smfb1y3hYlA8ZN6xXAbVMC8wwJnZdsRVodHEOAUsFJ?= =?utf-8?q?/tCCT/z6Zu2GlgtbpDrhxExjiNaicqsvb05DAapFTltHOfDxzUKoTwD4E5YgU5eoo?= =?utf-8?q?BK48R6g+woROLr7KgLTUVvC/eNU4Kz+2oRTnKJgymY4EHZ3ebsG4p1H5/qiMT7BQG?= =?utf-8?q?eKOSJ1c2fZEyhDFWLoC60W4ZoqKQrR6WysMqBjrQy7VJxmUoNGmCyySMHbOG9J67n?= =?utf-8?q?YEkIkD9mmgeUWez2laHy1n3+2xi8OyEk0wq6JPC52qR9NRDC2OOyGFalxuquvzqsi?= =?utf-8?q?rTL5FRnAPs3l22R0mr/d8cva74X1BzbnRy9/fIv7WZyDeP4mWv/OGbdQwum5GvpDN?= =?utf-8?q?SaANaITbjlwBeOhgdTuYAqcghJwVShRnMUv2tDR9vW9A3sFy28haHEdWwdkV/Yfn5?= =?utf-8?q?zDsUC22Wnqh/knO4K8Ku+mIQRHl7fgtZCA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b31d37a7-9d67-4c61-90f4-08db39b2d70f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2023 11:00:48.0740 (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: yQjzQRH/IBCzpDFxpYjla/CMy9CZt0k15UUxSkq+jrljX4rzwTjqrdRiL5Zr1KJY0GsE/dWZLG4/sxwFFPxgAsEIK9K5fIQd+alJD1sLFCI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3882 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 DPDK NFP PMD share the same underlying data structure and API with the NFP kernel driver, because they use the same firmware. The DPDK NFP PMD only has a very initial version and not changed for a long time, but the NFP kernel driver keeps evolve at the same time, so the differece between them are keeping expand. This patch series try to sync the needed logics to narrow the gap. Chaoyong He (13): net/nfp: define correct size for configuration BAR net/nfp: move shared target logic to own source file net/nfp: remove the redundant macro about CPP target net/nfp: drop usage of return error helpers net/nfp: use generic macros for array size and to set bits net/nfp: remove dead code related to CPP net/nfp: remove duplicated nffw defines net/nfp: move NFD3 logic to own source file net/nfp: adjust the coding style for NFD3 net/nfp: rename macro name of NFD3 Tx descriptor net/nfp: move NFDk logic to own source file net/nfp: adjust the coding style for NFDk net/nfp: modify the logic of some NFDk function drivers/net/nfp/flower/nfp_flower.c | 9 +- drivers/net/nfp/flower/nfp_flower_ctrl.c | 3 +- .../net/nfp/flower/nfp_flower_representor.c | 1 + drivers/net/nfp/meson.build | 3 + drivers/net/nfp/nfd3/nfp_nfd3.h | 161 +++ drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 343 ++++++ drivers/net/nfp/nfdk/nfp_nfdk.h | 239 +++++ drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 437 ++++++++ drivers/net/nfp/nfp_common.c | 6 +- drivers/net/nfp/nfp_cpp_bridge.c | 5 +- drivers/net/nfp/nfp_ctrl.h | 7 +- drivers/net/nfp/nfp_ethdev.c | 5 +- drivers/net/nfp/nfp_ethdev_vf.c | 2 + drivers/net/nfp/nfp_rxtx.c | 844 +-------------- drivers/net/nfp/nfp_rxtx.h | 208 +--- .../net/nfp/nfpcore/nfp-common/nfp_cppat.h | 725 ------------- .../net/nfp/nfpcore/nfp-common/nfp_platform.h | 35 - .../net/nfp/nfpcore/nfp-common/nfp_resid.h | 592 ----------- drivers/net/nfp/nfpcore/nfp6000/nfp6000.h | 20 + drivers/net/nfp/nfpcore/nfp_cpp.h | 155 ++- drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 3 +- drivers/net/nfp/nfpcore/nfp_cppcore.c | 47 +- drivers/net/nfp/nfpcore/nfp_hwinfo.h | 2 +- drivers/net/nfp/nfpcore/nfp_mutex.c | 39 +- drivers/net/nfp/nfpcore/nfp_nffw.c | 8 +- drivers/net/nfp/nfpcore/nfp_nffw.h | 10 - drivers/net/nfp/nfpcore/nfp_nsp.c | 2 +- drivers/net/nfp/nfpcore/nfp_nsp.h | 12 +- drivers/net/nfp/nfpcore/nfp_nsp_cmds.c | 2 +- drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 34 +- drivers/net/nfp/nfpcore/nfp_resource.c | 2 +- drivers/net/nfp/nfpcore/nfp_target.c | 994 ++++++++++++++++++ drivers/net/nfp/nfpcore/nfp_target.h | 3 - 33 files changed, 2417 insertions(+), 2541 deletions(-) create mode 100644 drivers/net/nfp/nfd3/nfp_nfd3.h create mode 100644 drivers/net/nfp/nfd3/nfp_nfd3_dp.c create mode 100644 drivers/net/nfp/nfdk/nfp_nfdk.h create mode 100644 drivers/net/nfp/nfdk/nfp_nfdk_dp.c delete mode 100644 drivers/net/nfp/nfpcore/nfp-common/nfp_cppat.h delete mode 100644 drivers/net/nfp/nfpcore/nfp-common/nfp_platform.h delete mode 100644 drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h create mode 100644 drivers/net/nfp/nfpcore/nfp_target.c