Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131537/?format=api
{ "id": 131537, "url": "http://patches.dpdk.org/api/patches/131537/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230918024612.1600536-4-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://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": "<20230918024612.1600536-4-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230918024612.1600536-4-chaoyong.he@corigine.com", "date": "2023-09-18T02:45:49", "name": "[v4,03/26] net/nfp: unify the type of integer variable", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "5972f11303f95f0ef60599771f6d4258b1e720c1", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230918024612.1600536-4-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29531, "url": "http://patches.dpdk.org/api/series/29531/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29531", "date": "2023-09-18T02:45:46", "name": "refact the nfpcore module", "version": 4, "mbox": "http://patches.dpdk.org/series/29531/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/131537/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/131537/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 F1E11425C9;\n\tMon, 18 Sep 2023 04:47:37 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3DC8940A7F;\n\tMon, 18 Sep 2023 04:47:23 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2121.outbound.protection.outlook.com [40.107.244.121])\n by mails.dpdk.org (Postfix) with ESMTP id 6B1D1406B6\n for <dev@dpdk.org>; Mon, 18 Sep 2023 04:47:20 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH7PR13MB6435.namprd13.prod.outlook.com (2603:10b6:510:2ea::9)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Mon, 18 Sep\n 2023 02:47:18 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7a1c:2887:348a:84bd]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7a1c:2887:348a:84bd%6]) with mapi id 15.20.6792.026; Mon, 18 Sep 2023\n 02:47:18 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=leGdJdiHJ3s23+iBOobRCeThYSMBNLE1DTYBL7biYCUGAHEKKLNZUO7kot4VFHehanSJvjsaqdlpd27X5GKZ2WyQ3qjoNbux+FEiKkiRgyz6CiuVPvdqTUZGv1jT6ydtzoG29ShBTfESLlasAEGT6YtjRQxk23/MSbgcuVZTkOJqzMIXTkUSqh/C0XiO2rTap0rDR5usxTvAcMO99awWHAHvR6//7QBmvu1IeKRjV8ypoGGdwfPcxv4zC/ji4v/ePxoSDmP+LcMRWoYDX6MiOfFDlH9cvbfHBEiW88FgWQTjPQhjmyMx7UkEqx9TQ2apr/CirwoHhp/OwMP1pP21Mg==", "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=ijpTu3bULSJLLqZFqDvPsyizR2/ZdlgcNKcrb24If/s=;\n b=KLL1WvGTNUaxQEuLZc/dAfyB6kJAVQF2MW0JKV0B8aeR3gti/4A648NJIergTX+WrDbzw7ylqZqsmFczqgpIFHldM62vHxQM/8V2539wPPuCoPyQ39fUoqqW0it+247U2nuMCBDyF1JtxcpQMKoXK9e/swVEWDC5QWxzWm3oKV3dIo2VuH2wnKEsiTUXfjRnSzwQ/DJH4DI3U1Qb/qf123AnFcy0rsOvfqSO1nxQtpZGmlt6+r16ZBUNF14yRQHkzBxwbRN9GF71V42ZgCjkjuUd/MWajz8WHL4F0oD69M9ERMXkS9QWkp3ch5gPvH6O5QeuM7qfa2wW0ViYsGNDIQ==", "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=ijpTu3bULSJLLqZFqDvPsyizR2/ZdlgcNKcrb24If/s=;\n b=JgHn6yvh9HksiPjFUood6kEvnCACm6jsBjtWPutvAkEIOUROfO2vDXHZdJvp/lj805Su8Wwr2Xv+uu43FqmtGOwyE1aYLq7cWBRYoL8LthC0ZYQJwPbbdiD0UuB7sgN5dHGjh/OEkMCdxFCur9MAyb2If6lA3sTdCn9Dr+l0v1c=", "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": "Chaoyong He <chaoyong.he@corigine.com>,\n =?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@corigine.com>", "Subject": "[PATCH v4 03/26] net/nfp: unify the type of integer variable", "Date": "Mon, 18 Sep 2023 10:45:49 +0800", "Message-Id": "<20230918024612.1600536-4-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230918024612.1600536-1-chaoyong.he@corigine.com>", "References": "<20230915091551.1459606-1-chaoyong.he@corigine.com>\n <20230918024612.1600536-1-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SE2P216CA0016.KORP216.PROD.OUTLOOK.COM\n (2603:1096:101:114::20) 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_|PH7PR13MB6435:EE_", "X-MS-Office365-Filtering-Correlation-Id": "5561fbf1-28f4-4a8d-b862-08dbb7f192a0", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n TwK+B5tBiOQS2fMqUXFkflE16SbyKXXHPa0Gijtt9nUSj5pCtnfZIukt1A0soPFLUtPFbRFPD33x7VTt/+0ieuJgXmqomGUlm3xLozTgwvxxc8GqMG40QcJ1dQZx4a4Z8aXxnGc6r8SeC4wCz6neyw+9RuF/Lmf9iRHH61YoZKwwtGbZ1Hz9hBmp8+sIwFufeMLBnlb0243p0ToGTQXQ7M5S/gucOU0kdH2iYCEE9TBTtgUbQM7KY7qWN8Elr8HuWo2kgYZ6BOwK4EQ+wDASo+dTTuUCfGcxFQu85KUJrekMJ/2ITvwssjLGaFdDKL2Qg5ycOYSlJnHcqk+v/il7tTQUsN2ggSy6cRralY/OjPuR2NWSZQJ5wA8r8UNVmBuX0rYfjRb8kohb80adxaieLUeBxK4H2hfTITLhy1bQOcFPqwNdEUU6eB8S14RcwxC+0ZK1HbcS8Psd9cvgoHw41NckaTlrRAUwnupHLGIDGftf5cHvpvsqj/JrgLe0+IzGaDOrpAndw33E0bssMgt77xySUpWvYsOJ7+y53PcklqYkYVf6fXoOVqBR8/N9FVhgCqWJuts+5wnapVyv1c7OnBclEbieZqc0+Y9d4CpYFscMmpQXuMdbw0PRj7YGcN2nwIPkGfzVeBA8j0Ujp5VCoB9lcrLQ4Ktv38mk6kbpFpmVuSyLIuiJzNBCJPn6ZpP9", "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:(13230031)(39830400003)(136003)(346002)(366004)(376002)(396003)(1800799009)(451199024)(186009)(54906003)(66476007)(66946007)(66574015)(41300700001)(6916009)(316002)(8676002)(4326008)(8936002)(52116002)(6506007)(6486002)(6512007)(478600001)(6666004)(83380400001)(26005)(1076003)(2616005)(107886003)(86362001)(2906002)(30864003)(44832011)(38100700002)(38350700002)(5660300002)(36756003)(66556008)(309714004);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?9cEh07seo0qvUqK03i999txH150Y?=\n\t=?utf-8?q?DcqyiC+SNCff0+ySCYxakgW15wfmshywKCJmX5w7h286Z6EQkrMwUkGmfb3AKaX4C?=\n\t=?utf-8?q?BdzMnhA6872BDpzZbhcaWMOlpCfEiqycta+Cuo6npLvxnvOidRcTgKW1iE93rpLJ4?=\n\t=?utf-8?q?AVDf4vvT9iaeWq+g6zvIRc/2092jiRBaRUyXGAHQcrdhzsJmJr8gOF1fJJtY8vdOz?=\n\t=?utf-8?q?UIefb9l0zCkDgr6fzz0t8HK6EvgzYUex3qnEcbN3ZfP4Vw84kmMUXaOSQeboWZGHJ?=\n\t=?utf-8?q?K9OIuOnWDfNiH87dMWw8dM/Lbz307IvFkxcDNMiA6oeohKIIdpNDj18xPoLvnf2eN?=\n\t=?utf-8?q?rykZfVoA5RJijRAQn8Pu10ut9/Pc0FS1YihfY8cq75UebBChd+niGmD7bgn4JHbnx?=\n\t=?utf-8?q?H8ZNJTYK99m+/Ag3+ZwbVYNRHZH9w7EryELrleJwVsEuR/ymPIEVb9/A8luYjBiMN?=\n\t=?utf-8?q?/lFl8PTkPQfc1eEOKPumyKbIYsFn9JqtYCKU9ibLKt5VTsMy5ycxwBRa/kN5hZzUx?=\n\t=?utf-8?q?aRFqTOIDdZGfnKGpaN6tMVnEqW/3qsVqqUi//LYE78OZGT7v+f4v+1Ry3znoNefN6?=\n\t=?utf-8?q?noyfeVu1cP89h9NqXjYWoLGkW+iMJxxJb0BnUm8WnFfX7XcVK6G1UECatf9CGVoiw?=\n\t=?utf-8?q?k30ku/P1a2SOY2Qov6ZQ2t+r9yeuNKmrU0lpMqr244tN1etnIh8I2N1tr+L11ckQ9?=\n\t=?utf-8?q?/5fpYsD36PMUM2/i4ptZ2DHcYknhRoyKiRT8Wg3dZiQn3rIhtv+l+lIhXi/6l856m?=\n\t=?utf-8?q?n6wpdJJDGME/t+D+N+Si9lQsnZo1Xg1eGBa+FDNr/2MjvAu98GflslrnTomav0A/d?=\n\t=?utf-8?q?ip68nBNJluLeX8eipEYzlVVyUSOOhbWq0pyPH8mhpzkKxUSMtTEDtS9yyD17g/NM+?=\n\t=?utf-8?q?uo8k23SbGYhssKACxOqVrvaCoNMC5G6UjeoUEwicJuYTudqTgXzWCZCkwHDpA8DjW?=\n\t=?utf-8?q?Clnv1ZqHbZUOGAqvjvTmSda4OpsXhXUwDyjfUoNFrWScniWlnLT8hcaeRBMPmc5q+?=\n\t=?utf-8?q?OQ8YWUlzRsEvQa9h/LxpYWXFk0sunO5PH8aKIRDfGDVWxo2WMeEHQp4tKSmmYWz18?=\n\t=?utf-8?q?rBiksrG0leHKPgLr+2Mg0yIQIwylj7lldgMChS4Op7IHNXhAvc3wKMLQVUpzCZk70?=\n\t=?utf-8?q?vFD7cOp9yxjSNfumd69cInOMmklIOGZ8OETghD3cNp2BNUGMJoKSwugoRL89M1kb9?=\n\t=?utf-8?q?mGRD7H8bVLXZ8FskCid0cTPw8d6dLil+N+gkLMoZdTMESfEYfYP6KGLMkn3HJ+OJE?=\n\t=?utf-8?q?LT1p2O/5qGpRxzBD92RsBVaba5+rYwvzJG6M1KPdLudoTUOkmug97K71jYSYIIH/e?=\n\t=?utf-8?q?bwnLMYSh76K69kNdj5FMSmY9RMlNsZT4Ru+291s1HoE8DcqrlM0e/GRZiMoWrAkBL?=\n\t=?utf-8?q?MdZDFlbFGoMEPRcuAWvy0n94QM+VSRyTWBymznLYLPgOBv8MbZqCDfb9mNJ7FFUup?=\n\t=?utf-8?q?NeqiGg5gNyG3+PBUyWmUeUrqBaa4j6j+inFgWkb2UOsgRIAyzf2pDXvL7bkO1sIgS?=\n\t=?utf-8?q?Dj5MgSVp5pQNoG2o4Ro2bJG8EUFdzzpC1w=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 5561fbf1-28f4-4a8d-b862-08dbb7f192a0", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "18 Sep 2023 02:47:18.0031 (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 6FGp7DxSEMVJqVDWbb8SqsQtCgmKUn/FrYCz4X90IsMYA7Mk1Ia/9tuicHWcYsLDv9gAbPeEUN6VfwLX5ve5B2Mo13TMUoyJCjrck8jLgbg=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR13MB6435", "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": "Unify the type of integer variable to the DPDK prefer style.\nAlso change the return type of 'nfp_eth_speed2rate()' to the\ncorresponding enum, which make it more readable.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/nfpcore/nfp_cpp.h | 53 ++++++++++---------\n drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 20 ++++----\n drivers/net/nfp/nfpcore/nfp_cppcore.c | 40 +++++++--------\n drivers/net/nfp/nfpcore/nfp_crc.c | 2 +-\n drivers/net/nfp/nfpcore/nfp_mutex.c | 15 +++---\n drivers/net/nfp/nfpcore/nfp_nffw.c | 6 +--\n drivers/net/nfp/nfpcore/nfp_nsp.c | 28 +++++-----\n drivers/net/nfp/nfpcore/nfp_nsp.h | 59 +++++++++++-----------\n drivers/net/nfp/nfpcore/nfp_nsp_cmds.c | 2 +-\n drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 52 ++++++++++---------\n drivers/net/nfp/nfpcore/nfp_resource.c | 2 +-\n drivers/net/nfp/nfpcore/nfp_rtsym.c | 2 +-\n drivers/net/nfp/nfpcore/nfp_rtsym.h | 2 +-\n 13 files changed, 142 insertions(+), 141 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h\nindex 54bef3cb6b..782272a3f4 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp.h\n@@ -71,8 +71,8 @@ struct nfp_cpp_operations {\n \t */\n \tint (*area_init)(struct nfp_cpp_area *area,\n \t\t\tuint32_t dest,\n-\t\t\tunsigned long long address,\n-\t\t\tunsigned long size);\n+\t\t\tuint64_t address,\n+\t\t\tsize_t size);\n \t/*\n \t * Clean up a NFP CPP area before it is freed\n \t * NOTE: This is _not_ serialized\n@@ -103,16 +103,16 @@ struct nfp_cpp_operations {\n \t */\n \tint (*area_read)(struct nfp_cpp_area *area,\n \t\t\tvoid *kernel_vaddr,\n-\t\t\tunsigned long offset,\n-\t\t\tunsigned int length);\n+\t\t\tuint32_t offset,\n+\t\t\tsize_t length);\n \t/*\n \t * Perform a write to a NFP CPP area\n \t * Serialized\n \t */\n \tint (*area_write)(struct nfp_cpp_area *area,\n \t\t\tconst void *kernel_vaddr,\n-\t\t\tunsigned long offset,\n-\t\t\tunsigned int length);\n+\t\t\tuint32_t offset,\n+\t\t\tsize_t length);\n };\n \n /*\n@@ -398,7 +398,7 @@ int nfp_cpp_serial(struct nfp_cpp *cpp, const uint8_t **serial);\n * @return NFP CPP handle, or NULL on failure.\n */\n struct nfp_cpp_area *nfp_cpp_area_alloc(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\tunsigned long long address, unsigned long size);\n+\t\tuint64_t address, size_t size);\n \n /*\n * Allocate a NFP CPP area handle, as an offset into a CPP ID, by a named owner\n@@ -411,8 +411,8 @@ struct nfp_cpp_area *nfp_cpp_area_alloc(struct nfp_cpp *cpp, uint32_t cpp_id,\n * @return NFP CPP handle, or NULL on failure.\n */\n struct nfp_cpp_area *nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,\n-\t\tuint32_t cpp_id, const char *name, unsigned long long address,\n-\t\tunsigned long size);\n+\t\tuint32_t cpp_id, const char *name, uint64_t address,\n+\t\tuint32_t size);\n \n /*\n * Free an allocated NFP CPP area handle\n@@ -446,7 +446,7 @@ void nfp_cpp_area_release(struct nfp_cpp_area *area);\n * @return NFP CPP handle, or NULL on failure.\n */\n struct nfp_cpp_area *nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp,\n-\t\tuint32_t cpp_id, unsigned long long address, unsigned long size);\n+\t\tuint32_t cpp_id, uint64_t address, size_t size);\n \n /*\n * Release the resources, then free the NFP CPP area handle\n@@ -455,7 +455,8 @@ struct nfp_cpp_area *nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp,\n void nfp_cpp_area_release_free(struct nfp_cpp_area *area);\n \n uint8_t *nfp_cpp_map_area(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\tuint64_t addr, unsigned long size, struct nfp_cpp_area **area);\n+\t\tuint64_t addr, uint32_t size, struct nfp_cpp_area **area);\n+\n /*\n * Return an IO pointer to the beginning of the NFP CPP area handle. The area\n * must be acquired with 'nfp_cpp_area_acquire()' before calling this operation.\n@@ -478,7 +479,7 @@ void *nfp_cpp_area_mapped(struct nfp_cpp_area *area);\n * @return bytes read on success, negative value on failure.\n *\n */\n-int nfp_cpp_area_read(struct nfp_cpp_area *area, unsigned long offset,\n+int nfp_cpp_area_read(struct nfp_cpp_area *area, uint32_t offset,\n \t\tvoid *buffer, size_t length);\n \n /*\n@@ -492,7 +493,7 @@ int nfp_cpp_area_read(struct nfp_cpp_area *area, unsigned long offset,\n *\n * @return bytes written on success, negative value on failure.\n */\n-int nfp_cpp_area_write(struct nfp_cpp_area *area, unsigned long offset,\n+int nfp_cpp_area_write(struct nfp_cpp_area *area, uint32_t offset,\n \t\tconst void *buffer, size_t length);\n \n /*\n@@ -547,7 +548,7 @@ const char *nfp_cpp_area_name(struct nfp_cpp_area *cpp_area);\n * @return bytes read on success, -1 on failure.\n */\n int nfp_cpp_read(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\tunsigned long long address, void *kernel_vaddr, size_t length);\n+\t\tuint64_t address, void *kernel_vaddr, size_t length);\n \n /*\n * Write a block of data to a NFP CPP ID\n@@ -561,9 +562,7 @@ int nfp_cpp_read(struct nfp_cpp *cpp, uint32_t cpp_id,\n * @return bytes written on success, -1 on failure.\n */\n int nfp_cpp_write(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\tunsigned long long address, const void *kernel_vaddr,\n-\t\tsize_t length);\n-\n+\t\tuint64_t address, const void *kernel_vaddr, size_t length);\n \n \n /*\n@@ -593,7 +592,7 @@ int nfp_cpp_area_fill(struct nfp_cpp_area *area, unsigned long offset,\n *\n * @return 0 on success, or -1 on error.\n */\n-int nfp_cpp_area_readl(struct nfp_cpp_area *area, unsigned long offset,\n+int nfp_cpp_area_readl(struct nfp_cpp_area *area, uint32_t offset,\n \t\tuint32_t *value);\n \n /*\n@@ -610,7 +609,7 @@ int nfp_cpp_area_readl(struct nfp_cpp_area *area, unsigned long offset,\n *\n * @return 0 on success, or -1 on error.\n */\n-int nfp_cpp_area_writel(struct nfp_cpp_area *area, unsigned long offset,\n+int nfp_cpp_area_writel(struct nfp_cpp_area *area, uint32_t offset,\n \t\tuint32_t value);\n \n /*\n@@ -627,7 +626,7 @@ int nfp_cpp_area_writel(struct nfp_cpp_area *area, unsigned long offset,\n *\n * @return 0 on success, or -1 on error.\n */\n-int nfp_cpp_area_readq(struct nfp_cpp_area *area, unsigned long offset,\n+int nfp_cpp_area_readq(struct nfp_cpp_area *area, uint32_t offset,\n \t\tuint64_t *value);\n \n /*\n@@ -644,7 +643,7 @@ int nfp_cpp_area_readq(struct nfp_cpp_area *area, unsigned long offset,\n *\n * @return 0 on success, or -1 on error.\n */\n-int nfp_cpp_area_writeq(struct nfp_cpp_area *area, unsigned long offset,\n+int nfp_cpp_area_writeq(struct nfp_cpp_area *area, uint32_t offset,\n \t\tuint64_t value);\n \n /*\n@@ -707,7 +706,7 @@ int nfp_xpb_waitlm(struct nfp_cpp *cpp, uint32_t xpb_tgt, uint32_t mask,\n * @return 0 on success, or -1 on failure.\n */\n int nfp_cpp_readl(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\tunsigned long long address, uint32_t *value);\n+\t\tuint64_t address, uint32_t *value);\n \n /*\n * Write a 32-bit value to a NFP CPP ID\n@@ -721,7 +720,7 @@ int nfp_cpp_readl(struct nfp_cpp *cpp, uint32_t cpp_id,\n *\n */\n int nfp_cpp_writel(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\tunsigned long long address, uint32_t value);\n+\t\tuint64_t address, uint32_t value);\n \n /*\n * Read a 64-bit work from a NFP CPP ID\n@@ -734,7 +733,7 @@ int nfp_cpp_writel(struct nfp_cpp *cpp, uint32_t cpp_id,\n * @return 0 on success, or -1 on failure.\n */\n int nfp_cpp_readq(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\tunsigned long long address, uint64_t *value);\n+\t\tuint64_t address, uint64_t *value);\n \n /*\n * Write a 64-bit value to a NFP CPP ID\n@@ -747,7 +746,7 @@ int nfp_cpp_readq(struct nfp_cpp *cpp, uint32_t cpp_id,\n * @return 0 on success, or -1 on failure.\n */\n int nfp_cpp_writeq(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\tunsigned long long address, uint64_t value);\n+\t\tuint64_t address, uint64_t value);\n \n /*\n * Initialize a mutex location\n@@ -768,7 +767,7 @@ int nfp_cpp_writeq(struct nfp_cpp *cpp, uint32_t cpp_id,\n * @return 0 on success, negative value on failure.\n */\n int nfp_cpp_mutex_init(struct nfp_cpp *cpp, int target,\n-\t\tunsigned long long address, uint32_t key_id);\n+\t\tuint64_t address, uint32_t key_id);\n \n /*\n * Create a mutex handle from an address controlled by a MU Atomic engine\n@@ -788,7 +787,7 @@ int nfp_cpp_mutex_init(struct nfp_cpp *cpp, int target,\n * failure.\n */\n struct nfp_cpp_mutex *nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, int target,\n-\t\tunsigned long long address, uint32_t key_id);\n+\t\tuint64_t address, uint32_t key_id);\n \n /*\n * Get the NFP CPP handle the mutex was created with\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\nindex 884cc84eaa..881f21bfd0 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n@@ -101,7 +101,7 @@ struct nfp_bar {\n \tuint64_t base;\t\t/* CPP address base */\n \tuint64_t mask;\t\t/* Bit mask of the bar */\n \tuint32_t bitsize;\t/* Bit size of the bar */\n-\tint index;\n+\tuint32_t index;\n \tint lock;\n \n \tchar *csr;\n@@ -400,8 +400,8 @@ struct nfp6000_area_priv {\n static int\n nfp6000_area_init(struct nfp_cpp_area *area,\n \t\tuint32_t dest,\n-\t\tunsigned long long address,\n-\t\tunsigned long size)\n+\t\tuint64_t address,\n+\t\tsize_t size)\n {\n \tstruct nfp_pcie_user *nfp = nfp_cpp_priv(nfp_cpp_area_cpp(area));\n \tstruct nfp6000_area_priv *priv = nfp_cpp_area_priv(area);\n@@ -501,8 +501,8 @@ nfp6000_area_iomem(struct nfp_cpp_area *area)\n static int\n nfp6000_area_read(struct nfp_cpp_area *area,\n \t\tvoid *kernel_vaddr,\n-\t\tunsigned long offset,\n-\t\tunsigned int length)\n+\t\tuint32_t offset,\n+\t\tsize_t length)\n {\n \tuint64_t *wrptr64 = kernel_vaddr;\n \tconst volatile uint64_t *rdptr64;\n@@ -510,7 +510,7 @@ nfp6000_area_read(struct nfp_cpp_area *area,\n \tuint32_t *wrptr32 = kernel_vaddr;\n \tconst volatile uint32_t *rdptr32;\n \tint width;\n-\tunsigned int n;\n+\tsize_t n;\n \tbool is_64;\n \n \tpriv = nfp_cpp_area_priv(area);\n@@ -571,8 +571,8 @@ nfp6000_area_read(struct nfp_cpp_area *area,\n static int\n nfp6000_area_write(struct nfp_cpp_area *area,\n \t\tconst void *kernel_vaddr,\n-\t\tunsigned long offset,\n-\t\tunsigned int length)\n+\t\tuint32_t offset,\n+\t\tsize_t length)\n {\n \tconst uint64_t *rdptr64 = kernel_vaddr;\n \tuint64_t *wrptr64;\n@@ -580,7 +580,7 @@ nfp6000_area_write(struct nfp_cpp_area *area,\n \tstruct nfp6000_area_priv *priv;\n \tuint32_t *wrptr32;\n \tint width;\n-\tunsigned int n;\n+\tsize_t n;\n \tbool is_64;\n \n \tpriv = nfp_cpp_area_priv(area);\n@@ -752,7 +752,7 @@ static int\n nfp6000_set_barsz(struct rte_pci_device *dev,\n \t\tstruct nfp_pcie_user *desc)\n {\n-\tunsigned long tmp;\n+\tuint64_t tmp;\n \tint i = 0;\n \n \ttmp = dev->mem_resource[0].len;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c\nindex f764208a9a..627d4eaa5d 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c\n@@ -169,8 +169,8 @@ struct nfp_cpp_area *\n nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,\n \t\tuint32_t dest,\n \t\tconst char *name,\n-\t\tunsigned long long address,\n-\t\tunsigned long size)\n+\t\tuint64_t address,\n+\t\tuint32_t size)\n {\n \tstruct nfp_cpp_area *area;\n \tuint64_t tmp64 = (uint64_t)address;\n@@ -184,7 +184,7 @@ nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,\n \tif (err < 0)\n \t\treturn NULL;\n \n-\taddress = (unsigned long long)tmp64;\n+\taddress = tmp64;\n \n \tif (name == NULL)\n \t\tname = \"\";\n@@ -213,8 +213,8 @@ nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,\n struct nfp_cpp_area *\n nfp_cpp_area_alloc(struct nfp_cpp *cpp,\n \t\tuint32_t dest,\n-\t\tunsigned long long address,\n-\t\tunsigned long size)\n+\t\tuint64_t address,\n+\t\tsize_t size)\n {\n \treturn nfp_cpp_area_alloc_with_name(cpp, dest, NULL, address, size);\n }\n@@ -237,8 +237,8 @@ nfp_cpp_area_alloc(struct nfp_cpp *cpp,\n struct nfp_cpp_area *\n nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp,\n \t\tuint32_t destination,\n-\t\tunsigned long long address,\n-\t\tunsigned long size)\n+\t\tuint64_t address,\n+\t\tsize_t size)\n {\n \tstruct nfp_cpp_area *area;\n \n@@ -352,7 +352,7 @@ nfp_cpp_area_iomem(struct nfp_cpp_area *area)\n */\n int\n nfp_cpp_area_read(struct nfp_cpp_area *area,\n-\t\tunsigned long offset,\n+\t\tuint32_t offset,\n \t\tvoid *kernel_vaddr,\n \t\tsize_t length)\n {\n@@ -378,7 +378,7 @@ nfp_cpp_area_read(struct nfp_cpp_area *area,\n */\n int\n nfp_cpp_area_write(struct nfp_cpp_area *area,\n-\t\tunsigned long offset,\n+\t\tuint32_t offset,\n \t\tconst void *kernel_vaddr,\n \t\tsize_t length)\n {\n@@ -461,7 +461,7 @@ nfp_xpb_to_cpp(struct nfp_cpp *cpp,\n \n int\n nfp_cpp_area_readl(struct nfp_cpp_area *area,\n-\t\tunsigned long offset,\n+\t\tuint32_t offset,\n \t\tuint32_t *value)\n {\n \tint sz;\n@@ -475,7 +475,7 @@ nfp_cpp_area_readl(struct nfp_cpp_area *area,\n \n int\n nfp_cpp_area_writel(struct nfp_cpp_area *area,\n-\t\tunsigned long offset,\n+\t\tuint32_t offset,\n \t\tuint32_t value)\n {\n \tint sz;\n@@ -487,7 +487,7 @@ nfp_cpp_area_writel(struct nfp_cpp_area *area,\n \n int\n nfp_cpp_area_readq(struct nfp_cpp_area *area,\n-\t\tunsigned long offset,\n+\t\tuint32_t offset,\n \t\tuint64_t *value)\n {\n \tint sz;\n@@ -501,7 +501,7 @@ nfp_cpp_area_readq(struct nfp_cpp_area *area,\n \n int\n nfp_cpp_area_writeq(struct nfp_cpp_area *area,\n-\t\tunsigned long offset,\n+\t\tuint32_t offset,\n \t\tuint64_t value)\n {\n \tint sz;\n@@ -515,7 +515,7 @@ nfp_cpp_area_writeq(struct nfp_cpp_area *area,\n int\n nfp_cpp_readl(struct nfp_cpp *cpp,\n \t\tuint32_t cpp_id,\n-\t\tunsigned long long address,\n+\t\tuint64_t address,\n \t\tuint32_t *value)\n {\n \tint sz;\n@@ -530,7 +530,7 @@ nfp_cpp_readl(struct nfp_cpp *cpp,\n int\n nfp_cpp_writel(struct nfp_cpp *cpp,\n \t\tuint32_t cpp_id,\n-\t\tunsigned long long address,\n+\t\tuint64_t address,\n \t\tuint32_t value)\n {\n \tint sz;\n@@ -544,7 +544,7 @@ nfp_cpp_writel(struct nfp_cpp *cpp,\n int\n nfp_cpp_readq(struct nfp_cpp *cpp,\n \t\tuint32_t cpp_id,\n-\t\tunsigned long long address,\n+\t\tuint64_t address,\n \t\tuint64_t *value)\n {\n \tint sz;\n@@ -559,7 +559,7 @@ nfp_cpp_readq(struct nfp_cpp *cpp,\n int\n nfp_cpp_writeq(struct nfp_cpp *cpp,\n \t\tuint32_t cpp_id,\n-\t\tunsigned long long address,\n+\t\tuint64_t address,\n \t\tuint64_t value)\n {\n \tint sz;\n@@ -758,7 +758,7 @@ nfp_xpb_waitlm(struct nfp_cpp *cpp,\n int\n nfp_cpp_read(struct nfp_cpp *cpp,\n \t\tuint32_t destination,\n-\t\tunsigned long long address,\n+\t\tuint64_t address,\n \t\tvoid *kernel_vaddr,\n \t\tsize_t length)\n {\n@@ -788,7 +788,7 @@ nfp_cpp_read(struct nfp_cpp *cpp,\n int\n nfp_cpp_write(struct nfp_cpp *cpp,\n \t\tuint32_t destination,\n-\t\tunsigned long long address,\n+\t\tuint64_t address,\n \t\tconst void *kernel_vaddr,\n \t\tsize_t length)\n {\n@@ -902,7 +902,7 @@ uint8_t *\n nfp_cpp_map_area(struct nfp_cpp *cpp,\n \t\tuint32_t cpp_id,\n \t\tuint64_t addr,\n-\t\tunsigned long size,\n+\t\tuint32_t size,\n \t\tstruct nfp_cpp_area **area)\n {\n \tuint8_t *res;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_crc.c b/drivers/net/nfp/nfpcore/nfp_crc.c\nindex 2cd8866253..68f27f8c68 100644\n--- a/drivers/net/nfp/nfpcore/nfp_crc.c\n+++ b/drivers/net/nfp/nfpcore/nfp_crc.c\n@@ -14,7 +14,7 @@ nfp_crc32_be_generic(uint32_t crc,\n \t\tsize_t len,\n \t\tuint32_t polynomial)\n {\n-\tint i;\n+\tuint32_t i;\n \twhile (len--) {\n \t\tcrc ^= *p++ << 24;\n \t\tfor (i = 0; i < 8; i++)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c\nindex 047e755416..7ac06e897a 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mutex.c\n+++ b/drivers/net/nfp/nfpcore/nfp_mutex.c\n@@ -28,16 +28,16 @@ struct nfp_cpp_mutex {\n \tstruct nfp_cpp *cpp;\n \tuint8_t target;\n \tuint16_t depth;\n-\tunsigned long long address;\n+\tuint64_t address;\n \tuint32_t key;\n-\tunsigned int usage;\n+\tuint32_t usage;\n \tstruct nfp_cpp_mutex *prev, *next;\n };\n \n static int\n _nfp_cpp_mutex_validate(uint32_t model,\n \t\tint *target,\n-\t\tunsigned long long address)\n+\t\tuint64_t address)\n {\n \t/* Address must be 64-bit aligned */\n \tif ((address & 7) != 0)\n@@ -76,7 +76,7 @@ _nfp_cpp_mutex_validate(uint32_t model,\n int\n nfp_cpp_mutex_init(struct nfp_cpp *cpp,\n \t\tint target,\n-\t\tunsigned long long address,\n+\t\tuint64_t address,\n \t\tuint32_t key)\n {\n \tuint32_t model = nfp_cpp_model(cpp);\n@@ -119,7 +119,7 @@ nfp_cpp_mutex_init(struct nfp_cpp *cpp,\n struct nfp_cpp_mutex *\n nfp_cpp_mutex_alloc(struct nfp_cpp *cpp,\n \t\tint target,\n-\t\tunsigned long long address,\n+\t\tuint64_t address,\n \t\tuint32_t key)\n {\n \tuint32_t model = nfp_cpp_model(cpp);\n@@ -269,9 +269,10 @@ nfp_cpp_mutex_lock(struct nfp_cpp_mutex *mutex)\n \t\tif (err < 0 && err != -EBUSY)\n \t\t\treturn err;\n \t\tif (time(NULL) >= warn_at) {\n-\t\t\tPMD_DRV_LOG(ERR, \"Warning: waiting for NFP mutex usage:%u depth:%hd] target:%d addr:%llx key:%08x]\",\n+\t\t\tPMD_DRV_LOG(ERR, \"Warning: waiting for NFP mutex usage:%u depth:%hd] \"\n+\t\t\t\t\t\"target:%d key:%08x] addr:%\" PRIx64,\n \t\t\t\t\tmutex->usage, mutex->depth, mutex->target,\n-\t\t\t\t\tmutex->address, mutex->key);\n+\t\t\t\t\tmutex->key, mutex->address);\n \t\t\twarn_at = time(NULL) + 60;\n \t\t}\n \t\tsched_yield();\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c\nindex fa65956baa..2412dc0e00 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nffw.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nffw.c\n@@ -68,7 +68,7 @@ nffw_fwinfo_mip_offset_get(const struct nffw_fwinfo *fi)\n static int\n nfp_mip_mu_locality_lsb(struct nfp_cpp *cpp)\n {\n-\tunsigned int mode, addr40;\n+\tuint32_t mode, addr40;\n \tuint32_t xpbaddr, imbcppat;\n \tint err;\n \n@@ -84,7 +84,7 @@ nfp_mip_mu_locality_lsb(struct nfp_cpp *cpp)\n \treturn nfp_cppat_mu_locality_lsb(mode, addr40);\n }\n \n-static unsigned int\n+static uint32_t\n nffw_res_fwinfos(struct nfp_nffw_info_data *fwinf,\n \t\tstruct nffw_fwinfo **arr)\n {\n@@ -184,7 +184,7 @@ static struct nffw_fwinfo *\n nfp_nffw_info_fwid_first(struct nfp_nffw_info *state)\n {\n \tstruct nffw_fwinfo *fwinfo;\n-\tunsigned int cnt, i;\n+\tuint32_t cnt, i;\n \n \tcnt = nffw_res_fwinfos(&state->fwinf, &fwinfo);\n \tif (cnt == 0)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c\nindex 4f476f6f2b..dfe396c8ac 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp.c\n@@ -34,7 +34,7 @@ nfp_nsp_config_entries(struct nfp_nsp *state)\n \treturn state->entries;\n }\n \n-unsigned int\n+uint32_t\n nfp_nsp_config_idx(struct nfp_nsp *state)\n {\n \treturn state->idx;\n@@ -43,7 +43,7 @@ nfp_nsp_config_idx(struct nfp_nsp *state)\n void\n nfp_nsp_config_set_state(struct nfp_nsp *state,\n \t\tvoid *entries,\n-\t\tunsigned int idx)\n+\t\tuint32_t idx)\n {\n \tstate->entries = entries;\n \tstate->idx = idx;\n@@ -59,12 +59,12 @@ nfp_nsp_config_clear_state(struct nfp_nsp *state)\n static void\n nfp_nsp_print_extended_error(uint32_t ret_val)\n {\n-\tint i;\n+\tuint32_t i;\n \n \tif (ret_val == 0)\n \t\treturn;\n \n-\tfor (i = 0; i < (int)RTE_DIM(nsp_errors); i++)\n+\tfor (i = 0; i < 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 }\n@@ -171,7 +171,7 @@ nfp_nsp_wait_reg(struct nfp_cpp *cpp,\n \t\tuint64_t val)\n {\n \tstruct timespec wait;\n-\tint count;\n+\tuint32_t count;\n \tint err;\n \n \twait.tv_sec = 0;\n@@ -297,7 +297,7 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp,\n \t\tunsigned int out_size)\n {\n \tstruct nfp_cpp *cpp = nsp->cpp;\n-\tunsigned int max_size;\n+\tsize_t max_size;\n \tuint64_t reg, cpp_buf;\n \tint ret, err;\n \tuint32_t cpp_id;\n@@ -316,7 +316,7 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp,\n \n \tmax_size = RTE_MAX(in_size, out_size);\n \tif (FIELD_GET(NSP_DFLT_BUFFER_SIZE_MB, reg) * SZ_1M < max_size) {\n-\t\tPMD_DRV_LOG(ERR, \"NSP: default buffer too small for command 0x%04x (%llu < %u)\",\n+\t\tPMD_DRV_LOG(ERR, \"NSP: default buffer too small for command 0x%04x (%llu < %zu)\",\n \t\t\t\tcode, FIELD_GET(NSP_DFLT_BUFFER_SIZE_MB, reg) * SZ_1M, max_size);\n \t\treturn -EINVAL;\n \t}\n@@ -361,7 +361,7 @@ int\n nfp_nsp_wait(struct nfp_nsp *state)\n {\n \tstruct timespec wait;\n-\tint count;\n+\tuint32_t count;\n \tint err;\n \n \twait.tv_sec = 0;\n@@ -401,7 +401,7 @@ nfp_nsp_mac_reinit(struct nfp_nsp *state)\n int\n nfp_nsp_load_fw(struct nfp_nsp *state,\n \t\tvoid *buf,\n-\t\tunsigned int size)\n+\t\tsize_t size)\n {\n \treturn nfp_nsp_command_buf(state, SPCODE_FW_LOAD, size, buf, size,\n \t\t\tNULL, 0);\n@@ -410,7 +410,7 @@ nfp_nsp_load_fw(struct nfp_nsp *state,\n int\n nfp_nsp_read_eth_table(struct nfp_nsp *state,\n \t\tvoid *buf,\n-\t\tunsigned int size)\n+\t\tsize_t size)\n {\n \treturn nfp_nsp_command_buf(state, SPCODE_ETH_RESCAN, size, NULL, 0,\n \t\t\tbuf, size);\n@@ -419,7 +419,7 @@ nfp_nsp_read_eth_table(struct nfp_nsp *state,\n int\n nfp_nsp_write_eth_table(struct nfp_nsp *state,\n \t\tconst void *buf,\n-\t\tunsigned int size)\n+\t\tsize_t size)\n {\n \treturn nfp_nsp_command_buf(state, SPCODE_ETH_CONTROL, size, buf, size,\n \t\t\tNULL, 0);\n@@ -428,7 +428,7 @@ nfp_nsp_write_eth_table(struct nfp_nsp *state,\n int\n nfp_nsp_read_identify(struct nfp_nsp *state,\n \t\tvoid *buf,\n-\t\tunsigned int size)\n+\t\tsize_t size)\n {\n \treturn nfp_nsp_command_buf(state, SPCODE_NSP_IDENTIFY, size, NULL, 0,\n \t\t\tbuf, size);\n@@ -436,9 +436,9 @@ nfp_nsp_read_identify(struct nfp_nsp *state,\n \n int\n nfp_nsp_read_sensors(struct nfp_nsp *state,\n-\t\tunsigned int sensor_mask,\n+\t\tuint32_t sensor_mask,\n \t\tvoid *buf,\n-\t\tunsigned int size)\n+\t\tsize_t size)\n {\n \treturn nfp_nsp_command_buf(state, SPCODE_NSP_SENSORS, sensor_mask, NULL,\n \t\t\t0, buf, size);\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp.h b/drivers/net/nfp/nfpcore/nfp_nsp.h\nindex 1e2deaabb4..edb56e26ca 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp.h\n@@ -110,11 +110,11 @@ uint16_t nfp_nsp_get_abi_ver_major(struct nfp_nsp *state);\n uint16_t nfp_nsp_get_abi_ver_minor(struct nfp_nsp *state);\n int nfp_nsp_wait(struct nfp_nsp *state);\n int nfp_nsp_device_soft_reset(struct nfp_nsp *state);\n-int nfp_nsp_load_fw(struct nfp_nsp *state, void *buf, unsigned int size);\n+int nfp_nsp_load_fw(struct nfp_nsp *state, void *buf, size_t size);\n int nfp_nsp_mac_reinit(struct nfp_nsp *state);\n-int nfp_nsp_read_identify(struct nfp_nsp *state, void *buf, unsigned int size);\n-int nfp_nsp_read_sensors(struct nfp_nsp *state, unsigned int sensor_mask,\n-\t\tvoid *buf, unsigned int size);\n+int nfp_nsp_read_identify(struct nfp_nsp *state, void *buf, size_t size);\n+int nfp_nsp_read_sensors(struct nfp_nsp *state, uint32_t sensor_mask,\n+\t\tvoid *buf, size_t size);\n \n static inline int\n nfp_nsp_has_mac_reinit(struct nfp_nsp *state)\n@@ -188,17 +188,17 @@ enum nfp_eth_fec {\n * @fec_modes_supported:\tbitmap of FEC modes supported\n */\n struct nfp_eth_table {\n-\tunsigned int count;\n-\tunsigned int max_index;\n+\tuint32_t count;\n+\tuint32_t max_index;\n \tstruct nfp_eth_table_port {\n-\t\tunsigned int eth_index;\n-\t\tunsigned int index;\n-\t\tunsigned int nbi;\n-\t\tunsigned int base;\n-\t\tunsigned int lanes;\n-\t\tunsigned int speed;\n-\n-\t\tunsigned int interface;\n+\t\tuint32_t eth_index;\n+\t\tuint32_t index;\n+\t\tuint32_t nbi;\n+\t\tuint32_t base;\n+\t\tuint32_t lanes;\n+\t\tuint32_t speed;\n+\n+\t\tuint32_t interface;\n \t\tenum nfp_eth_media media;\n \n \t\tenum nfp_eth_fec fec;\n@@ -218,51 +218,50 @@ struct nfp_eth_table {\n \t\t/* Computed fields */\n \t\tuint8_t port_type;\n \n-\t\tunsigned int port_lanes;\n+\t\tuint32_t port_lanes;\n \n \t\tint is_split;\n \n-\t\tunsigned int fec_modes_supported;\n+\t\tuint32_t fec_modes_supported;\n \t} ports[];\n };\n \n struct nfp_eth_table *nfp_eth_read_ports(struct nfp_cpp *cpp);\n \n-int nfp_eth_set_mod_enable(struct nfp_cpp *cpp, unsigned int idx, int enable);\n-int nfp_eth_set_configured(struct nfp_cpp *cpp, unsigned int idx,\n-\t\tint configed);\n-int nfp_eth_set_fec(struct nfp_cpp *cpp, unsigned int idx, enum nfp_eth_fec mode);\n+int nfp_eth_set_mod_enable(struct nfp_cpp *cpp, uint32_t idx, int enable);\n+int nfp_eth_set_configured(struct nfp_cpp *cpp, uint32_t idx, int configed);\n+int nfp_eth_set_fec(struct nfp_cpp *cpp, uint32_t idx, enum nfp_eth_fec mode);\n \n-int nfp_nsp_read_eth_table(struct nfp_nsp *state, void *buf, unsigned int size);\n+int nfp_nsp_read_eth_table(struct nfp_nsp *state, void *buf, size_t size);\n int nfp_nsp_write_eth_table(struct nfp_nsp *state, const void *buf,\n-\t\tunsigned int size);\n+\t\tsize_t size);\n void nfp_nsp_config_set_state(struct nfp_nsp *state, void *entries,\n-\t\tunsigned int idx);\n+\t\tuint32_t idx);\n void nfp_nsp_config_clear_state(struct nfp_nsp *state);\n void nfp_nsp_config_set_modified(struct nfp_nsp *state, int modified);\n void *nfp_nsp_config_entries(struct nfp_nsp *state);\n int nfp_nsp_config_modified(struct nfp_nsp *state);\n-unsigned int nfp_nsp_config_idx(struct nfp_nsp *state);\n+uint32_t nfp_nsp_config_idx(struct nfp_nsp *state);\n \n static inline int\n nfp_eth_can_support_fec(struct nfp_eth_table_port *eth_port)\n {\n-\treturn !!eth_port->fec_modes_supported;\n+\treturn eth_port->fec_modes_supported != 0;\n }\n \n-static inline unsigned int\n+static inline uint32_t\n nfp_eth_supported_fec_modes(struct nfp_eth_table_port *eth_port)\n {\n \treturn eth_port->fec_modes_supported;\n }\n \n-struct nfp_nsp *nfp_eth_config_start(struct nfp_cpp *cpp, unsigned int idx);\n+struct nfp_nsp *nfp_eth_config_start(struct nfp_cpp *cpp, uint32_t idx);\n int nfp_eth_config_commit_end(struct nfp_nsp *nsp);\n void nfp_eth_config_cleanup_end(struct nfp_nsp *nsp);\n \n int __nfp_eth_set_aneg(struct nfp_nsp *nsp, enum nfp_eth_aneg mode);\n-int __nfp_eth_set_speed(struct nfp_nsp *nsp, unsigned int speed);\n-int __nfp_eth_set_split(struct nfp_nsp *nsp, unsigned int lanes);\n+int __nfp_eth_set_speed(struct nfp_nsp *nsp, uint32_t speed);\n+int __nfp_eth_set_split(struct nfp_nsp *nsp, uint32_t lanes);\n \n /**\n * struct nfp_nsp_identify - NSP static information\n@@ -298,6 +297,6 @@ enum nfp_nsp_sensor_id {\n };\n \n int nfp_hwmon_read_sensor(struct nfp_cpp *cpp, enum nfp_nsp_sensor_id id,\n-\t\tlong *val);\n+\t\tuint32_t *val);\n \n #endif\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\nindex 28dba27124..31677b66e6 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\n@@ -75,7 +75,7 @@ struct nfp_sensors {\n int\n nfp_hwmon_read_sensor(struct nfp_cpp *cpp,\n \t\tenum nfp_nsp_sensor_id id,\n-\t\tlong *val)\n+\t\tuint32_t *val)\n {\n \tstruct nfp_sensors s;\n \tstruct nfp_nsp *nsp;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\nindex 51bd57033e..5492840aa1 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n@@ -124,7 +124,7 @@ union eth_table_entry {\n \n static const struct {\n \tenum nfp_eth_rate rate;\n-\tunsigned int speed;\n+\tuint32_t speed;\n } nsp_eth_rate_tbl[] = {\n \t{ RATE_INVALID,\t0, },\n \t{ RATE_10M,\tSPEED_10, },\n@@ -134,24 +134,24 @@ static const struct {\n \t{ RATE_25G,\tSPEED_25000, },\n };\n \n-static unsigned int\n+static uint32_t\n nfp_eth_rate2speed(enum nfp_eth_rate rate)\n {\n-\tint i;\n+\tuint32_t i;\n \n-\tfor (i = 0; i < (int)RTE_DIM(nsp_eth_rate_tbl); i++)\n+\tfor (i = 0; i < 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 \treturn 0;\n }\n \n-static unsigned int\n-nfp_eth_speed2rate(unsigned int speed)\n+static enum nfp_eth_rate\n+nfp_eth_speed2rate(uint32_t speed)\n {\n-\tint i;\n+\tuint32_t i;\n \n-\tfor (i = 0; i < (int)RTE_DIM(nsp_eth_rate_tbl); i++)\n+\tfor (i = 0; i < 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 \n@@ -162,7 +162,7 @@ static void\n nfp_eth_copy_mac_reverse(uint8_t *dst,\n \t\tconst uint8_t *src)\n {\n-\tint i;\n+\tuint32_t i;\n \n \tfor (i = 0; i < RTE_ETHER_ADDR_LEN; i++)\n \t\tdst[RTE_ETHER_ADDR_LEN - i - 1] = src[i];\n@@ -171,11 +171,11 @@ nfp_eth_copy_mac_reverse(uint8_t *dst,\n static void\n nfp_eth_port_translate(struct nfp_nsp *nsp,\n \t\tconst union eth_table_entry *src,\n-\t\tunsigned int index,\n+\t\tuint32_t index,\n \t\tstruct nfp_eth_table_port *dst)\n {\n-\tunsigned int rate;\n-\tunsigned int fec;\n+\tuint32_t rate;\n+\tuint32_t fec;\n \tuint64_t port, state;\n \n \tport = rte_le_to_cpu_64(src->port);\n@@ -224,7 +224,7 @@ nfp_eth_port_translate(struct nfp_nsp *nsp,\n static void\n nfp_eth_calc_port_geometry(struct nfp_eth_table *table)\n {\n-\tunsigned int i, j;\n+\tuint32_t i, j;\n \n \tfor (i = 0; i < table->count; i++) {\n \t\ttable->max_index = RTE_MAX(table->max_index,\n@@ -269,7 +269,9 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp)\n \tunion eth_table_entry *entries;\n \tstruct nfp_eth_table *table;\n \tuint32_t table_sz;\n-\tint i, j, ret, cnt = 0;\n+\tuint32_t i;\n+\tuint32_t j;\n+\tint ret, cnt = 0;\n \tconst struct rte_ether_addr *mac;\n \n \tentries = malloc(NSP_ETH_TABLE_SIZE);\n@@ -319,7 +321,7 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp)\n \t}\n \n \tnfp_eth_calc_port_geometry(table);\n-\tfor (i = 0; i < (int)table->count; i++)\n+\tfor (i = 0; i < table->count; i++)\n \t\tnfp_eth_calc_port_type(&table->ports[i]);\n \n \tfree(entries);\n@@ -358,7 +360,7 @@ nfp_eth_read_ports(struct nfp_cpp *cpp)\n \n struct nfp_nsp *\n nfp_eth_config_start(struct nfp_cpp *cpp,\n-\t\tunsigned int idx)\n+\t\tuint32_t idx)\n {\n \tunion eth_table_entry *entries;\n \tstruct nfp_nsp *nsp;\n@@ -452,7 +454,7 @@ nfp_eth_config_commit_end(struct nfp_nsp *nsp)\n */\n int\n nfp_eth_set_mod_enable(struct nfp_cpp *cpp,\n-\t\tunsigned int idx,\n+\t\tuint32_t idx,\n \t\tint enable)\n {\n \tunion eth_table_entry *entries;\n@@ -494,7 +496,7 @@ nfp_eth_set_mod_enable(struct nfp_cpp *cpp,\n */\n int\n nfp_eth_set_configured(struct nfp_cpp *cpp,\n-\t\tunsigned int idx,\n+\t\tuint32_t idx,\n \t\tint configed)\n {\n \tunion eth_table_entry *entries;\n@@ -532,14 +534,14 @@ nfp_eth_set_configured(struct nfp_cpp *cpp,\n \n static int\n nfp_eth_set_bit_config(struct nfp_nsp *nsp,\n-\t\tunsigned int raw_idx,\n+\t\tuint32_t raw_idx,\n \t\tconst uint64_t mask,\n-\t\tconst unsigned int shift,\n-\t\tunsigned int val,\n+\t\tconst uint32_t shift,\n+\t\tuint32_t val,\n \t\tconst uint64_t ctrl_bit)\n {\n \tunion eth_table_entry *entries = nfp_nsp_config_entries(nsp);\n-\tunsigned int idx = nfp_nsp_config_idx(nsp);\n+\tuint32_t idx = nfp_nsp_config_idx(nsp);\n \tuint64_t reg;\n \n \t/*\n@@ -623,7 +625,7 @@ __nfp_eth_set_fec(struct nfp_nsp *nsp,\n */\n int\n nfp_eth_set_fec(struct nfp_cpp *cpp,\n-\t\tunsigned int idx,\n+\t\tuint32_t idx,\n \t\tenum nfp_eth_fec mode)\n {\n \tstruct nfp_nsp *nsp;\n@@ -656,7 +658,7 @@ nfp_eth_set_fec(struct nfp_cpp *cpp,\n */\n int\n __nfp_eth_set_speed(struct nfp_nsp *nsp,\n-\t\tunsigned int speed)\n+\t\tuint32_t speed)\n {\n \tenum nfp_eth_rate rate;\n \n@@ -682,7 +684,7 @@ __nfp_eth_set_speed(struct nfp_nsp *nsp,\n */\n int\n __nfp_eth_set_split(struct nfp_nsp *nsp,\n-\t\tunsigned int lanes)\n+\t\tuint32_t lanes)\n {\n \treturn NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_PORT,\n \t\t\tNSP_ETH_PORT_LANES, lanes, NSP_ETH_CTRL_SET_LANES);\ndiff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c\nindex 57089c770f..9dd4832779 100644\n--- a/drivers/net/nfp/nfpcore/nfp_resource.c\n+++ b/drivers/net/nfp/nfpcore/nfp_resource.c\n@@ -156,7 +156,7 @@ nfp_resource_acquire(struct nfp_cpp *cpp,\n \tstruct nfp_resource *res;\n \tint err;\n \tstruct timespec wait;\n-\tint count;\n+\tuint16_t count;\n \n \tres = malloc(sizeof(*res));\n \tif (res == NULL)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c\nindex aa3b7a483e..243d3c9ce5 100644\n--- a/drivers/net/nfp/nfpcore/nfp_rtsym.c\n+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c\n@@ -382,7 +382,7 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl,\n uint8_t *\n nfp_rtsym_map(struct nfp_rtsym_table *rtbl,\n \t\tconst char *name,\n-\t\tunsigned int min_size,\n+\t\tuint32_t min_size,\n \t\tstruct nfp_cpp_area **area)\n {\n \tint ret;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.h b/drivers/net/nfp/nfpcore/nfp_rtsym.h\nindex 30768f1ccf..e7295258b3 100644\n--- a/drivers/net/nfp/nfpcore/nfp_rtsym.h\n+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.h\n@@ -56,5 +56,5 @@ const struct nfp_rtsym *nfp_rtsym_lookup(struct nfp_rtsym_table *rtbl,\n uint64_t nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl, const char *name,\n \t\tint *error);\n uint8_t *nfp_rtsym_map(struct nfp_rtsym_table *rtbl, const char *name,\n-\t\tunsigned int min_size, struct nfp_cpp_area **area);\n+\t\tuint32_t min_size, struct nfp_cpp_area **area);\n #endif\n", "prefixes": [ "v4", "03/26" ] }