From patchwork Wed Sep 20 11:34:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 131721 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 55CC7425EF; Wed, 20 Sep 2023 13:36:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3851142D97; Wed, 20 Sep 2023 13:35:44 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2097.outbound.protection.outlook.com [40.107.244.97]) by mails.dpdk.org (Postfix) with ESMTP id 8FB2042D95 for ; Wed, 20 Sep 2023 13:35:41 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PnVH5CXUiPSFfHT9WBwKTTIMeIvqKwxfbiP3vfqzIE+BWPsq06QKZgPcDVudKqXbh4Ur1DU7Im90qAGOd/LYEq7DJe4BQl9S6bFEklAwre6ZSFX2zvjqH6b2Ln++jUeVfQ9503nooFFtTin0MCCLlTuguFIB9Gb6PEYhmQ26siaZCnpyWmh63sCPxeVlisLbZSzvb2kaTmHsT1UKI+5AYURNJUaem9Iz237aJl3m6aaLkoZd+KmEQQ64XBD077VacQQrjHmu2ApxR4vK79Y3iR4W8dBJVYuhIAayspFNgWM8/FIjs8mEKy6UEfu/ANnvrhgNU+xs958CqlQMspTUkQ== 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=UDo+1H73DgXYzDsCCZ2auGmBGxFLa+5s40+S+3ByKtU=; b=iFlGloWJLGdY7WY5E7kghMRG+iRkS7IypAXFEOFEuGqusPCSKuIDcRQ5VRRk/mgDJhpnPVpVu8zL3jeRwhIq5ZLf90bGJyODFbZG/Gm2HcO06e/pdINgw160YzU1rUgFMUvNAfwwDr9eocqyZKTePp8a0bIfdJkSWuyuc/ZmFhif2s3u71zWv7QodC8LA5H8VDdi9PiDBJJGIv8Nmpo91Mz3ibmGaX2sc+7HU+TPhXy5bE7kC9pflTwAIhgUq/zEB225pg/6Dax2zlUqlk57veIsG3mFcKup744zdSr1tUDqojxcKYnqSDJWOlTxtt4FRN4eN/ysh25KObY+ya6y6w== 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=UDo+1H73DgXYzDsCCZ2auGmBGxFLa+5s40+S+3ByKtU=; b=uVWjhzpdrdZ2kSSy3jdTaj96KZoL0tI9TXmjDuN/CqOz+FVggSewISEiRW2fR14dwfnBwsGX9SCYJH5o4HzSi7LBEhnG4VXJ9/FfCso5u/7oqYqXERQ34cSA5nFLn7/frMTpF3cu98WYJd7+gePFit7GTmHhKxxhIfjtHXvXPHM= 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:40 +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:40 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH 11/13] net/nfp: improve modularazation of meter module Date: Wed, 20 Sep 2023 19:34:52 +0800 Message-Id: <20230920113454.739356-12-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: c6f17437-c5b9-4f92-4bea-08dbb9cdb75d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C7+dvUOxaJOLwxKjY5Rqz9fOlxYjTDMCJqS40vzShaIrWum+Zl/IvdfDzUDQAycff5391G0gn1l4qamX72DKMbnR/B8b+AstMB9v7euW+V2JscoeRtG73WWloC7lWYCmVCCVJ5XCBZIwwJuyl0yoUNCeiwzRvfJ/DL+EaHk+2U+Ho59+AR8E6+CPRFNoQYD990n3jT+hMy1xFZKwRKvihpF4LbYtKsM2wjmMssCNhqLv5Y24FkFTNoio81jIG7A873zfGQh4I+iKHhU5zNNWxiChxuC/XtS+L2VFRH74yL4Lignp4ZlPUhEKYY314u42+489VwDQcLb22BSa3RoQ26GVua5vzMhIsrZsiZsSTbJ79NaswJj/28bWrnfFKvqD6tQ7YJNU64/z2g1bwV75zEFAPQq7U/Dj5s3xS7Yu0HTdTlKAOHDVAIc3GTtSDP0/h4thiGjVe/Svf/XyPh2vq1oyHITkgp5V0fc9vTbiVcr6i1RSx8/vhhhiRzGwxI+hFerasH/hFJiE0NfaDzysEXu/mxZ5fowb7gZF4Nn3A0X5SdthfP1I/aWPguWSRnAjvsJpJUeLOOsngXwnn4GbYWrb+eRAQsQx5DXuoeHDaUHgLMz13dd6vCh6L9PQM715hRzJtZDRZbmQ4ZwNNopjxhjWCU/tfEu5w1/PmGnQ/uk= 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: li0azIjVIqptePXF4uG+XLueQLX65ZtAe513bBoNhrr1jctd6zD3NLhcw/pExdDLY0ZVenv2aFR39aX8qgf1mPz6jK0hqDeRYmHkziuXeJz2KfWSS1m+b1bvwAg10SoCaS/hxLxxnMxAH8IfQl2ry7qaRtZwopsg/q/tkhvRa36M1gL6PxaYD+u9mApaqJVg7Tr8thv1rP8+S9Ke+/NmEu0qt6Wl4vlmcoQdWvn9L4QRjNJZixVV4cgLitxGWMK4RsMSkN+Jo6Hq1mOxsisDjam2sPYORsvShjRC5nHKepvtd82gKjDDPh+woZr9M8rc2ZOtRlm7GRqe3PozBYut9PhJhYCer00uNNs6lKC5Y90jaAEoqPPUFLbTX+WhUjPPcIsWa2cnpM7Hx3fg2Grs6vN+kMqgviAIYvK8jvoDlLDzLjFCG3bsQ3SSKMYHW+I2VL31tqKItSAvpnFfRXsPRuYmthg2lblrLnH0I35A0DmyHU0EN5it/Gn5Poz56vsXMS1FU7ZaGCnULA/mwl3cISwZx9I2hdMZhKGFmgE9VKWWEAfGnqjqjwNuk5UhU5+t3bl4emdVy3LcCjACwIJORmA4xqHTK7czQvD0ugGLP/QTnHxwF8kf0TlVs637LztJzibt7UfmbuIA096K6ZibUF1ODnIRdXRyDOjRX4eYBztNhzLN//mU2mOAhczr9ycQyJujGN+VSAimbbNyULWCQoNb+HeO9YhAsbhAbNdNKiMIKg1rTWnbZhJxlnCOeAb1cuMfWUX53zuUmtx/jAKWqTptbcN/+bYJgWjWps7TlApSYH7tVO949fKVdxI4IYAA8kWV2Ej930gCPYATkGh2iJJFrO4CEvRGBZNQ2hTIon05Rm8NMCiKq34Wbk/gtnkq5d78wzIWQfphsigOmeie1xYABzLh3Ht5eukCPVFpxnote1FbOrQNcL4H9EqSQZRJhBVqO5HFzmmSjwXMOnPZ8nLPsiptpKO5H4XR3KcwI3jaZN7jDXPnTxXhSa/tFEoQ5Xwo7T7P2PuCssOi0ffj3T9N8u0uG1Qhd4StOp9B6sRIN4MXpIoN4fbMdI/WFvgl7Es3PF56CHYY8ZgR/knQ5YguMQcas3d6TEsoU+TqM571wYA77WGfUXtNHXjF7UOVxkW2wv1amqRm+aZVHK+1lOzl/X/+MrUFBm92BsDJKmV4uchk4vxF6AyqMoPZ2xedbIfsYZuyz1Egb4bdigcQ69dANXWdrP0lWUC2P7EqylZdD+t5qkHRLrLhL8nt4wF3pbwO7RLGjhtWFlBADbhVIFJhF9asWfHUTTb49VqfHUnMvcwLSEqltKkiW8wfi0NG+PUfk5VXJyl+LKywLaXKB1ZEq4tKUupmdZUyUxNsnwx/yCdev27kvxf92b5Jni8BtxJ0CLD8eKVRDuiekvYn5Y2T/7p51+GQz56nZtFmZDRXL1rOcDXH9Aqbf+0yDCYmYIbs8GqHakTC6ot8ez6VRKnrA0HwhY7B4wr6PkWiIUGijwWk6xaDKir8hAGzj2BkxXE41uzEipAoMRB/Q0pdIvBk0UIxdz+Rg/XVE4UiN1+rrK1eajtgzu84NBXsiowO0k08CG1oS4RQImgp1iSptQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6f17437-c5b9-4f92-4bea-08dbb9cdb75d 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:40.0906 (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: qr6p4uhjFnHiEcfoVqHz8pBPzHi0i0ahRtO6XSS7dNFmUCTGgbtEPzlOPdwi7ykhaIhGojpC1LexdtJ9mV56oOleEWopia4t+lUeOcRtVXg= 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_mtr.c | 16 ++++++++-------- drivers/net/nfp/nfp_mtr.h | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/net/nfp/nfp_mtr.c b/drivers/net/nfp/nfp_mtr.c index afc4de4cc7..255977ec22 100644 --- a/drivers/net/nfp/nfp_mtr.c +++ b/drivers/net/nfp/nfp_mtr.c @@ -3,17 +3,17 @@ * All rights reserved. */ -#include -#include -#include +#include "nfp_mtr.h" + #include +#include +#include -#include "nfp_common.h" -#include "nfp_mtr.h" -#include "nfp_logs.h" -#include "flower/nfp_flower.h" -#include "flower/nfp_flower_cmsg.h" #include "flower/nfp_flower_representor.h" +#include "nfp_logs.h" + +#define NFP_MAX_POLICY_CNT NFP_MAX_MTR_CNT +#define NFP_MAX_PROFILE_CNT NFP_MAX_MTR_CNT #define NFP_FL_QOS_PPS RTE_BIT32(15) #define NFP_FL_QOS_METER RTE_BIT32(10) diff --git a/drivers/net/nfp/nfp_mtr.h b/drivers/net/nfp/nfp_mtr.h index 4b1360cad8..7ab0324721 100644 --- a/drivers/net/nfp/nfp_mtr.h +++ b/drivers/net/nfp/nfp_mtr.h @@ -15,8 +15,6 @@ * The max count is 65536 defined by OF_METER_COUNT. */ #define NFP_MAX_MTR_CNT 65536 -#define NFP_MAX_POLICY_CNT NFP_MAX_MTR_CNT -#define NFP_MAX_PROFILE_CNT NFP_MAX_MTR_CNT /** * Struct nfp_mtr_profile - meter profile, stored in driver