Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/125881/?format=api
{ "id": 125881, "url": "https://patches.dpdk.org/api/patches/125881/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230410110015.2973660-6-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230410110015.2973660-6-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230410110015.2973660-6-chaoyong.he@corigine.com", "date": "2023-04-10T11:00:07", "name": "[05/13] net/nfp: use generic macros for array size and to set bits", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "15f0487eaf9ca3d19416a366e4095dbc201cb5f1", "submitter": { "id": 2554, "url": "https://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230410110015.2973660-6-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 27651, "url": "https://patches.dpdk.org/api/series/27651/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=27651", "date": "2023-04-10T11:00:02", "name": "Sync the kernel driver logic", "version": 1, "mbox": "https://patches.dpdk.org/series/27651/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/125881/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/125881/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 4AF2142910;\n\tMon, 10 Apr 2023 13:01:39 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C123642D31;\n\tMon, 10 Apr 2023 13:01:02 +0200 (CEST)", "from NAM12-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam12on2125.outbound.protection.outlook.com [40.107.243.125])\n by mails.dpdk.org (Postfix) with ESMTP id 9A3D042D0E\n for <dev@dpdk.org>; Mon, 10 Apr 2023 13:01:00 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by DM6PR13MB3882.namprd13.prod.outlook.com (2603:10b6:5:22a::22) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.31; Mon, 10 Apr\n 2023 11:00:58 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::baa6:b49:d2f4:c60e]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::baa6:b49:d2f4:c60e%4]) with mapi id 15.20.6277.036; Mon, 10 Apr 2023\n 11:00:58 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=GEgEMWHa3ez86ywRU69VcNv7L2fHMssNZFWPQW3H8C+ds7thUGuxranzu/ohJFpJkHoJhfoUpqnXkc4rnvdwR7S0RpmR2PjC2CykRrW6sAssUCmvPOUeh9dI22h69Zm/OyL5TMpNzqS6WmFgXQX6eTYLTOs2JNrQ9MYZIVEWuFR2dF5sTlFlofy2wrjBVru8VWvtoATTUJew1IOsYCFSXO1WamlkRbqjv9gXdB4RsQmPmcRhJk/fhA7T6oK0/lqgLHZWtZuTMkuajm64iN8mKMsydXUEi2UBWJ4PReI2npnSJ6vvrLOwtpb65yJOkxO1LOYisGML1O8uVrbsBFWSIg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=Ezn3XPc1fsobYiKH5SNbqVW0ghyb3z0kpL3cxgJ1JWc=;\n b=OfsmpJaWZ59DMpB9J+uUo7GR9w+0IM6ez0KlJnovL0WNTNKXfiyOIAK+9CIh4Nqnbq/GGj3Os6oKKLNaqi091IbwTbSwGdb4xnJCMICeb7LoFGpMNGEdmJFpXpfVsFWxJKyAO7lgAd/lAhOKcUINR6hm5FgaQHhtZbph+pMha9Tt8gPf14ta/3gFDwzq5nn2sDwgosln+CHqpSDIdoR4jPDmCsR69rjHIpiPEauo2pDD9OQriLiTD3EZRo/Fdamc0TmCuSBvsojQL1iwQb1iYc6SkWmgxWEUa/4qpaYNWicCOPsqhbmj02l+7PVCiAEAzw4lVl4x5FaQ3TDHwBRXFw==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=Ezn3XPc1fsobYiKH5SNbqVW0ghyb3z0kpL3cxgJ1JWc=;\n b=dRPAP47hy7lH5wO9LGkAMY4oOeMVDwYqPSYrrYNQRvnwGORMH4QT4OpMAO3/oz6r/LBWpa9gY+qNkiKjDeJidddGCfpznaTosaRnGNs3MsLC0VNHPHciwQ6QOV6ZlCz5DNUSxgkzazA0sG10X+fQ9n0V6mg2Wj8nvKO6gYccaIQ=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com, niklas.soderlund@corigine.com,\n Chaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH 05/13] net/nfp: use generic macros for array size and to set\n bits", "Date": "Mon, 10 Apr 2023 19:00:07 +0800", "Message-Id": "<20230410110015.2973660-6-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230410110015.2973660-1-chaoyong.he@corigine.com>", "References": "<20230410110015.2973660-1-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SI2PR01CA0040.apcprd01.prod.exchangelabs.com\n (2603:1096:4:193::14) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (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": "cda33380-f6d8-4682-6e4e-08db39b2dd51", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n cGt6AC7xRJ/5lzwh9TFWd35knIt70Ie41puakNqULuXS5wmQEu5i5KMK589TjEgJBt7pqJOB+WAcC+RsfrBN4rx01l3bepLQPaC4xUrdpEHp7dEf9FyGfOcithFZ+meqQm+004f53nnNwU8VEqBmG0lw10mGM3S9l4/xrjSAfVPGbEyTeOWtMwiELvWlNfpoSJN5/heL6epdGv9Te7BEid6pKHa9lEJUX/r7bv5OTYFkTFFVhytqJQp3JH6kQpekiz+/Kaew55oM5497tkhX/w8widgywcztyimtD3iY0M//Y6lHFLYoSlWSnnExpY1l7Dn/5gVCx+e8AbQ5EDSLwPS/0Rg3pUcLnQFNctpDo6BOXAnnF3kERd0+MYha4wvmCLx7lxfGFe+ALbwWm+cbCntxD7gBvvXc17RevLvgjATg1wSJlNYLMjIVD1TxOozWxq8bzJCKywNEQhV1U5N3kTN7H4dWbpZAlmDT6RLtcir8nOe9xTl5NqIwyLLg/eFeKHhQfZ7JDpAyYTcYOx6rx1BkorH4d1Ci0XjRm0lht4CEKfJIfpIOX2/Pfb8/7PyYCy+/rUS5NMYSXmSzTmutQJ46l9OB+QbzVaVeKchyaI5phoRJNPKdCuz6mKbG35zKzgot5SJVD5lOO74CaatMhg==", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230028)(4636009)(396003)(39840400004)(366004)(376002)(136003)(346002)(451199021)(316002)(86362001)(66556008)(66574015)(66476007)(478600001)(83380400001)(66946007)(38100700002)(38350700002)(36756003)(186003)(6512007)(4326008)(8676002)(2616005)(6916009)(41300700001)(2906002)(1076003)(6506007)(26005)(107886003)(8936002)(52116002)(30864003)(6666004)(5660300002)(6486002)(44832011)(41533002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?oZ4iO2dM/tIV2jOp3JeouNC/UcI+?=\n\t=?utf-8?q?hFcBC+WyLjLrtdvKU01SYOCfO0XM5+lpB/fIA/5w/DD4xi65rQJm7Ku/+5ke4vI2M?=\n\t=?utf-8?q?olmpRgOsGhqIXPioCDJ3bPesZ1UGj7MeEs5EEGkNCtYIMA/ioniWNxeeH3dCGmAoR?=\n\t=?utf-8?q?OjVmYSZrmizlNGcfhg+ObJWA14hUfXCNf5Ggt++mJPnceqmECLQH0Pau49ffy29vH?=\n\t=?utf-8?q?QNpKSH2svMcBbdPTZUEMP9ZQmSvDkZsQGIjHPkuwf94CLwXVkYQ/vTHmZeVDKWWKw?=\n\t=?utf-8?q?Wqmfn8FtNDgAoe64QOv4nZJnYt+sUtIhcKXWbdTphrlm5+2gKZorFx4dsTG3QRzs2?=\n\t=?utf-8?q?1j2pEmtWg+6Ht7Re7NUdw9JZM1SJ0RBXJ42x7YnTGfASlSJ+Pm/1UJ0xQRapYmePN?=\n\t=?utf-8?q?EyBEbCkm9sr84N75UszEghrCuhzPlPEBtuBqz3y2PQ5UHhdOXqntxpYTvrgHk9LIR?=\n\t=?utf-8?q?23WiVSnqECyU83o8Lba1TJwtqB3kDz+FEf7PwZXApT0lugYASjCel40I/ZJ1Fgizb?=\n\t=?utf-8?q?6RJFfmMj4WTpovyv9H/KleKL5VXku0YMGSWXynNmO0CIIXqNNZoHaH8gl+8S9dnsc?=\n\t=?utf-8?q?VQb657d6kErawjaQsowllBIKtLk6gQLdZBYXCupZa7BhitRxWL0QodxTPuv4T2+8z?=\n\t=?utf-8?q?m7Z6NlRMpbPD9LgPJErNYuBzc2AGU91jJFiuALNjKDcrkDa6MednxR+vt6sXrCwgE?=\n\t=?utf-8?q?3MPnnCxmJWJ6UyY6pK51JTIy5c3gZ0xsifMNNQiYWb3h9sBEJsWUvDzMZEoxCJR9X?=\n\t=?utf-8?q?ReZTO5U4TG6h480vODFY3PITrUmikjpvhy1v/vvzkI+rp7BSSYV+8vgTPrVE7Nix+?=\n\t=?utf-8?q?XKWIg+KgqJmLanSWPoFBedZir/9dZZLnua+B3KcV8AA9SaTZ+qyVww0sSEWSSmviO?=\n\t=?utf-8?q?4YlZJG4dD6vPXAmGgB0lDQ497QXMeVMk2fDKZAzoYO3LHZttt9B+OeolQhMli2YnQ?=\n\t=?utf-8?q?Ay7evXHUUiFoVy78zyqrrDRa6UiUMPWDkBqW+6L8rB/LoMKLuaZZZTuTdfJLIP6XZ?=\n\t=?utf-8?q?lirbovU16rEdoLJb4el6/t2urt7y+N499FWAx65ZvJW2FffFGOi0SfOnxL/YTUh7T?=\n\t=?utf-8?q?CoG5h5ajz/mPYKfcnwbXmPFwINCMbCY8hDLgKNWvxb8UROdfeq0zO0YGL5DyEZ/PG?=\n\t=?utf-8?q?Mm5wNPVAgPv0T5xbsiZjQybsFBKe5ezs2FDr6N0vUlIMf05gHCrSQ32dbWnzyBPmb?=\n\t=?utf-8?q?fzHt0PJ7w/nA4rUVaR4n6C1QLhEpweQlmBFlC7V+M/Dh5m2HjcvByQ+DgLfwwm9d3?=\n\t=?utf-8?q?uyRPYh5vYbuD9uVjOXVlFaANwfL2dHLh2CK0vPXX0DN+Lc6/Yf8Vug7oe1NfAzHUS?=\n\t=?utf-8?q?5R4ZTEnSlG3khw4JiESwAdieGrJ7sCT5QTra1jBPkTodoUhMW77o6xCOKKcNOjplu?=\n\t=?utf-8?q?5sUzby7NWX6qxXOznLxxaPU5QmZUvxaWQgSiuowB98UVOSbqi7bkXw3k6HPx0Vk+v?=\n\t=?utf-8?q?EzRZ+fZl97tkVpUxskt7mQQMMO3Q6VWtDbjT+ACSTD8JJP+BuBk8r6P1kDoY4N8Fc?=\n\t=?utf-8?q?Mn9SRaPUVlC04M+LTZmHEken90Q6nI4/Vw=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n cda33380-f6d8-4682-6e4e-08db39b2dd51", "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:58.6474 (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": "\n GrtO39isrzEaJypkh5TbVrANxF5xk25lLnFpgWyh3dFOb+PvWw9fKoOz8KWnV66+5xdI8kcp2XNpitqNG37EiUNWfcEuW0Od3vyTWZZXEts=", "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 <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Instead of using NFP specific macros for array size and to set bits use\nthe generic ones provided by DPDK.\n\nBy moving some include directives for system header files directly to\nthe source files that depend on them, the header file nfp_platform.h\ndefining the NFP specific macros can be removed.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/nfp_cpp_bridge.c | 5 +--\n drivers/net/nfp/nfp_rxtx.c | 1 -\n drivers/net/nfp/nfp_rxtx.h | 10 +++---\n .../net/nfp/nfpcore/nfp-common/nfp_platform.h | 29 ----------------\n .../net/nfp/nfpcore/nfp-common/nfp_resid.h | 4 ---\n drivers/net/nfp/nfpcore/nfp_cpp.h | 1 -\n drivers/net/nfp/nfpcore/nfp_cppcore.c | 3 +-\n drivers/net/nfp/nfpcore/nfp_hwinfo.h | 2 +-\n drivers/net/nfp/nfpcore/nfp_nffw.c | 4 +--\n drivers/net/nfp/nfpcore/nfp_nffw.h | 1 -\n drivers/net/nfp/nfpcore/nfp_nsp.c | 2 +-\n drivers/net/nfp/nfpcore/nfp_nsp.h | 12 +++----\n drivers/net/nfp/nfpcore/nfp_nsp_cmds.c | 2 +-\n drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 34 +++++++++----------\n drivers/net/nfp/nfpcore/nfp_target.h | 1 -\n 15 files changed, 38 insertions(+), 73 deletions(-)\n delete mode 100644 drivers/net/nfp/nfpcore/nfp-common/nfp_platform.h", "diff": "diff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c\nindex 8e29cfb6d3..78a680453b 100644\n--- a/drivers/net/nfp/nfp_cpp_bridge.c\n+++ b/drivers/net/nfp/nfp_cpp_bridge.c\n@@ -13,6 +13,9 @@\n * Netronome vNIC DPDK Poll-Mode Driver: CPP Bridge\n */\n \n+#include <unistd.h>\n+#include <sys/ioctl.h>\n+\n #include <rte_service_component.h>\n \n #include \"nfpcore/nfp_cpp.h\"\n@@ -22,8 +25,6 @@\n #include \"nfp_logs.h\"\n #include \"nfp_cpp_bridge.h\"\n \n-#include <sys/ioctl.h>\n-\n /* Prototypes */\n static int nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp);\n static int nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp);\ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex bc73026825..16a124fd7d 100644\n--- a/drivers/net/nfp/nfp_rxtx.c\n+++ b/drivers/net/nfp/nfp_rxtx.c\n@@ -22,7 +22,6 @@\n #include \"nfp_logs.h\"\n #include \"nfpcore/nfp_mip.h\"\n #include \"nfpcore/nfp_rtsym.h\"\n-#include \"nfpcore/nfp-common/nfp_platform.h\"\n \n static int\n nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq)\ndiff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h\nindex 5e651518ed..f016bf732c 100644\n--- a/drivers/net/nfp/nfp_rxtx.h\n+++ b/drivers/net/nfp/nfp_rxtx.h\n@@ -120,11 +120,11 @@ struct nfp_meta_parsed {\n #define NFDK_DESC_TX_TYPE_TSO 2\n #define NFDK_DESC_TX_TYPE_SIMPLE 8\n #define NFDK_DESC_TX_TYPE_GATHER 1\n-#define NFDK_DESC_TX_EOP BIT(14)\n-#define NFDK_DESC_TX_CHAIN_META BIT(3)\n-#define NFDK_DESC_TX_ENCAP BIT(2)\n-#define NFDK_DESC_TX_L4_CSUM BIT(1)\n-#define NFDK_DESC_TX_L3_CSUM BIT(0)\n+#define NFDK_DESC_TX_EOP RTE_BIT32(14)\n+#define NFDK_DESC_TX_CHAIN_META RTE_BIT32(3)\n+#define NFDK_DESC_TX_ENCAP RTE_BIT32(2)\n+#define NFDK_DESC_TX_L4_CSUM RTE_BIT32(1)\n+#define NFDK_DESC_TX_L3_CSUM RTE_BIT32(0)\n \n #define NFDK_TX_MAX_DATA_PER_DESC 0x00004000\n #define NFDK_TX_DESC_GATHER_MAX 17\ndiff --git a/drivers/net/nfp/nfpcore/nfp-common/nfp_platform.h b/drivers/net/nfp/nfpcore/nfp-common/nfp_platform.h\ndeleted file mode 100644\nindex 9fa52074f0..0000000000\n--- a/drivers/net/nfp/nfpcore/nfp-common/nfp_platform.h\n+++ /dev/null\n@@ -1,29 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2018 Netronome Systems, Inc.\n- * All rights reserved.\n- */\n-\n-#ifndef __NFP_PLATFORM_H__\n-#define __NFP_PLATFORM_H__\n-\n-#include <fcntl.h>\n-#include <unistd.h>\n-#include <stdint.h>\n-#include <string.h>\n-#include <stdlib.h>\n-#include <ctype.h>\n-#include <inttypes.h>\n-#include <sys/stat.h>\n-#include <limits.h>\n-#include <errno.h>\n-\n-#ifndef BIT_ULL\n-#define BIT(x) (1 << (x))\n-#define BIT_ULL(x) (1ULL << (x))\n-#endif\n-\n-#ifndef ARRAY_SIZE\n-#define ARRAY_SIZE(x) RTE_DIM(x)\n-#endif\n-\n-#endif /* __NFP_PLATFORM_H__ */\ndiff --git a/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h b/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h\nindex ac2bf0335d..5445d4dac8 100644\n--- a/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h\n+++ b/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h\n@@ -11,10 +11,6 @@\n #define _NFP_RESID_NO_C_FUNC\n #endif\n \n-#ifndef _NFP_RESID_NO_C_FUNC\n-#include \"nfp_platform.h\"\n-#endif\n-\n /*\n * NFP Chip Architectures\n *\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h\nindex 437dcdf942..d657a7c164 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp.h\n@@ -8,7 +8,6 @@\n \n #include <ethdev_pci.h>\n \n-#include \"nfp-common/nfp_platform.h\"\n #include \"nfp-common/nfp_resid.h\"\n \n struct nfp_cpp_mutex;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c\nindex 97cf16c801..681ec93b96 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c\n@@ -8,6 +8,7 @@\n #include <stdio.h>\n #include <string.h>\n #include <stdlib.h>\n+#include <unistd.h>\n #include <sys/types.h>\n \n #include <rte_byteorder.h>\n@@ -565,7 +566,7 @@ nfp_cpp_alloc(struct rte_pci_device *dev, int driver_lock_needed)\n \t\tuint32_t xpbaddr;\n \t\tsize_t tgt;\n \n-\t\tfor (tgt = 0; tgt < ARRAY_SIZE(cpp->imb_cat_table); tgt++) {\n+\t\tfor (tgt = 0; tgt < RTE_DIM(cpp->imb_cat_table); tgt++) {\n \t\t\t/* Hardcoded XPB IMB Base, island 0 */\n \t\t\txpbaddr = 0x000a0000 + (tgt * 4);\n \t\t\terr = nfp_xpb_readl(cpp, xpbaddr,\ndiff --git a/drivers/net/nfp/nfpcore/nfp_hwinfo.h b/drivers/net/nfp/nfpcore/nfp_hwinfo.h\nindex ccc616321f..a3da7512db 100644\n--- a/drivers/net/nfp/nfpcore/nfp_hwinfo.h\n+++ b/drivers/net/nfp/nfpcore/nfp_hwinfo.h\n@@ -63,7 +63,7 @@\n \n #define NFP_HWINFO_VERSION_1 ('H' << 24 | 'I' << 16 | 1 << 8 | 0 << 1 | 0)\n #define NFP_HWINFO_VERSION_2 ('H' << 24 | 'I' << 16 | 2 << 8 | 0 << 1 | 0)\n-#define NFP_HWINFO_VERSION_UPDATING\tBIT(0)\n+#define NFP_HWINFO_VERSION_UPDATING\tRTE_BIT32(0)\n \n struct nfp_hwinfo {\n \tuint8_t start[0];\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c\nindex bead4f3341..07d63900dc 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nffw.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nffw.c\n@@ -61,9 +61,9 @@ nffw_fwinfo_mip_offset_get(const struct nffw_fwinfo *fi)\n }\n \n #define NFP_IMB_TGTADDRESSMODECFG_MODE_of(_x)\t\t(((_x) >> 13) & 0x7)\n-#define NFP_IMB_TGTADDRESSMODECFG_ADDRMODE\t\tBIT(12)\n+#define NFP_IMB_TGTADDRESSMODECFG_ADDRMODE\t\tRTE_BIT32(12)\n #define NFP_IMB_TGTADDRESSMODECFG_ADDRMODE_32_BIT\t0\n-#define NFP_IMB_TGTADDRESSMODECFG_ADDRMODE_40_BIT\tBIT(12)\n+#define NFP_IMB_TGTADDRESSMODECFG_ADDRMODE_40_BIT\tRTE_BIT32(12)\n \n static int\n nfp_mip_mu_locality_lsb(struct nfp_cpp *cpp)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nffw.h b/drivers/net/nfp/nfpcore/nfp_nffw.h\nindex 3bbdf1c138..9f24bd2269 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nffw.h\n+++ b/drivers/net/nfp/nfpcore/nfp_nffw.h\n@@ -6,7 +6,6 @@\n #ifndef __NFP_NFFW_H__\n #define __NFP_NFFW_H__\n \n-#include \"nfp-common/nfp_platform.h\"\n #include \"nfp_cpp.h\"\n \n /*\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c\nindex d8abaf1d52..1f6b7bd85c 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp.c\n@@ -61,7 +61,7 @@ nfp_nsp_print_extended_error(uint32_t ret_val)\n \tif (ret_val == 0)\n \t\treturn;\n \n-\tfor (i = 0; i < (int)ARRAY_SIZE(nsp_errors); i++)\n+\tfor (i = 0; i < (int)RTE_DIM(nsp_errors); i++)\n \t\tif (ret_val == (uint32_t)nsp_errors[i].code)\n \t\t\tPMD_DRV_LOG(ERR, \"err msg: %s\", nsp_errors[i].msg);\n }\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp.h b/drivers/net/nfp/nfpcore/nfp_nsp.h\nindex 2184c15b4c..50cdec3a58 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp.h\n@@ -40,12 +40,12 @@\n #define NSP_STATUS_MINOR\tGENMASK_ULL(43, 32)\n #define NSP_STATUS_CODE\tGENMASK_ULL(31, 16)\n #define NSP_STATUS_RESULT\tGENMASK_ULL(15, 8)\n-#define NSP_STATUS_BUSY\tBIT_ULL(0)\n+#define NSP_STATUS_BUSY\tRTE_BIT64(0)\n \n #define NSP_COMMAND\t\t0x08\n #define NSP_COMMAND_OPTION\tGENMASK_ULL(63, 32)\n #define NSP_COMMAND_CODE\tGENMASK_ULL(31, 16)\n-#define NSP_COMMAND_START\tBIT_ULL(0)\n+#define NSP_COMMAND_START\tRTE_BIT64(0)\n \n /* CPP address to retrieve the data from */\n #define NSP_BUFFER\t\t0x10\n@@ -152,10 +152,10 @@ enum nfp_eth_fec {\n \tNFP_FEC_DISABLED_BIT,\n };\n \n-#define NFP_FEC_AUTO\t\tBIT(NFP_FEC_AUTO_BIT)\n-#define NFP_FEC_BASER\t\tBIT(NFP_FEC_BASER_BIT)\n-#define NFP_FEC_REED_SOLOMON\tBIT(NFP_FEC_REED_SOLOMON_BIT)\n-#define NFP_FEC_DISABLED\tBIT(NFP_FEC_DISABLED_BIT)\n+#define NFP_FEC_AUTO\t\tRTE_BIT32(NFP_FEC_AUTO_BIT)\n+#define NFP_FEC_BASER\t\tRTE_BIT32(NFP_FEC_BASER_BIT)\n+#define NFP_FEC_REED_SOLOMON\tRTE_BIT32(NFP_FEC_REED_SOLOMON_BIT)\n+#define NFP_FEC_DISABLED\tRTE_BIT32(NFP_FEC_DISABLED_BIT)\n \n #define ETH_ALEN\t6\n \ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\nindex 15f6f7002d..21b338461e 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\n@@ -83,7 +83,7 @@ nfp_hwmon_read_sensor(struct nfp_cpp *cpp, enum nfp_nsp_sensor_id id, long *val)\n \tif (nsp == NULL)\n \t\treturn -EIO;\n \n-\tret = nfp_nsp_read_sensors(nsp, BIT(id), &s, sizeof(s));\n+\tret = nfp_nsp_read_sensors(nsp, RTE_BIT32(id), &s, sizeof(s));\n \tnfp_nsp_close(nsp);\n \n \tif (ret < 0)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\nindex 578120636d..f8d1416d4b 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n@@ -44,30 +44,30 @@\n #define NSP_ETH_PORT_INDEX\t\tGENMASK_ULL(15, 8)\n #define NSP_ETH_PORT_LABEL\t\tGENMASK_ULL(53, 48)\n #define NSP_ETH_PORT_PHYLABEL\t\tGENMASK_ULL(59, 54)\n-#define NSP_ETH_PORT_FEC_SUPP_BASER\tBIT_ULL(60)\n-#define NSP_ETH_PORT_FEC_SUPP_RS\tBIT_ULL(61)\n+#define NSP_ETH_PORT_FEC_SUPP_BASER\tRTE_BIT64(60)\n+#define NSP_ETH_PORT_FEC_SUPP_RS\tRTE_BIT64(61)\n \n #define NSP_ETH_PORT_LANES_MASK\t\trte_cpu_to_le_64(NSP_ETH_PORT_LANES)\n \n-#define NSP_ETH_STATE_CONFIGURED\tBIT_ULL(0)\n-#define NSP_ETH_STATE_ENABLED\t\tBIT_ULL(1)\n-#define NSP_ETH_STATE_TX_ENABLED\tBIT_ULL(2)\n-#define NSP_ETH_STATE_RX_ENABLED\tBIT_ULL(3)\n+#define NSP_ETH_STATE_CONFIGURED\tRTE_BIT64(0)\n+#define NSP_ETH_STATE_ENABLED\t\tRTE_BIT64(1)\n+#define NSP_ETH_STATE_TX_ENABLED\tRTE_BIT64(2)\n+#define NSP_ETH_STATE_RX_ENABLED\tRTE_BIT64(3)\n #define NSP_ETH_STATE_RATE\t\tGENMASK_ULL(11, 8)\n #define NSP_ETH_STATE_INTERFACE\t\tGENMASK_ULL(19, 12)\n #define NSP_ETH_STATE_MEDIA\t\tGENMASK_ULL(21, 20)\n-#define NSP_ETH_STATE_OVRD_CHNG\t\tBIT_ULL(22)\n+#define NSP_ETH_STATE_OVRD_CHNG\t\tRTE_BIT64(22)\n #define NSP_ETH_STATE_ANEG\t\tGENMASK_ULL(25, 23)\n #define NSP_ETH_STATE_FEC\t\tGENMASK_ULL(27, 26)\n \n-#define NSP_ETH_CTRL_CONFIGURED\t\tBIT_ULL(0)\n-#define NSP_ETH_CTRL_ENABLED\t\tBIT_ULL(1)\n-#define NSP_ETH_CTRL_TX_ENABLED\t\tBIT_ULL(2)\n-#define NSP_ETH_CTRL_RX_ENABLED\t\tBIT_ULL(3)\n-#define NSP_ETH_CTRL_SET_RATE\t\tBIT_ULL(4)\n-#define NSP_ETH_CTRL_SET_LANES\t\tBIT_ULL(5)\n-#define NSP_ETH_CTRL_SET_ANEG\t\tBIT_ULL(6)\n-#define NSP_ETH_CTRL_SET_FEC\t\tBIT_ULL(7)\n+#define NSP_ETH_CTRL_CONFIGURED\t\tRTE_BIT64(0)\n+#define NSP_ETH_CTRL_ENABLED\t\tRTE_BIT64(1)\n+#define NSP_ETH_CTRL_TX_ENABLED\t\tRTE_BIT64(2)\n+#define NSP_ETH_CTRL_RX_ENABLED\t\tRTE_BIT64(3)\n+#define NSP_ETH_CTRL_SET_RATE\t\tRTE_BIT64(4)\n+#define NSP_ETH_CTRL_SET_LANES\t\tRTE_BIT64(5)\n+#define NSP_ETH_CTRL_SET_ANEG\t\tRTE_BIT64(6)\n+#define NSP_ETH_CTRL_SET_FEC\t\tRTE_BIT64(7)\n \n /* Which connector port. */\n #define PORT_TP\t\t\t0x00\n@@ -139,7 +139,7 @@ nfp_eth_rate2speed(enum nfp_eth_rate rate)\n {\n \tint i;\n \n-\tfor (i = 0; i < (int)ARRAY_SIZE(nsp_eth_rate_tbl); i++)\n+\tfor (i = 0; i < (int)RTE_DIM(nsp_eth_rate_tbl); i++)\n \t\tif (nsp_eth_rate_tbl[i].rate == rate)\n \t\t\treturn nsp_eth_rate_tbl[i].speed;\n \n@@ -151,7 +151,7 @@ nfp_eth_speed2rate(unsigned int speed)\n {\n \tint i;\n \n-\tfor (i = 0; i < (int)ARRAY_SIZE(nsp_eth_rate_tbl); i++)\n+\tfor (i = 0; i < (int)RTE_DIM(nsp_eth_rate_tbl); i++)\n \t\tif (nsp_eth_rate_tbl[i].speed == speed)\n \t\t\treturn nsp_eth_rate_tbl[i].rate;\n \ndiff --git a/drivers/net/nfp/nfpcore/nfp_target.h b/drivers/net/nfp/nfpcore/nfp_target.h\nindex 24417fb315..accedde1f7 100644\n--- a/drivers/net/nfp/nfpcore/nfp_target.h\n+++ b/drivers/net/nfp/nfpcore/nfp_target.h\n@@ -7,7 +7,6 @@\n #define NFP_TARGET_H\n \n #include \"nfp-common/nfp_resid.h\"\n-#include \"nfp-common/nfp_platform.h\"\n #include \"nfp_cpp.h\"\n \n #define P32 1\n", "prefixes": [ "05/13" ] }