From patchwork Wed Sep 20 11:34:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 131723 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 053B6425EF; Wed, 20 Sep 2023 13:37:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5B8842DCD; Wed, 20 Sep 2023 13:35:46 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2100.outbound.protection.outlook.com [40.107.92.100]) by mails.dpdk.org (Postfix) with ESMTP id EEC0F42DB4 for ; Wed, 20 Sep 2023 13:35:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dajqhn06p0EoOqvJJwTU/aZK2MRXcl8w0vST2k4x3duk5CVvQEQVCPy1yps1cWBDooLs/gf9MbcxfN0kaZjSWYSbken8zADuNj7SJBZ5WXmhyW4vYMA8f786vQW4zk9+9zIWsdxw7wKrD89FhJVXjXO24zyMH2zDDB2gRbAsnk4esVEryM9uK8uY91UAa9tmrhNqVw3xLn4rCEDhdG2P+24EHoeHgKVLAJhgzGO3jlO0U+OMWyp6ts9rVqDn0I9Zmdqz3iLyLGuW+8z5Bt5XQspshsKkWHpyhhgLjvB5nE99Mdc1KtJK9ORz/schhH6EwKMlzgzaYshI23ANDjaZXg== 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=xfB8RhlvXxqTbZjyyo/iX9zJXmlX9lA5aBV8PPInrGo=; b=Jj3LIjwzooxgitbEl/sHGV+USAa9zoA9Ixz4mXu9W+s4J1b0TW7cPLjQxq1ZWaDUNfdUYqsg6NR+GvzaXfdMjjvG58y8NHdqnwy28eNKWsTAoVnc0b5e3GUIJVl1Z6MEyd26vV+HDACUfuGcaBxqV8/0Qzh2qnChGJoErE0kHE58hfvBDeLaRrwHHtNV75jnBeIPnVOY1eaEVduc+sVM50To4wPzMNhSW5CUlpbMCak8Tdm2Ul4bVcxrKYXRRJ/uXHHfWoae7MGKRKWZhTLbaE5rDp3g/6bgOFSBOFs+oiYkmPG37Yl0PgqmOPFe4F94Xq6YVI+FGI/gMMvzkQR3jA== 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=xfB8RhlvXxqTbZjyyo/iX9zJXmlX9lA5aBV8PPInrGo=; b=DNpqjO4mILELBuIdsgr5leLPJkaaeeth4jvSGbfRniSEeR9i99OpmuZDtZ/gomav2LRAlpuMsBx+bcHruV7bV/l8K4xDjReBWKxSkd/cvRstVAvSt3c7kL79AOc/G0J3tL09jnmyVLDazEIU3D5vYxZVsj+mD0MHNcVzzrU8KRU= 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 MN2PR13MB4039.namprd13.prod.outlook.com (2603:10b6:208:269::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.28; Wed, 20 Sep 2023 11:35:42 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7a1c:2887:348a:84bd]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7a1c:2887:348a:84bd%6]) with mapi id 15.20.6792.026; Wed, 20 Sep 2023 11:35:42 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH 12/13] net/nfp: improve modularazation of CPP bridge module Date: Wed, 20 Sep 2023 19:34:53 +0800 Message-Id: <20230920113454.739356-13-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230920113454.739356-1-chaoyong.he@corigine.com> References: <20230920113454.739356-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SL2P216CA0113.KORP216.PROD.OUTLOOK.COM (2603:1096:101::10) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|MN2PR13MB4039:EE_ X-MS-Office365-Filtering-Correlation-Id: 7cc2e688-6a67-4668-ba1b-08dbb9cdb87d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jg2jhPZp+WFUAsOlybi7Ay8e51nzLM+fgQx5sabjya3oGz7+Bj6IQRKKwH5BYuv1c4qi0Plpc6QQ7Q2ykfOtmeKTcmBPM7czkdRCzFarEEO+Y3nAriwA2eXchZICd9Xb3R6OsumCqw30BR4HxdwT5zDmYeJPpTaeb8762mN2C0MNnlSqcH4GYQa7ot6hc7AlQjpGFokREhL/IuGC7T/3rXF6ps1iNGxCKybi+EAnrsdntvBBtMOJyATRFeS39qL8ShQFionm2iOOcVat+rROHn7IJeJhPgPZcSxIB0HDzaU1LX69n8iRUZhVUAEt4acBK6owMkeijQKmO04m9BpYOkrkN8WQfz72QLHzwPTeERMRhll1owkL3jFl/czbZDSyKWX+0sIe2Kpc9/B8HTqU0C1GOmx/TZsYBxx4XKQ3lvNKxhtTq5XgVsXia+laeB/dKm18Nexz0L9Vejv5D8UqF58v1bw4w/HOilFyh1xp92zn9VcSspYoFJfTHJxUz42HY1FeX83gIwUWB1o3r/EJKYvZnl5xcZzzngXGqmbNs6J8HC4s4p9iA+cJ3t0213MVK/SYaH5BWiwqNCJx7jo8fTgoCzXy7lZ8ngmiL8Zl/UvoXXb943lBn4Xpp5UH0x5iWsI+WVVy1YS7E+uEXCp7B8Fm6H1WGk6BypEtWEJEgpw= 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)(39840400004)(376002)(346002)(396003)(366004)(136003)(186009)(1800799009)(451199024)(6666004)(6512007)(52116002)(6506007)(6486002)(86362001)(41300700001)(66476007)(6916009)(66946007)(66556008)(316002)(478600001)(38100700002)(38350700002)(107886003)(8676002)(1076003)(8936002)(4326008)(36756003)(26005)(5660300002)(44832011)(83380400001)(2616005)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hrbFkGZhnSERt5MKFYPTS+R0lsH7R4OuKE26AXUjWzHG3Wphl9LtihDVMb6fKgfDaxBCvvEiW9R9xtwxWYJ/wnn2XHs0xTmwfKbnN2LM0W5mmm9K8Yjt8/tqMmzi6IQsrY5myM1lnParPh4eGTK+iCbCsQT+3347AqfJ7hSSuTlwcEg9Hi666kkhrzWYRuH1OCr5u6y3ETWMznJDnV3fNw8RonvH9L5BIgq0DGp/YyxipI7O38iYwbq3t8mkoXFZhs8ry0yxnDdG0BM1nKDqZjxy8P1bh/cGraJKFbCvBct9vnNog7iyn9JpnFBgLTamJqB/AJomNrXAKT7tgSZpEmV52jHGim1BL317S1KcG2tae60/IOmk+sp2u2MM0NAo/BC6YNLs/XzHu0fKLPD7XFio/twHCz2M0jRWgnsd1LE+3kOu2PpRXUbyDwEDgAv7pDmJTo0ICLRUnM66q48gsrQ+tspn/WAX/iOw/DLjVAgM1J1Etyi6fY8dCwBjkKl5caRUhr4/aaaffnGgwm3q+ZYN3DeV0mXBNRFMbpQpxwe41pTz5WVQzCVJz25BBm2iTn4PBtbF/c5l7M3wLXVEiH3R52ookIh6ts1qfU8/D/XSQVprP3d6KWpamv0l1rPfLEhUFPdMk9cL4IxRaR5uip4JPbzrYWT6Jro7VT9t/Dnx/N823iL9U98VUDFPj88XIMVJX5SQLluR5cv84Qsmu5qkyY1b1yo7qnt09F2K8jL6MelocCvnOfIU8kIfHf/OF5lQ+q40UFBwC5Af/HVIK+5UdxL4oDh46LKSP+SUah2IAiE9lfAePozzjf9AsBV1gRPqsXF/YKTaFycUQLYTwEmAEFpHdawnaAlgyzwtutGytlusbD1izm42VC5CGkJjDtECYVlWkmPJ9rLq2YdhYqfcE8NzeOrO09Pgkv1LJnrYW1RuTRKr+6A43wFjJHONPegD3SOxVoc39FZxXQQmK1lfTswHsTJkmmqUsMaFnO/pbAJPB+qOglqFaLj1U4jN4Pbe3FLzX3O1dHy4iOurZYYwK8Fz45OqqIvOLPa/0jiqsjuDYHM0hHxK0fnbsDjoB7KvWsyUBFRmcGsY81YKdzleEyhN6IxA+5Fz5gaqJh//h4mvZa4OB2ggoR2aT7ACDsLgk76PcZsFtg7QEh2nMk1X0wcswZSj8QR2v/e/IxdsxA3BwrggGisBqgm92Y7tBU2DV7sdeWf7pNBQ9JA/YABZAjtJnHbyfxmY5NU7ujmSHycZ6LVEUeIiEugU5YeF5jhQH1RPaMuku3Ult0Z9BV6uR9HA/RNBfslszZi/CncfsbLeoxtDmHjl2Hpw7/tbUG4ElyANLlQ0qcvdVEoNzOp8ZzrYEl1QN+L6Z6LFK4N5mWIR5WX29u/1qlSrOMhR0suIqzTzzZsaoVOATrQH7EsZrWQ/gm4bOBYUgYOu3My1a5zN98zkKwJxDby4K5bSKRsOWaooeInmmisIBLnIbriBsXfsCOAmZCo+yZ4ea0j82+/t2/6Yws+GRWlRqfOu9ksIKeEJ61rd7MashQccOoSU3iOmU9jUwgMRmt2oU46sqaaNwY4X4rVK7WlTzH2Hkvfp8+PLaHSLV3CascIxoA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7cc2e688-6a67-4668-ba1b-08dbb9cdb87d X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2023 11:35:41.9918 (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: 14WZjiSbGyx7obWLEr9Y71MDWQkTwBumLJT7e0fXzCPyltYhChrnwSv0o/BFa1wJfoFtOdLlyJo3GWctxAk7aTwFw5qzNhoC2yUcnDd4Y5k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB4039 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 Try to keep the API small by move the logic which need not expose from header file to source file verbatim. Also remove the unneeded header file include statement of source file. Signed-off-by: Chaoyong He --- drivers/net/nfp/nfp_cpp_bridge.c | 14 ++++++++++---- drivers/net/nfp/nfp_cpp_bridge.h | 8 -------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c index a9998f3c08..ed9a946b0c 100644 --- a/drivers/net/nfp/nfp_cpp_bridge.c +++ b/drivers/net/nfp/nfp_cpp_bridge.c @@ -5,17 +5,23 @@ * Small portions derived from code Copyright(c) 2010-2015 Intel Corporation. */ +#include "nfp_cpp_bridge.h" + #include #include #include #include "nfpcore/nfp_cpp.h" -#include "nfpcore/nfp_mip.h" -#include "nfpcore/nfp_nsp.h" - #include "nfp_logs.h" -#include "nfp_cpp_bridge.h" + +#define NFP_CPP_MEMIO_BOUNDARY (1 << 20) +#define NFP_BRIDGE_OP_READ 20 +#define NFP_BRIDGE_OP_WRITE 30 +#define NFP_BRIDGE_OP_IOCTL 40 + +#define NFP_IOCTL 'n' +#define NFP_IOCTL_CPP_IDENTIFICATION _IOW(NFP_IOCTL, 0x8f, uint32_t) /* Prototypes */ static int nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp); diff --git a/drivers/net/nfp/nfp_cpp_bridge.h b/drivers/net/nfp/nfp_cpp_bridge.h index 85289e158b..e6a957a090 100644 --- a/drivers/net/nfp/nfp_cpp_bridge.h +++ b/drivers/net/nfp/nfp_cpp_bridge.h @@ -10,14 +10,6 @@ #include "nfp_common.h" -#define NFP_CPP_MEMIO_BOUNDARY (1 << 20) -#define NFP_BRIDGE_OP_READ 20 -#define NFP_BRIDGE_OP_WRITE 30 -#define NFP_BRIDGE_OP_IOCTL 40 - -#define NFP_IOCTL 'n' -#define NFP_IOCTL_CPP_IDENTIFICATION _IOW(NFP_IOCTL, 0x8f, uint32_t) - int nfp_enable_cpp_service(struct nfp_pf_dev *pf_dev); int nfp_map_service(uint32_t service_id);