From patchwork Fri Oct 27 02:59: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: 133459 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 8119A4320F; Fri, 27 Oct 2023 05:03:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 913B242E50; Fri, 27 Oct 2023 05:01:10 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2115.outbound.protection.outlook.com [40.107.220.115]) by mails.dpdk.org (Postfix) with ESMTP id BF5E942DF0 for ; Fri, 27 Oct 2023 05:00:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FRjbc9RNj6Jl6acWQWUQRf5xZX7QpWYLDGLkkvn+Zl+JFlImWjHjxnc8Rig0ArmGP7Yf1NVWSeU4IhUi0rzUTK5Dk27M0dR2Jk2T1ir8e7n1x5ZHS1Sb4wQPpXKbs+j9HtBIB4tmSpPOPKOQMKr9rk4dPjBKICgpTqiPBYQSV0W1autsxRDnGwcZtB92YidtcbC5RtAe3FF3375prMiQJoBaXMNbKRtFwrGgVVIejHWtRINFHpGfr3FXWfHckiKY1mGTPqHMooF7t48CKMJ6p58pGIMSeK+mQf7xzSHMjJLapDmukxGrmXpdZLXlDujJdzzbYMHOngf8wHtoUFnSNg== 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=MbOgDdmDw4PcVtgNTnm7mAp/yWzcnFt4LO8EZfeAq00=; b=nKeX48pz2FrHKaDX3gTRSVaNHxR1INmWwHDNFVnwHrAZ1mJSMFuQynzDK5MgqK4zrIMUI9aVhhtMO+u8muMH38Gd0QCQiiQjEcfpSKarEImK84oiRtX/yemNfuS860fjx8/iZsTQMmwk/tgj8cyu4PLQUi77Tu1XFAqDPtSZ3veXhupiHDYKX29TnbAVPOYbQRzz94CeUQ8og+aED0IT2IX40HmhYy61PUmWRPEOLuvyySmLl1XvNzOzOHm9LSOQXmINaUWBKl7PoS4+p8LYpThaB8ddNKLJgb9rBd99Ctl+odQ8Tmy9HLoRJlq1YXEIlTBg0vcFCE+H+Hk4EFDGDg== 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=MbOgDdmDw4PcVtgNTnm7mAp/yWzcnFt4LO8EZfeAq00=; b=wFTAE5Zerh6/I7uhoQUVk+2xSiyWLURdF02cbH5qc/JM6DF5clU7GE9w+7LchtYtYh7WmFO09+SK3rKBCS3JnxXOccHGu5R9S/EcsB/IjTTtYDJwoeAQpqJb9hXhwN0rTTGTKwHQek1VDorgNi3zKfq+NJ03hEeO8C3Qx6GDgKw= 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 DM6PR13MB4493.namprd13.prod.outlook.com (2603:10b6:5:1b9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Fri, 27 Oct 2023 03:00:55 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.022; Fri, 27 Oct 2023 03:00:55 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v4 16/24] common/nfp: move platform module Date: Fri, 27 Oct 2023 10:59:53 +0800 Message-Id: <20231027030001.602639-17-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231027030001.602639-1-chaoyong.he@corigine.com> References: <20231026064324.177531-1-chaoyong.he@corigine.com> <20231027030001.602639-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR08CA0065.namprd08.prod.outlook.com (2603:10b6:a03:117::42) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB4493:EE_ X-MS-Office365-Filtering-Correlation-Id: 2926b0a6-f40c-457d-643a-08dbd698efc6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +wnW7uXLykXRRyAJctMMmfI+jk+/N/ZD7uL0UdobbsJzR3GTBISFl8QfbrhQi0Mtl74wFiixKdE6UKzeiswvXGM4h3ZWmILzd7CeYMM1JVvZas+KelQKJ5ucNi7F9MSPFwAsrW9QchRN4BsF+0c4iAegAzZu1aD0c40N23iPkb7sCzNd7tchlnz3bVGyLfpFD+6kkKkYBWrpsXApve9wgbmGIchhfXceuYesSRMMhHrAULSJXoKpZ/+IJC5wniVdNbd3sX/CTgDa7I35GstDJC9/s6dNcL2f0D0KElRYgwj93XwM/OLj2ddpdreipwFwOPuQh3JaDrJpVLivXO+/rzIpSC6ZnFvq7szcKLWx2mohqbMeXigI1Kd11ernAQ/Walwm5KArP3HjqTF+ixUStFavFOFfLl7CE7U0OUjhvYcPKv9Ekr4ch79g6QQOPtTpP0yR3uC8uTJAZJm2hXsNUl6DlpQyg0MfC0CjtIkdUDcCMqNh93dgOEP0dvprdmtSn7z/iz4MSJaH3VOwx1B9lTGqDwlkms+psKBqnQ+1ugMZ/0klj6dN0usQNxGjBBFbB3Lb85q8YowhxUK/9GYav4XwbM8X4Kw1sqjPR0+YtBkz8Ae9LVd7jznls2JHb2WDmBK/Uedu5NNDTe4lPPCZOOSxoflnRgrzOGHXK0uhBrQ= 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)(396003)(136003)(366004)(346002)(376002)(39840400004)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38350700005)(83380400001)(4326008)(52116002)(2906002)(38100700002)(107886003)(44832011)(8936002)(26005)(2616005)(1076003)(36756003)(8676002)(54906003)(5660300002)(66476007)(6916009)(6506007)(316002)(6486002)(6512007)(41300700001)(66556008)(66946007)(86362001)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ysAlEjlWSI29qplSavzGU6ooKkKunqIszOw91CFBQlgW2NTUbtCwDnr3WLwHb9k2IHYglwjPEmZIMYVRGCjlxjZAeMTK6bkSwGkPW/LYx9t+P6dsBCcwj8TOkvC4FCBHxTIsYMFPa9sHJ2Piab7bp52/GjiXCql69RmM8uSx0tGJEMKxFnjbxHCVYhdRGBhnOs5ikWnd7Dp116DTrQJiZ8GMhUmfavB3i8Wi8G+uVKOrGFBMlRhdtZkCD7WyhHRe133/BWd/4SmeI5cWMLyFaREOB3NOhq7vyYk9+96NB3k0/FVUqRlbayl8iammuO1QU9Be4rsHDWapFVUBlpFNuVNFNVMtWv8W+Yo9TZ+vxOXvaoWmXWa8Oc6NcutUsfX+QAV0gzlTJGcQS5VAWlke9gUmxrURwK+POtZFqiJWReefsTKJdxz+VekToxayKjYGnkECUQsTPYFmbPwfURVk2NrgLcXsrmMsmsIs0tA99qVECQz4ZHajx9Rw2IEg8weyP2dpUbj7uaa7xJ0qvbm4QCTA7FptgIP/nXnBV/3MraZEsfrLNU19WiAHvzbzXt20M7Iih9BxF/yjQXg+MR1oVm0i4DNbKCJTRCM1MxrmHbH6Ou+aEgI3HI3Wv/TsYZAmUoQ8QhJm58NofJt8/2+It0eLIEhT5h2/0s1SZwHpPEob7rIdYcbRbR9d+14BCg0677BL7Hz2o2JD/vaQuRyeTfcW5WFFUvHWQyufQFTlh6rGmokq49tIOjUR0AIjqGKJhJUK2UDvGZVcIZl+wgx7uInneFKMEkPM8Z6Xsrwl7Vegf+RDK0GDbL5Xwieh9y2r0ZMgA91FUKUUaCl+1oLGSiEoQeQwPcTAaT0J7C/5AJVgjipVJPRHNoVzvVONtqkfeABXGETN0l9irS+FHYW+kqxZDkQnBMA8m3kMsBm5eIzIT7vs0TP0FubxQ2Etauc+dVUg1UED0nnYBM6vdtGF0EwSFiaus5wrOjuInetO1IFDcgP/zynGyCHkR8r8Qdd83sPIEIGigohi4h7IybtwBHuHnjSAvCouveTyx2y0/Yr0uSGVOF8mdKhb2a8yX1KzGMrf5wMIJnxYoTlzbwDjb+Imtljl925WTJvT0/oQB2XvBU//Ejs3ncIwUcviBqzi0jsAMUmisk7ThUG5vRM8RZFnCPOcvdJW/UBU1TL97MwZYrQD23533ctjcoz3SV3dYUVsYOzQqQ4HEqeKXneHRwmtDuvO+CdIDEiJewJqErOz2WuIJVlLICQkWEYyPSwG5gaJE0aevSGNF6badxYm562RJASWcZBHjMUhwbqdD21JpQMaaPj180VjlJnE+8PYvmCp7ZhQmL3gKtYzVwpj5tkJmmHLGxrNi9Mur8apPaQ+ODWvZK4y/AJsm75K3+wXBRxXtCRJTlpU1fzSmoOqINSZNquX5HF9B1J5RVY1U8R6zfY/aWoev9xkTs11/G/XoiOZCjHLYHaVK1urHlfqAGNaAPKtXuU93l8j1JQhw8ihZhNrp8dYpVMFUEp/+HFm7jI59uUFhyFXcY3AednEKMPZiI77dOncZpuuH6VVzM5zfL87VzhKdNC/BctpwoKUrtHiCE3A9f8zHjTkOtdwow== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2926b0a6-f40c-457d-643a-08dbd698efc6 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2023 03:00:55.1768 (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: wHMGgGxVpml6CgmytgHXV4UfqmFLv/ChgW/BQx0RTs9E6OuCw0VKL8vlRT+Hm3YorX8UpmrWf9uig+2reZLdMu35UWwOgB/KLOKwsifqH80= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4493 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 Move the platform module to the common library. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/{net/nfp/nfpcore => common/nfp}/nfp_platform.h | 0 drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 2 +- drivers/net/nfp/nfp_net_ctrl.c | 3 +-- drivers/net/nfp/nfpcore/nfp_cppcore.c | 3 ++- drivers/net/nfp/nfpcore/nfp_dev.c | 3 +-- drivers/net/nfp/nfpcore/nfp_nsp.c | 2 +- drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 3 ++- 7 files changed, 8 insertions(+), 8 deletions(-) rename drivers/{net/nfp/nfpcore => common/nfp}/nfp_platform.h (100%) diff --git a/drivers/net/nfp/nfpcore/nfp_platform.h b/drivers/common/nfp/nfp_platform.h similarity index 100% rename from drivers/net/nfp/nfpcore/nfp_platform.h rename to drivers/common/nfp/nfp_platform.h diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index 3f8d25aa29..10e6982c95 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -6,10 +6,10 @@ #include "nfp_nfdk.h" #include +#include #include #include "../flower/nfp_flower.h" -#include "../nfpcore/nfp_platform.h" #include "../nfp_logs.h" #define NFDK_TX_DESC_GATHER_MAX 17 diff --git a/drivers/net/nfp/nfp_net_ctrl.c b/drivers/net/nfp/nfp_net_ctrl.c index 8848fa38fe..5135a1ad27 100644 --- a/drivers/net/nfp/nfp_net_ctrl.c +++ b/drivers/net/nfp/nfp_net_ctrl.c @@ -6,8 +6,7 @@ #include "nfp_net_ctrl.h" #include - -#include "nfpcore/nfp_platform.h" +#include #include "nfp_logs.h" #include "nfp_net_common.h" diff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c index f9b08a12b6..0e6045f2f0 100644 --- a/drivers/net/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c @@ -5,8 +5,9 @@ #include "nfp_cpp.h" +#include + #include "nfp_logs.h" -#include "nfp_platform.h" #include "nfp_target.h" #include "nfp6000/nfp6000.h" #include "nfp6000/nfp_xpb.h" diff --git a/drivers/net/nfp/nfpcore/nfp_dev.c b/drivers/net/nfp/nfpcore/nfp_dev.c index 7799fa699a..f29b7e0711 100644 --- a/drivers/net/nfp/nfpcore/nfp_dev.c +++ b/drivers/net/nfp/nfpcore/nfp_dev.c @@ -5,10 +5,9 @@ #include "nfp_dev.h" +#include #include -#include "nfp_platform.h" - /* * Note: The value of 'max_qc_size' is different from kernel driver, * because DPDK use 'uint16_t' as the data type. diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c index 5b804f6174..a680b972b8 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp.c @@ -5,10 +5,10 @@ #include "nfp_nsp.h" +#include #include #include "nfp_logs.h" -#include "nfp_platform.h" #include "nfp_resource.h" /* Offsets relative to the CSR base */ diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c index cc472907ca..75f6d40fea 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c @@ -3,9 +3,10 @@ * All rights reserved. */ +#include + #include "nfp_logs.h" #include "nfp_nsp.h" -#include "nfp_platform.h" #define NSP_ETH_NBI_PORT_COUNT 24 #define NSP_ETH_MAX_COUNT (2 * NSP_ETH_NBI_PORT_COUNT)