Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131553/?format=api
{ "id": 131553, "url": "http://patches.dpdk.org/api/patches/131553/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230918024612.1600536-20-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-20-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230918024612.1600536-20-chaoyong.he@corigine.com", "date": "2023-09-18T02:46:05", "name": "[v4,19/26] net/nfp: refact the mutex module", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "0f8b0ba5228108e08d618dc26d48d1a2399a94f8", "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-20-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/131553/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/131553/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 4FAF1425C9;\n\tMon, 18 Sep 2023 04:49:44 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 887E742D0B;\n\tMon, 18 Sep 2023 04:47:50 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2099.outbound.protection.outlook.com [40.107.244.99])\n by mails.dpdk.org (Postfix) with ESMTP id ED769411F3\n for <dev@dpdk.org>; Mon, 18 Sep 2023 04:47:45 +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:44 +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:44 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=imK2DEWWW8n6RDHXp5qz4+f2vgPWFThOH1b4eJHIUv7fRXbYjaVCHf/0ZkFL9/Mqa89TTRFYhjILjhxaWHaYuw5/UGg0zqonCMOAxqEtHYoj/qLplDAmAtgVOr6kGor724HIoxeYAtjwrnuOIVVcy9WQ91y4t9vC5dd8k995FcG9M9PlaIsl7GWdn5FbkSZT5ScEKoWBZst/1QdoKXGx+ZyQ6ElVjxYKB6xuQDw5EpXi+NAN7n+wWE2Bn28b4qpdC6u+lkAvtg2r0f17jd2GtmkgIc9xxLjeaDH8+TIFz+eXM0zTaTjhCymUVkuXSU1QUZIeLOJarLK+zDPoZFCyjg==", "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=IOgFsqfvnNLZXXFbICi/bw9LVDspv51m0afbB0POPSw=;\n b=mbWQqwEZSeYyc7yvRhNb66khNmQE3r6G7T7tq9ftDrYO5POkjb4QXmSWkB2+yvsqI+V/halrrwToUmuD/9XPi5fLBbWf9t52BC38oBgy3Sho+2Dw09Zd03/VIaJZ9pQfMv1IChG5B490ZKglROV4dXkErDIck0SEatCFr7CnXlnxgKC3o4YMS3aHVgIs4gktvzcn1TrUYIPxflTNJ9TwvLj6jyYjuMYKnDRiuRpa1v7iSIfMOnteorubDKRBVFIvK2YHxRrwnZ3Soobx0Zyg2zcu8Kc6iP9bB5jJcHKuj3ojLdEoOmk/bdqei+akt4MIf/IBa96MtXEp9xZuTXCfdg==", "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=IOgFsqfvnNLZXXFbICi/bw9LVDspv51m0afbB0POPSw=;\n b=RiLGEwyt58bDfZq6bGi2bhTgaxyS1BH5KKwmIV3nMvZXnFBjrgXnYfXY5WJLrdlhpvH5RGJ23P6DAdH0emofwptVwpgt9nF1Q5j/5iCg22kWBgod1H5KE69Z3Y0BP3wkmfs1MgNxxTET8zw2cyJC7u/ZexoUwyXdF9I9orbQL10=", "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 19/26] net/nfp: refact the mutex module", "Date": "Mon, 18 Sep 2023 10:46:05 +0800", "Message-Id": "<20230918024612.1600536-20-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": "66483759-805f-4517-85a3-08dbb7f1a24c", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n HsENdSNSv+tTFvoOtVSzAsZvv3galwCfx+muQ/L1Aex4kdvMZdzDM+xA/U/fDrS2BvDcfZCMmtHWnhs4IcWNDTTwGCBlpRaonHT+/J5Il9twu1lml+BbjKQMaMxsljl4TfsnuFdB4i5O8IrG/ch6ZibKng/xGeBMIFhC6Ie1Pqu4EcwFnLWe6RjK/05hMc8ynLKNSS2QGKPvvS8xnFCKaXVcb1W81szWDvYRgg49Xcuoxy1PtM/LMuFezAcFI7GZjLg1/XY2hcAAiPlzdpR8LxTIPA8Yl9ROZgrTzznTMEb50u3tpsg3i3/AekxNyM9Xy9RbnmWSmQas7FQNBWeezert3sN++g7+ecKc40+O/j8aHtUZQXLCYy+++p1S4Gtwq+Y2w2xSE11pBGQKlBZCwVhFuUikohoNKPfYQOO2Atxy7j7tHU2IflTXE7n1VQXtMpcNxsRUtukquMrthTZzDAiQ6FBJBSkd+6agouEk8ypI9iicd2/sI1zOd42mnkqUTeWqOnY48JVX5+EBVgqFh9R7wiK4EIadinhwAF3gVHbEpyY40kJvX4i9lyn0T/Vjji9xlh1w5Vgd1pdcWp8kpEVUIuc+yWYakXz2RG42L1xtwSYr93zQYdg9y0Dv2FT5WUHdRZ+vTeqTdNV0Crz74TUPCOhMOK0A77MS5TmW3kU=", "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);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?8e5abojoqfrUAwh5Fx2pK3ReQWDo?=\n\t=?utf-8?q?TUS6VGXfBvZ0380YeVMRnIsjRlUmSZb0yOjSYecee+aw1Pj3FPENyL2HJ9Rz4LXpA?=\n\t=?utf-8?q?OOz3xq110TDDcz/oOD2dOpc8qQkIYr3hvvHLqI9EI+OL/CyphREQ3UcPepUHk6cP5?=\n\t=?utf-8?q?KIQ8xPxu5/iy1zCW0LzflPHulAQamgKctZ9/bx1YoNtgYm4lhgiWSTnga+1M4i+56?=\n\t=?utf-8?q?kuW/v9em59jvf6IS+238B17sk0jWZ0eL/GdAUq7cekEA8ov68/9TDkvu15VFs2/dd?=\n\t=?utf-8?q?+17TMzV2rkyMw4P9T/cI0/DcSyDtsnO40uTBGzna4b5F208ivaiYoDfgnE1wQeIJ2?=\n\t=?utf-8?q?iYE1zkLomPTWSbhWExfLhVyit5j7BJjqYwQqCQzdTg7OojdDEwxxVW7WD8CXj3LNh?=\n\t=?utf-8?q?nlewZxeQj1bry/XgQf/SGJWN8R/qkUWAOJvha99v7g0M+ykGLW639qLmwtZt0Pb/h?=\n\t=?utf-8?q?GemKP+8loeOC66LaNTQmUEBuu1PVPaBNxBQ8QGiseLg4pvF1efYQ8rqaGXd7/cJxt?=\n\t=?utf-8?q?8AiUrlxBS58WsgqxYpkofI+HwJ/rZRvJLyoV6flbL074NagR/tzBKd5E/ZXFBi6D0?=\n\t=?utf-8?q?DD4VafrVtA+yyabwa4fwRl/9jrhWS0TMW3TagmbfFDAgxRu5UIvYG1+0rJskxpUMy?=\n\t=?utf-8?q?SEd+D6H3rJlQIE8/4NIgr28Ma/bmagcVfJ99OBPfwvbnKle0JlWLvu1OecQCGSiva?=\n\t=?utf-8?q?fYd0/hDJMRU2S1o99a8QpdlRqHw/6lWjoh/NSTv+lGdirKXEZgfPdSORrOiAlIY3n?=\n\t=?utf-8?q?5jWexzcI+CVN8O5dAs9osnFlu94YQ/v6w407e9jqjDS6pKsjYWqk/c0XJ7z7HhpqJ?=\n\t=?utf-8?q?JiZwzRqxe8QkyE0oUFaOWagn8YE4D+VHSOsfhxptSuamZbptBwmNpY60fVIl4F5sD?=\n\t=?utf-8?q?qAaG3G55lBs6Z2F1WxYkqpfuXg3/en3bgfRQNlqio/AVW5w62tEAYfEIGxGTodbKs?=\n\t=?utf-8?q?hMNcLjhApxQ7A30PVIqa02TWQqZ6/IRjlYKXqiGIaCpHyThD1C60zP4+oNiskiZsL?=\n\t=?utf-8?q?N4SCQDlXzl/qsGQTRY7c7LAd+YsI/uOqrdE11dZBZ4nFbVBgDMdb2cHmMrG6+wVHg?=\n\t=?utf-8?q?weYqIE8LojH/9mmtC67Q6jeiB65JvHSwNWBmJzWWn7dQP4Q0hBySbiTCzcv8NpIYe?=\n\t=?utf-8?q?EWRkAmQ+HZRBFrNNjx8ofZh2PTt0I5iTBpBo3gDo2TUqB3LV4WocsUMbOgAwYh9p9?=\n\t=?utf-8?q?4fEE1BHBIcKvMHbHYVLEVWiJ/xWuiJTX3GnNrOf5f8Rb4mY4aWpyOGDzPj27jjZFY?=\n\t=?utf-8?q?Qx6kt9oWdPyM1rOwzczR91PbESgYZxVNBvG7ngOzu15ZGMApjrxluGmbbRJqIn4On?=\n\t=?utf-8?q?g1plTbzG8JwwAARihCkqHRGvtkU5mmomnc/52IE4x21jYZsWXe2bNISmx8A5s846A?=\n\t=?utf-8?q?4z7YRYsCE4qxBY0qFH9ey8gwLHkGK6vMp8Iu2UKoBvVJOT5Oyq/HntCm/dSOivZqT?=\n\t=?utf-8?q?sk/9VoAEKVAZlYrLEFnum/KM41/1ODlVFg9jo0YCVcEMGYFzYNxyHTO+v6X7LZ4+3?=\n\t=?utf-8?q?xaeClahPsT0DMHY1pnHNOm9fdILIX4l86w=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 66483759-805f-4517-85a3-08dbb7f1a24c", "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:44.3620 (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 /rfJngMqtrexpmSpZ1rUTdGfouzq0sHnWtnZpPE27ZdlsKEPLmy6BfB/lAJkVq328VOCtO2X0MO3goIsJrRa2ehn6PArw/t8KIZZYTSu0mw=", "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": "Add a header file to holds the API declarations of this module.\nAlso sync the logic from kernel driver and remove the unneeded header\nfile include statements.\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 | 16 --\n drivers/net/nfp/nfpcore/nfp_mutex.c | 205 ++++++++++++++-----------\n drivers/net/nfp/nfpcore/nfp_mutex.h | 25 +++\n drivers/net/nfp/nfpcore/nfp_resource.c | 1 +\n 4 files changed, 138 insertions(+), 109 deletions(-)\n create mode 100644 drivers/net/nfp/nfpcore/nfp_mutex.h", "diff": "diff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h\nindex be7ae1d919..42c4df5fdd 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp.h\n@@ -8,8 +8,6 @@\n \n #include <ethdev_pci.h>\n \n-struct nfp_cpp_mutex;\n-\n /* NFP CPP handle */\n struct nfp_cpp {\n \tuint32_t model;\n@@ -426,20 +424,6 @@ int nfp_cpp_readq(struct nfp_cpp *cpp, uint32_t cpp_id,\n int nfp_cpp_writeq(struct nfp_cpp *cpp, uint32_t cpp_id,\n \t\tuint64_t address, uint64_t value);\n \n-int nfp_cpp_mutex_init(struct nfp_cpp *cpp, int target,\n-\t\tuint64_t address, uint32_t key_id);\n-\n-struct nfp_cpp_mutex *nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, int target,\n-\t\tuint64_t address, uint32_t key_id);\n-\n-void nfp_cpp_mutex_free(struct nfp_cpp_mutex *mutex);\n-\n-int nfp_cpp_mutex_lock(struct nfp_cpp_mutex *mutex);\n-\n-int nfp_cpp_mutex_unlock(struct nfp_cpp_mutex *mutex);\n-\n-int nfp_cpp_mutex_trylock(struct nfp_cpp_mutex *mutex);\n-\n uint32_t nfp_cpp_mu_locality_lsb(struct nfp_cpp *cpp);\n \n #endif /* __NFP_CPP_H__ */\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c\nindex 96ba60697c..3c10c7a090 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mutex.c\n+++ b/drivers/net/nfp/nfpcore/nfp_mutex.c\n@@ -3,21 +3,13 @@\n * All rights reserved.\n */\n \n-#include <malloc.h>\n-#include <time.h>\n+#include \"nfp_mutex.h\"\n+\n #include <sched.h>\n \n-#include \"nfp_cpp.h\"\n #include \"nfp_logs.h\"\n #include \"nfp_target.h\"\n \n-#define MUTEX_LOCKED(interface) ((((uint32_t)(interface)) << 16) | 0x000f)\n-#define MUTEX_UNLOCK(interface) (0 | 0x0000)\n-\n-#define MUTEX_IS_LOCKED(value) (((value) & 0xffff) == 0x000f)\n-#define MUTEX_IS_UNLOCKED(value) (((value) & 0xffff) == 0x0000)\n-#define MUTEX_INTERFACE(value) (((value) >> 16) & 0xffff)\n-\n /*\n * If you need more than 65536 recursive locks, please\n * rethink your code.\n@@ -34,21 +26,51 @@ struct nfp_cpp_mutex {\n \tstruct nfp_cpp_mutex *prev, *next;\n };\n \n+static inline uint32_t\n+nfp_mutex_locked(uint16_t interface)\n+{\n+\treturn (uint32_t)interface << 16 | 0x000f;\n+}\n+\n+static inline uint32_t\n+nfp_mutex_unlocked(uint16_t interface)\n+{\n+\treturn (uint32_t)interface << 16 | 0x0000;\n+}\n+\n+static inline uint16_t\n+nfp_mutex_owner(uint32_t val)\n+{\n+\treturn (val >> 16) & 0xffff;\n+}\n+\n+static inline bool\n+nfp_mutex_is_locked(uint32_t val)\n+{\n+\treturn (val & 0xffff) == 0x000f;\n+}\n+\n+static inline bool\n+nfp_mutex_is_unlocked(uint32_t val)\n+{\n+\treturn (val & 0xffff) == 0;\n+}\n+\n static int\n-nfp_cpp_mutex_validate(uint32_t model,\n+nfp_cpp_mutex_validate(uint16_t interface,\n \t\tint *target,\n \t\tuint64_t address)\n {\n+\t/* Not permitted on invalid interfaces */\n+\tif (NFP_CPP_INTERFACE_TYPE_of(interface) == NFP_CPP_INTERFACE_TYPE_INVALID)\n+\t\treturn -EINVAL;\n+\n \t/* Address must be 64-bit aligned */\n \tif ((address & 7) != 0)\n \t\treturn -EINVAL;\n \n-\tif (NFP_CPP_MODEL_IS_6000(model)) {\n-\t\tif (*target != NFP_CPP_TARGET_MU)\n-\t\t\treturn -EINVAL;\n-\t} else {\n+\tif (*target != NFP_CPP_TARGET_MU)\n \t\treturn -EINVAL;\n-\t}\n \n \treturn 0;\n }\n@@ -84,10 +106,10 @@ nfp_cpp_mutex_init(struct nfp_cpp *cpp,\n \t\tuint32_t key)\n {\n \tint err;\n-\tuint32_t model = nfp_cpp_model(cpp);\n \tuint32_t muw = NFP_CPP_ID(target, 4, 0); /* atomic_write */\n+\tuint16_t interface = nfp_cpp_interface(cpp);\n \n-\terr = nfp_cpp_mutex_validate(model, &target, address);\n+\terr = nfp_cpp_mutex_validate(interface, &target, address);\n \tif (err < 0)\n \t\treturn err;\n \n@@ -95,8 +117,7 @@ nfp_cpp_mutex_init(struct nfp_cpp *cpp,\n \tif (err < 0)\n \t\treturn err;\n \n-\terr = nfp_cpp_writel(cpp, muw, address + 0,\n-\t\t\tMUTEX_LOCKED(nfp_cpp_interface(cpp)));\n+\terr = nfp_cpp_writel(cpp, muw, address, nfp_mutex_locked(interface));\n \tif (err < 0)\n \t\treturn err;\n \n@@ -133,26 +154,10 @@ nfp_cpp_mutex_alloc(struct nfp_cpp *cpp,\n \tint err;\n \tuint32_t tmp;\n \tstruct nfp_cpp_mutex *mutex;\n-\tuint32_t model = nfp_cpp_model(cpp);\n \tuint32_t mur = NFP_CPP_ID(target, 3, 0); /* atomic_read */\n+\tuint16_t interface = nfp_cpp_interface(cpp);\n \n-\t/* Look for cached mutex */\n-\tfor (mutex = cpp->mutex_cache; mutex; mutex = mutex->next) {\n-\t\tif (mutex->target == target && mutex->address == address)\n-\t\t\tbreak;\n-\t}\n-\n-\tif (mutex) {\n-\t\tif (mutex->key == key) {\n-\t\t\tmutex->usage++;\n-\t\t\treturn mutex;\n-\t\t}\n-\n-\t\t/* If the key doesn't match... */\n-\t\treturn NULL;\n-\t}\n-\n-\terr = nfp_cpp_mutex_validate(model, &target, address);\n+\terr = nfp_cpp_mutex_validate(interface, &target, address);\n \tif (err < 0)\n \t\treturn NULL;\n \n@@ -172,16 +177,6 @@ nfp_cpp_mutex_alloc(struct nfp_cpp *cpp,\n \tmutex->address = address;\n \tmutex->key = key;\n \tmutex->depth = 0;\n-\tmutex->usage = 1;\n-\n-\t/* Add mutex to the cache */\n-\tif (cpp->mutex_cache) {\n-\t\tcpp->mutex_cache->prev = mutex;\n-\t\tmutex->next = cpp->mutex_cache;\n-\t\tcpp->mutex_cache = mutex;\n-\t} else {\n-\t\tcpp->mutex_cache = mutex;\n-\t}\n \n \treturn mutex;\n }\n@@ -195,20 +190,6 @@ nfp_cpp_mutex_alloc(struct nfp_cpp *cpp,\n void\n nfp_cpp_mutex_free(struct nfp_cpp_mutex *mutex)\n {\n-\tmutex->usage--;\n-\tif (mutex->usage > 0)\n-\t\treturn;\n-\n-\t/* Remove mutex from the cache */\n-\tif (mutex->next)\n-\t\tmutex->next->prev = mutex->prev;\n-\tif (mutex->prev)\n-\t\tmutex->prev->next = mutex->next;\n-\n-\t/* If mutex->cpp == NULL, something broke */\n-\tif (mutex->cpp && mutex == mutex->cpp->mutex_cache)\n-\t\tmutex->cpp->mutex_cache = mutex->next;\n-\n \tfree(mutex);\n }\n \n@@ -268,32 +249,28 @@ nfp_cpp_mutex_unlock(struct nfp_cpp_mutex *mutex)\n \t\treturn 0;\n \t}\n \n-\terr = nfp_cpp_readl(mutex->cpp, mur, mutex->address, &value);\n-\tif (err < 0)\n-\t\tgoto exit;\n-\n \terr = nfp_cpp_readl(mutex->cpp, mur, mutex->address + 4, &key);\n \tif (err < 0)\n-\t\tgoto exit;\n+\t\treturn err;\n \n-\tif (key != mutex->key) {\n-\t\terr = -EPERM;\n-\t\tgoto exit;\n-\t}\n+\tif (key != mutex->key)\n+\t\treturn -EPERM;\n \n-\tif (value != MUTEX_LOCKED(interface)) {\n-\t\terr = -EACCES;\n-\t\tgoto exit;\n-\t}\n+\terr = nfp_cpp_readl(mutex->cpp, mur, mutex->address, &value);\n+\tif (err < 0)\n+\t\treturn err;\n+\n+\tif (value != nfp_mutex_locked(interface))\n+\t\treturn -EACCES;\n \n-\terr = nfp_cpp_writel(cpp, muw, mutex->address, MUTEX_UNLOCK(interface));\n+\terr = nfp_cpp_writel(cpp, muw, mutex->address,\n+\t\t\tnfp_mutex_unlocked(interface));\n \tif (err < 0)\n-\t\tgoto exit;\n+\t\treturn err;\n \n \tmutex->depth = 0;\n \n-exit:\n-\treturn err;\n+\treturn 0;\n }\n \n /**\n@@ -332,19 +309,17 @@ nfp_cpp_mutex_trylock(struct nfp_cpp_mutex *mutex)\n \t/* Verify that the lock marker is not damaged */\n \terr = nfp_cpp_readl(cpp, mur, mutex->address + 4, &key);\n \tif (err < 0)\n-\t\tgoto exit;\n+\t\treturn err;\n \n-\tif (key != mutex->key) {\n-\t\terr = -EPERM;\n-\t\tgoto exit;\n-\t}\n+\tif (key != mutex->key)\n+\t\treturn -EPERM;\n \n \t/*\n \t * Compare against the unlocked state, and if true,\n \t * write the interface id into the top 16 bits, and\n \t * mark as locked.\n \t */\n-\tvalue = MUTEX_LOCKED(nfp_cpp_interface(cpp));\n+\tvalue = nfp_mutex_locked(nfp_cpp_interface(cpp));\n \n \t/*\n \t * We use test_set_imm here, as it implies a read\n@@ -361,10 +336,10 @@ nfp_cpp_mutex_trylock(struct nfp_cpp_mutex *mutex)\n \t */\n \terr = nfp_cpp_readl(cpp, mus, mutex->address, &tmp);\n \tif (err < 0)\n-\t\tgoto exit;\n+\t\treturn err;\n \n \t/* Was it unlocked? */\n-\tif (MUTEX_IS_UNLOCKED(tmp)) {\n+\tif (nfp_mutex_is_unlocked(tmp)) {\n \t\t/*\n \t\t * The read value can only be 0x....0000 in the unlocked state.\n \t\t * If there was another contending for this lock, then\n@@ -376,20 +351,64 @@ nfp_cpp_mutex_trylock(struct nfp_cpp_mutex *mutex)\n \t\t */\n \t\terr = nfp_cpp_writel(cpp, muw, mutex->address, value);\n \t\tif (err < 0)\n-\t\t\tgoto exit;\n+\t\t\treturn err;\n \n \t\tmutex->depth = 1;\n-\t\tgoto exit;\n+\t\treturn 0;\n \t}\n \n \t/* Already locked by us? Success! */\n \tif (tmp == value) {\n \t\tmutex->depth = 1;\n-\t\tgoto exit;\n+\t\treturn 0;\n \t}\n \n-\terr = MUTEX_IS_LOCKED(tmp) ? -EBUSY : -EINVAL;\n+\treturn nfp_mutex_is_locked(tmp) ? -EBUSY : -EINVAL;\n+}\n+\n+/**\n+ * Release lock if held by local system.\n+ * Extreme care is advised, call only when no local lock users can exist.\n+ *\n+ * @param cpp\n+ * NFP CPP handle\n+ * @param target\n+ * NFP CPP target ID (ie NFP_CPP_TARGET_CLS or NFP_CPP_TARGET_MU)\n+ * @param address\n+ * Offset into the address space of the NFP CPP target ID\n+ *\n+ * @return\n+ * - (0) if the lock was OK\n+ * - (1) if locked by us\n+ * - (-errno) on invalid mutex\n+ */\n+int\n+nfp_cpp_mutex_reclaim(struct nfp_cpp *cpp,\n+\t\tint target,\n+\t\tuint64_t address)\n+{\n+\tint err;\n+\tuint32_t tmp;\n+\tuint16_t interface = nfp_cpp_interface(cpp);\n+\tconst uint32_t mur = NFP_CPP_ID(target, 3, 0); /* atomic_read */\n+\tconst uint32_t muw = NFP_CPP_ID(target, 4, 0); /* atomic_write */\n+\n+\terr = nfp_cpp_mutex_validate(interface, &target, address);\n+\tif (err != 0)\n+\t\treturn err;\n+\n+\t/* Check lock */\n+\terr = nfp_cpp_readl(cpp, mur, address, &tmp);\n+\tif (err < 0)\n+\t\treturn err;\n+\n+\tif (nfp_mutex_is_unlocked(tmp) || nfp_mutex_owner(tmp) != interface)\n+\t\treturn 0;\n+\n+\t/* Bust the lock */\n+\terr = nfp_cpp_writel(cpp, muw, address, nfp_mutex_unlocked(interface));\n+\tif (err < 0)\n+\t\treturn err;\n \n-exit:\n-\treturn err;\n+\treturn 1;\n }\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mutex.h b/drivers/net/nfp/nfpcore/nfp_mutex.h\nnew file mode 100644\nindex 0000000000..a79490b4d6\n--- /dev/null\n+++ b/drivers/net/nfp/nfpcore/nfp_mutex.h\n@@ -0,0 +1,25 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2023 Corigine, Inc.\n+ * All rights reserved.\n+ */\n+\n+#ifndef __NFP_MUTEX_H__\n+#define __NFP_MUTEX_H__\n+\n+#include \"nfp_cpp.h\"\n+\n+struct nfp_cpp_mutex;\n+\n+int nfp_cpp_mutex_init(struct nfp_cpp *cpp, int target,\n+\t\tuint64_t address, uint32_t key_id);\n+\n+struct nfp_cpp_mutex *nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, int target,\n+\t\tuint64_t address, uint32_t key_id);\n+\n+void nfp_cpp_mutex_free(struct nfp_cpp_mutex *mutex);\n+int nfp_cpp_mutex_lock(struct nfp_cpp_mutex *mutex);\n+int nfp_cpp_mutex_unlock(struct nfp_cpp_mutex *mutex);\n+int nfp_cpp_mutex_trylock(struct nfp_cpp_mutex *mutex);\n+int nfp_cpp_mutex_reclaim(struct nfp_cpp *cpp, int target, uint64_t address);\n+\n+#endif /* __NFP_MUTEX_H__ */\ndiff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c\nindex 539eb69680..d59d2d6c1e 100644\n--- a/drivers/net/nfp/nfpcore/nfp_resource.c\n+++ b/drivers/net/nfp/nfpcore/nfp_resource.c\n@@ -7,6 +7,7 @@\n \n #include \"nfp_crc.h\"\n #include \"nfp_logs.h\"\n+#include \"nfp_mutex.h\"\n #include \"nfp_target.h\"\n \n #define NFP_RESOURCE_TBL_TARGET NFP_CPP_TARGET_MU\n", "prefixes": [ "v4", "19/26" ] }