From patchwork Wed Sep 20 11:34:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 131715 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 3A61D425EF; Wed, 20 Sep 2023 13:35:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A5A0842D0C; Wed, 20 Sep 2023 13:35:31 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2133.outbound.protection.outlook.com [40.107.92.133]) by mails.dpdk.org (Postfix) with ESMTP id 3860C427E1 for ; Wed, 20 Sep 2023 13:35:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W8IUDuCo5Puiz31t4uGeUTHWEQGYwjY8ID/OckuHDZGNDFqtyd+5hVVamA+RN+xpy2xhd6G1VVvKG260/wdeu0l90VNumtJr4/SXP/jTd1iaSdTj24J9OEERacLfRXCrsR1qaXUn+UsjYkvBXWZzCS6WHW4rSBMfCI7GVpUqidDvVy64io6p23kUGD67grLwpDFFeTxK1hk/gV0kaf27V+MDbe6bnSpj5TbHnmqA+cpTGixmad7FZIoVGMwYRhiuSMN2bDC+m27NzpdmijvRy0+/kVxNkLtMyu2TeOV74UnuFHJN0NCqQf9A6uIbcLbF8ViakkPdEns6MzN40ERQGg== 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=0Ts6ThuuNoGuQf8b1bPots5ls1XZjqnFknMDteBKZ38=; b=m4km5rxHhAcoWJg5l7lJ5CqL6G6O5JPc719cwApUveAVMrq0begXLu4hAG7erB8WqqG8MxhycFIf+H7LlLQtEILGfA3R0C5vnw6esXup8qd2oS19XU6Fiw4hr5GSVIziFNtRfHa1IXQSNIU6YjVSHV1iIFp4C+7NT9DK1E39eEJKh7gQImT/1StLJsQRpGRBSkY4TrnlEYUbdU1lrWn4s9X8c5val/uQgCK1/M9nsw5q/7BQGxvwCBILFzQ+p8CPIcTDAoJ9xhVT/4ybtN1RTJs05NVARpxhImRPZk4PnFyQR/S9c7veA5qo+bZq9OwPW4/KZ/GcYr8+z3gmNFG2mQ== 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=0Ts6ThuuNoGuQf8b1bPots5ls1XZjqnFknMDteBKZ38=; b=bEj5Rk001+1bRFHK/FrnmatEJztid379kUceVkTHvx9GZa24IOpZ7+Iuw0RCUpEJGiQI/Or5uy+g52MGJsNmo8xRR4U1ye8tYmNsQm2mVFc7w4TKJpOfTX7iVoj1bTy1E7EqR1G6DoOgWfmvL38Oq5Lc+hgxaq6LYyKeyUPBxwU= 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:28 +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:28 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH 05/13] net/nfp: improve modularazation of common module Date: Wed, 20 Sep 2023 19:34:46 +0800 Message-Id: <20230920113454.739356-6-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: b07d25d1-3304-4a80-ae3c-08dbb9cdb02a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ilTAGq1oHpzu5TNJAZEDmjj4QgD3x/emaozJ+0hHDam4mhxA6ybcs4s1rdyAApCXYvASziA42YwrEu8wTJFUcMcAlSB4KWFbFuyPfwrl6ib/p0qyq88OEf2iILOUGEvxNFjVMJYlIN8mgBwhSi6TOcWMSypQU5IVH83Uhw3OIvuK9jHfmURm0eqLAakQNw6E8nYS+lO93Kw/V9QawZM2PgG9zc7GFVwVDYrFB4Emw0h0jHQwKVOu1/gZeOeva7TAGs0yaR9bkGpROU21o0H2ckpw6aRS1cild8DA3uJ3Ff31zPg8giT854R16LR5M9/7i7xAOkRA/2LfGXSXgUpmLZXwQuh/B/b+kPgvluDNWLIirq8mdjdQXhUGS7mtra7arH6e9Kp5erc+hr2NamWwaeIP/UTcCxgPHZGn76X3wakTUnZWY5fq92B0CqIYcDAuoYvJK7l7yQVZ5j+xab1BTvgIHlNNRaBnL5VK5zqV1j32wy+W+4WKX1CvnxNZ3jca0oXYSEmhUAZhYYxU/QRX4QYYjGBloIUpKysStH4HlW1PqTjKH2D8w/oZjw3JCgGjEH6g7kSP/Vy6C2JO3qN3CilRlwDg7CvshMzpMHhWyfv+UnYTIAg1p7FQYrTm9wdcEepH/0ZueDMHxSiwC9wvHxFDsLCUwBF6DH/CtyiNkeA= 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)(376002)(346002)(396003)(366004)(136003)(39830400003)(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: 42j5exZ8tmwfBUjH/EERMAMRERhTT1l3mjTOaUJQ8UzvKAar8lzq7P0qsGsxeWo21IRY18bWZGVz1JeFfrhE2lmQ3fRAAqYV8Lx3Hx4hJT+dSY204eHi7oLSNXAIjSZy3SYQ9QTuHsHVpAyBKc2EGSmDhqvQY61yJpJa+KddiHV+qe6alJC9Wzbjdw663LvANOimV2iFszClPeXpKKb9OtWHiTxdCNd9RiPOtYM5bPzAbvsJUn37U2NhBYJX94FPifaztMvdYb/5fXWAYkNqQ3x4K5simVUREJF6Iilign9fAi0Pw2+twNL5cpCpiu8n2+LTidZFJHRlDo2FiRYKBCtAaoUhbSnny1aC54JS3pJmezIrOFR5eBD4+rSs23ShxhKKdfYUpHec7T60jxb9UNqXHEJvrkTA4oVjrax1ZpB6ZQdwcrhrmAXO9B1XQGb6oir/h0LmAb7SvfMd7CkePsYyeDWm7Y59thCOC23MzSZzXiYRdOWFuSUOk+SyZy2CNOEXaZ46HRlGTp78hGoTj8RDXRPcv+Bxn3Z9prl0VdPWERdbHJjqLXaLSMbLm42AyOKPlpCAaLamQjrLHbCrfEBJVc0kbcBuoi5UtacunnUvCoOBJoDYT/W4fKZ0Kwt9A5CoeKxYokklnWIGr6tPChOK1vmve+9ie6H/W0PYmdeq/+/vJvUo8/Mj+cLfRUp5yPNGmiASJ5QejaQV+YjHRTvFCY5INiYNdCXn1dScOuVbB56ITc/Bc8bcrR7dj3p3LriwWZ4tLfHhIVf2kQ2InKhItxpe4mOnIVQk58ZBONnLII6axEza2FYxL7UVqopb2XsYifxmNQ1xfpO6VjotweU5jdRnaG1vRkVbzqLp245vHWxuzoVPosZhbEPP1oKm7zKWRlTddknA4oFIDdv2MciaYKgPksCIiUHtOCRXUmIDzwDS5Okj1rCo5ox/9+XiGi4HXtq2fTFA56xJ8QBvOZmoR8rI7alodb9ZaTc2h5zPk1Ud12thk12//we1CG0Lbc7bpGWjHqK/gBWH6vyPwaQnoM8/w2bhaPrXnc+R2WKOA9G7RB68ps7P6o29dHLc6FmCW20RiEBOd1ED+LEcJu3G6ORiqxhJ+fYMWqIQLGXCA/oqcjrmN6ycV685MHwBsWY+aGLVHllXxJxsbvIz8VlSz/0ADinCU8Zwc9AnX9XtB8wDzFlBqn2BLhzij8vgb6PdcPTs97lO4xpdfo5NqM848enbXjXGCTNTfv5leMsXCFZtgVZy69YAMVZC7tiX6+yqkeKoXYifi8baChN+dT1aqQwxTdJSkz3ClxMKCrYtAtgIHZ4yDVLvRTPoZKV3FN0aEJo4NxocsgDNHTYuUEo+wfAMYq/yGx8Kqipr0mnO2o9fSPRmm4y1Lv7hUv6tofKRbZHEhhyg5MT2x2tAIcsFb7qdQsGr3jM0dcR7AparFh1Q1GIYDZFRoUfF+UVuGgUMgKnu39h4ZvovRuA7dBal08CXuHrac5D3rJPfx35GF87sj/viAM2xqa9wQuRo0NB6JmUEpQCW8+HvPxjJnqznimQBjKYyTg3ZdQIZSKCabkaC4MYxDrjOdhuCpawVV30G3Gnvd9Vy1nSkoNL0Vw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b07d25d1-3304-4a80-ae3c-08dbb9cdb02a 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:28.0668 (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: 8Ccl4uj2//emWpeZOwYdn1DSmvgkZS7KVJGL/WYmU50amSOE2Rl1Kokr5NmPMMlgL+tf3wFLBhj9DOdeSqAaSCR5R1LAi0ydezsjLh21kM8= 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 Make the header file self-containing by adding the correct include statement. Try to keep the API small by move the logic which need not expose from header file to source file verbatim and remove the unused macro. Also remove the unneeded header file include statement of source file. Signed-off-by: Chaoyong He --- drivers/net/nfp/nfp_common.c | 51 +++++++++++++----------------------- drivers/net/nfp/nfp_common.h | 34 ++++-------------------- 2 files changed, 23 insertions(+), 62 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index 160df27c94..40027dbdfc 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -5,47 +5,32 @@ * Small portions derived from code Copyright(c) 2010-2015 Intel Corporation. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "nfp_common.h" + #include -#include -#include -#include "nfpcore/nfp_cpp.h" -#include "nfpcore/nfp_nffw.h" -#include "nfpcore/nfp_hwinfo.h" +#include "flower/nfp_flower_representor.h" +#include "nfd3/nfp_nfd3.h" +#include "nfdk/nfp_nfdk.h" #include "nfpcore/nfp_mip.h" -#include "nfpcore/nfp_rtsym.h" #include "nfpcore/nfp_nsp.h" +#include "nfp_logs.h" -#include "flower/nfp_flower_representor.h" +#define NFP_TX_MAX_SEG UINT8_MAX +#define NFP_TX_MAX_MTU_SEG 8 -#include "nfp_common.h" -#include "nfp_ctrl.h" -#include "nfp_rxtx.h" -#include "nfp_logs.h" -#include "nfp_cpp_bridge.h" +/* + * This is used by the reconfig protocol. It sets the maximum time waiting in + * milliseconds before a reconfig timeout happens. + */ +#define NFP_NET_POLL_TIMEOUT 5000 -#include "nfd3/nfp_nfd3.h" -#include "nfdk/nfp_nfdk.h" +#define NFP_NET_LINK_DOWN_CHECK_TIMEOUT 4000 /* ms */ +#define NFP_NET_LINK_UP_CHECK_TIMEOUT 1000 /* ms */ -#include -#include -#include -#include -#include -#include -#include +/* Maximum supported NFP frame size (MTU + layer 2 headers) */ +#define NFP_FRAME_SIZE_MAX 10048 +#define DEFAULT_FLBUF_SIZE 9216 enum nfp_xstat_group { NFP_XSTAT_GROUP_NET, diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index 36ad4e1d32..b0372c3dc6 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -6,22 +6,14 @@ #ifndef _NFP_COMMON_H_ #define _NFP_COMMON_H_ +#include +#include +#include +#include + #include "nfp_ctrl.h" #include "nfpcore/nfp_dev.h" -#define NFP_NET_PMD_VERSION "0.1" - -/* Forward declaration */ -struct nfp_net_adapter; - -#define NFP_TX_MAX_SEG UINT8_MAX -#define NFP_TX_MAX_MTU_SEG 8 - -/* Bar allocation */ -#define NFP_NET_CRTL_BAR 0 -#define NFP_NET_TX_BAR 2 -#define NFP_NET_RX_BAR 2 - /* Macros for accessing the Queue Controller Peripheral 'CSRs' */ #define NFP_QCP_QUEUE_OFF(_x) ((_x) * 0x800) #define NFP_QCP_QUEUE_ADD_RPTR 0x0000 @@ -50,27 +42,11 @@ struct nfp_net_adapter; /* Alignment for dma zones */ #define NFP_MEMZONE_ALIGN 128 -/* - * This is used by the reconfig protocol. It sets the maximum time waiting in - * milliseconds before a reconfig timeout happens. - */ -#define NFP_NET_POLL_TIMEOUT 5000 - #define NFP_QCP_QUEUE_ADDR_SZ (0x800) -#define NFP_NET_LINK_DOWN_CHECK_TIMEOUT 4000 /* ms */ -#define NFP_NET_LINK_UP_CHECK_TIMEOUT 1000 /* ms */ - /* Number of supported physical ports */ #define NFP_MAX_PHYPORTS 12 -/* Maximum supported NFP frame size (MTU + layer 2 headers) */ -#define NFP_FRAME_SIZE_MAX 10048 -#define DEFAULT_FLBUF_SIZE 9216 - -#include -#include - /* Firmware application ID's */ enum nfp_app_fw_id { NFP_APP_FW_CORE_NIC = 0x1,