Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2165669/?format=api
{ "id": 2165669, "url": "http://patchwork.ozlabs.org/api/patches/2165669/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20251117134912.18566-16-larysa.zaremba@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20251117134912.18566-16-larysa.zaremba@intel.com>", "list_archive_url": null, "date": "2025-11-17T13:48:55", "name": "[iwl-next,v5,15/15] ixd: add devlink support", "commit_ref": null, "pull_url": null, "state": "under-review", "archived": false, "hash": "5fd7309fabfdb4b07a2a4d5e4bac1b91ffefd37e", "submitter": { "id": 84900, "url": "http://patchwork.ozlabs.org/api/people/84900/?format=api", "name": "Larysa Zaremba", "email": "larysa.zaremba@intel.com" }, "delegate": { "id": 109701, "url": "http://patchwork.ozlabs.org/api/users/109701/?format=api", "username": "anguy11", "first_name": "Anthony", "last_name": "Nguyen", "email": "anthony.l.nguyen@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20251117134912.18566-16-larysa.zaremba@intel.com/mbox/", "series": [ { "id": 482391, "url": "http://patchwork.ozlabs.org/api/series/482391/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=482391", "date": "2025-11-17T13:48:40", "name": "Introduce iXD driver", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/482391/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2165669/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2165669/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@legolas.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256\n header.s=default header.b=6hWcQOM3;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4d98J23xFMz1yDb\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 18 Nov 2025 00:49:54 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 1E332805E7;\n\tMon, 17 Nov 2025 13:49:53 +0000 (UTC)", "from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id qZymi0Q0G5pP; Mon, 17 Nov 2025 13:49:51 +0000 (UTC)", "from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 5CB8B81298;\n\tMon, 17 Nov 2025 13:49:51 +0000 (UTC)", "from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n by lists1.osuosl.org (Postfix) with ESMTP id 1BCD5158\n for <intel-wired-lan@lists.osuosl.org>; Mon, 17 Nov 2025 13:49:50 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp3.osuosl.org (Postfix) with ESMTP id A3FEE60DD0\n for <intel-wired-lan@lists.osuosl.org>; Mon, 17 Nov 2025 13:49:48 +0000 (UTC)", "from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id Jxhf8SC70Jwf for <intel-wired-lan@lists.osuosl.org>;\n Mon, 17 Nov 2025 13:49:47 +0000 (UTC)", "from mgamail.intel.com (mgamail.intel.com [198.175.65.12])\n by smtp3.osuosl.org (Postfix) with ESMTPS id 9C57960DC3\n for <intel-wired-lan@lists.osuosl.org>; Mon, 17 Nov 2025 13:49:47 +0000 (UTC)", "from fmviesa007.fm.intel.com ([10.60.135.147])\n by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 17 Nov 2025 05:49:47 -0800", "from irvmail002.ir.intel.com ([10.43.11.120])\n by fmviesa007.fm.intel.com with ESMTP; 17 Nov 2025 05:49:41 -0800", "from mglak.igk.intel.com (mglak.igk.intel.com [10.237.112.146])\n by irvmail002.ir.intel.com (Postfix) with ESMTP id C7D5A37E27;\n Mon, 17 Nov 2025 13:49:39 +0000 (GMT)" ], "X-Virus-Scanned": [ "amavis at osuosl.org", "amavis at osuosl.org" ], "X-Comment": "SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=<UNKNOWN> ", "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5CB8B81298", "OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9C57960DC3" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1763387391;\n\tbh=ijvUGGwxdyV58RWesvu2j6/NMtX/z+7YfWTqsz3JL9M=;\n\th=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id:\n\t List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:\n\t From;\n\tb=6hWcQOM36HXheeyG/DmDMIoWQWNdtQSQdqxHEWIZ/DTN9kI5wzS26tUAtXA9nc1m4\n\t wz6biyen7Sv6+JQSaByZjl1Ay/Khb51FZhxc5MDqmxxZ4NRcuBQMGw/CvMmTxno1nm\n\t saQDQ2jyhxJ6fmOllN7RlHhe/4m/sKmk9TNlJXADnSKBmBPPpC526GH/Lj8CcWpJ05\n\t oBDj3DaETDFD3O9G4jUEbiZ7DImEYLKDz1KpbxbeaUGu5eWRyWB3UuFnvJsXlkYuor\n\t Hdf2pEXQtbz4KnP8HvbassftnFhHcH666OBaAAnxy3PjMBCaAwRY1zFtdmmrjPwBAN\n\t PstclmWg93I4Q==", "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=198.175.65.12;\n helo=mgamail.intel.com; envelope-from=larysa.zaremba@intel.com;\n receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp3.osuosl.org 9C57960DC3", "X-CSE-ConnectionGUID": [ "MAGyQfgRRciSesv1p7WSEw==", "gQzIQI2KSPmBrMtKGPHfCA==" ], "X-CSE-MsgGUID": [ "3bLHqSxbTnm4kSF351V4yA==", "KZNWRfgnR8emJV+0ZaeH2Q==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11616\"; a=\"76846219\"", "E=Sophos;i=\"6.19,311,1754982000\"; d=\"scan'208\";a=\"76846219\"", "E=Sophos;i=\"6.19,311,1754982000\"; d=\"scan'208\";a=\"190115783\"" ], "X-ExtLoop1": "1", "From": "Larysa Zaremba <larysa.zaremba@intel.com>", "To": "intel-wired-lan@lists.osuosl.org, Tony Nguyen <anthony.l.nguyen@intel.com>", "Cc": "aleksander.lobakin@intel.com, sridhar.samudrala@intel.com,\n \"Singhai, Anjali\" <anjali.singhai@intel.com>,\n Michal Swiatkowski <michal.swiatkowski@linux.intel.com>,\n Larysa Zaremba <larysa.zaremba@intel.com>,\n \"Fijalkowski, Maciej\" <maciej.fijalkowski@intel.com>,\n Emil Tantilov <emil.s.tantilov@intel.com>,\n Madhu Chittim <madhu.chittim@intel.com>, Josh Hay <joshua.a.hay@intel.com>,\n \"Keller, Jacob E\" <jacob.e.keller@intel.com>,\n jayaprakash.shanmugam@intel.com, natalia.wochtman@intel.com,\n Jiri Pirko <jiri@resnulli.us>, \"David S. Miller\" <davem@davemloft.net>,\n Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>,\n Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,\n Jonathan Corbet <corbet@lwn.net>,\n Richard Cochran <richardcochran@gmail.com>,\n Przemek Kitszel <przemyslaw.kitszel@intel.com>,\n Andrew Lunn <andrew+netdev@lunn.ch>, netdev@vger.kernel.org,\n linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org", "Date": "Mon, 17 Nov 2025 14:48:55 +0100", "Message-ID": "<20251117134912.18566-16-larysa.zaremba@intel.com>", "X-Mailer": "git-send-email 2.47.0", "In-Reply-To": "<20251117134912.18566-1-larysa.zaremba@intel.com>", "References": "<20251117134912.18566-1-larysa.zaremba@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Original-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1763387388; x=1794923388;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=yuD4e5XxhzbzH8sQyX9Rr7RvQO0PFoXMDabw9XvD2ZE=;\n b=Gmu1IYr0aHFprr4k1q+NFrsbv1HyEnTedq8+HqLqHlEvsMp9yF/3lQuS\n 3GNd+HXU64NTPJNXbZN5GZqOU3jCsTJ67aVDv/9Uw0/jn/CWgk+M4gd0h\n LXE2JSBZRvL7ogwFLuyzDTcjI8kpKeS1bpQc7lIcjZU6klMWsW7upezG2\n ZVjqjgBwfpsIsXSDIy0E5AcYTUjJA4IlJApDn+za3UvH9ZjtVospVby/Q\n JRL/YZ8gJV7FPv8kx25hPZLFM1oN0eNv0AqiF3C0Lh4NR74KTxJ395zS1\n 2bRXrJC6qXuhD/+AGyC6KEDs6a08Z5r82LTLGE/HXcHfPLECuylnoxiqo\n A==;", "X-Mailman-Original-Authentication-Results": [ "smtp3.osuosl.org;\n dmarc=pass (p=none dis=none)\n header.from=intel.com", "smtp3.osuosl.org;\n dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com\n header.a=rsa-sha256 header.s=Intel header.b=Gmu1IYr0" ], "Subject": "[Intel-wired-lan] [PATCH iwl-next v5 15/15] ixd: add devlink support", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Amritha Nambiar <amritha.nambiar@intel.com>\n\nEnable initial support for the devlink interface with the ixd driver. The\nixd hardware is a single function PCIe device. So, the PCIe adapter gets\nits own devlink instance to manage device-wide resources or configuration.\n\n$ devlink dev show\npci/0000:83:00.6\n\n$ devlink dev info pci/0000:83:00.6\npci/0000:83:00.6:\n driver ixd\n serial_number 00-a0-c9-ff-ff-23-45-67\n versions:\n fixed:\n device.type MEV\n running:\n cp 0.0\n virtchnl 2.0\n\nSigned-off-by: Amritha Nambiar <amritha.nambiar@intel.com>\nReviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>\nReviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>\nReviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>\nSigned-off-by: Larysa Zaremba <larysa.zaremba@intel.com>\n---\n Documentation/networking/devlink/index.rst | 1 +\n Documentation/networking/devlink/ixd.rst | 35 +++++++\n drivers/net/ethernet/intel/ixd/Kconfig | 1 +\n drivers/net/ethernet/intel/ixd/Makefile | 1 +\n drivers/net/ethernet/intel/ixd/ixd_devlink.c | 105 +++++++++++++++++++\n drivers/net/ethernet/intel/ixd/ixd_devlink.h | 44 ++++++++\n drivers/net/ethernet/intel/ixd/ixd_main.c | 16 ++-\n 7 files changed, 200 insertions(+), 3 deletions(-)\n create mode 100644 Documentation/networking/devlink/ixd.rst\n create mode 100644 drivers/net/ethernet/intel/ixd/ixd_devlink.c\n create mode 100644 drivers/net/ethernet/intel/ixd/ixd_devlink.h", "diff": "diff --git a/Documentation/networking/devlink/index.rst b/Documentation/networking/devlink/index.rst\nindex 35b12a2bfeba..efd138d8e7d3 100644\n--- a/Documentation/networking/devlink/index.rst\n+++ b/Documentation/networking/devlink/index.rst\n@@ -87,6 +87,7 @@ parameters, info versions, and other features it supports.\n ionic\n iosm\n ixgbe\n+ ixd\n kvaser_pciefd\n kvaser_usb\n mlx4\ndiff --git a/Documentation/networking/devlink/ixd.rst b/Documentation/networking/devlink/ixd.rst\nnew file mode 100644\nindex 000000000000..81b28ffb00f6\n--- /dev/null\n+++ b/Documentation/networking/devlink/ixd.rst\n@@ -0,0 +1,35 @@\n+.. SPDX-License-Identifier: GPL-2.0\n+\n+===================\n+ixd devlink support\n+===================\n+\n+This document describes the devlink features implemented by the ``ixd``\n+device driver.\n+\n+Info versions\n+=============\n+\n+The ``ixd`` driver reports the following versions\n+\n+.. list-table:: devlink info versions implemented\n+ :widths: 5 5 5 90\n+\n+ * - Name\n+ - Type\n+ - Example\n+ - Description\n+ * - ``device.type``\n+ - fixed\n+ - MEV\n+ - The hardware type for this device\n+ * - ``cp``\n+ - running\n+ - 0.0\n+ - Version number (major.minor) of the Control Plane software\n+ running on the device.\n+ * - ``virtchnl``\n+ - running\n+ - 2.0\n+ - 2-digit version number (major.minor) of the communication channel\n+ (virtchnl) used by the device.\ndiff --git a/drivers/net/ethernet/intel/ixd/Kconfig b/drivers/net/ethernet/intel/ixd/Kconfig\nindex 24510c50070e..34181c59dcdc 100644\n--- a/drivers/net/ethernet/intel/ixd/Kconfig\n+++ b/drivers/net/ethernet/intel/ixd/Kconfig\n@@ -7,6 +7,7 @@ config IXD\n \tselect LIBETH\n \tselect LIBIE_CP\n \tselect LIBIE_PCI\n+\tselect NET_DEVLINK\n \thelp\n \t This driver supports Intel(R) Control Plane PCI Function\n \t of Intel E2100 and later IPUs and FNICs.\ndiff --git a/drivers/net/ethernet/intel/ixd/Makefile b/drivers/net/ethernet/intel/ixd/Makefile\nindex 90abf231fb16..03760a2580b9 100644\n--- a/drivers/net/ethernet/intel/ixd/Makefile\n+++ b/drivers/net/ethernet/intel/ixd/Makefile\n@@ -8,5 +8,6 @@ obj-$(CONFIG_IXD) += ixd.o\n ixd-y := ixd_main.o\n ixd-y += ixd_ctlq.o\n ixd-y += ixd_dev.o\n+ixd-y += ixd_devlink.o\n ixd-y += ixd_lib.o\n ixd-y += ixd_virtchnl.o\ndiff --git a/drivers/net/ethernet/intel/ixd/ixd_devlink.c b/drivers/net/ethernet/intel/ixd/ixd_devlink.c\nnew file mode 100644\nindex 000000000000..6f60cfe4fab2\n--- /dev/null\n+++ b/drivers/net/ethernet/intel/ixd/ixd_devlink.c\n@@ -0,0 +1,105 @@\n+// SPDX-License-Identifier: GPL-2.0\n+/* Copyright (c) 2025, Intel Corporation. */\n+\n+#include \"ixd.h\"\n+#include \"ixd_devlink.h\"\n+\n+#define IXD_DEVLINK_INFO_LEN\t128\n+\n+/**\n+ * ixd_fill_dsn - Get the serial number for the ixd device\n+ * @adapter: adapter to query\n+ * @buf: storage buffer for the info request\n+ */\n+static void ixd_fill_dsn(struct ixd_adapter *adapter, char *buf)\n+{\n+\tu8 dsn[8];\n+\n+\t/* Copy the DSN into an array in Big Endian format */\n+\tput_unaligned_be64(pci_get_dsn(adapter->cp_ctx.mmio_info.pdev), dsn);\n+\n+\tsnprintf(buf, IXD_DEVLINK_INFO_LEN, \"%8phD\", dsn);\n+}\n+\n+/**\n+ * ixd_fill_device_name - Get the name of the underlying hardware\n+ * @adapter: adapter to query\n+ * @buf: storage buffer for the info request\n+ * @buf_size: size of the storage buffer\n+ */\n+static void ixd_fill_device_name(struct ixd_adapter *adapter, char *buf,\n+\t\t\t\t size_t buf_size)\n+{\n+\tif (adapter->caps.device_type == VIRTCHNL2_MEV_DEVICE)\n+\t\tsnprintf(buf, buf_size, \"%s\", \"MEV\");\n+\telse\n+\t\tsnprintf(buf, buf_size, \"%s\", \"UNKNOWN\");\n+}\n+\n+/**\n+ * ixd_devlink_info_get - .info_get devlink handler\n+ * @devlink: devlink instance structure\n+ * @req: the devlink info request\n+ * @extack: extended netdev ack structure\n+ *\n+ * Callback for the devlink .info_get operation. Reports information about the\n+ * device.\n+ *\n+ * Return: zero on success or an error code on failure.\n+ */\n+static int ixd_devlink_info_get(struct devlink *devlink,\n+\t\t\t\tstruct devlink_info_req *req,\n+\t\t\t\tstruct netlink_ext_ack *extack)\n+{\n+\tstruct ixd_adapter *adapter = devlink_priv(devlink);\n+\tchar buf[IXD_DEVLINK_INFO_LEN];\n+\tint err;\n+\n+\tixd_fill_dsn(adapter, buf);\n+\terr = devlink_info_serial_number_put(req, buf);\n+\tif (err)\n+\t\treturn err;\n+\n+\tixd_fill_device_name(adapter, buf, IXD_DEVLINK_INFO_LEN);\n+\terr = devlink_info_version_fixed_put(req, \"device.type\", buf);\n+\tif (err)\n+\t\treturn err;\n+\n+\tsnprintf(buf, sizeof(buf), \"%u.%u\",\n+\t\t le16_to_cpu(adapter->caps.cp_ver_major),\n+\t\t le16_to_cpu(adapter->caps.cp_ver_minor));\n+\n+\terr = devlink_info_version_running_put(req, \"cp\", buf);\n+\tif (err)\n+\t\treturn err;\n+\n+\tsnprintf(buf, sizeof(buf), \"%u.%u\",\n+\t\t adapter->vc_ver.major, adapter->vc_ver.minor);\n+\n+\treturn devlink_info_version_running_put(req, \"virtchnl\", buf);\n+}\n+\n+static const struct devlink_ops ixd_devlink_ops = {\n+\t.info_get = ixd_devlink_info_get,\n+};\n+\n+/**\n+ * ixd_adapter_alloc - Allocate devlink and return adapter pointer\n+ * @dev: the device to allocate for\n+ *\n+ * Allocate a devlink instance for this device and return the private area as\n+ * the adapter structure.\n+ *\n+ * Return: adapter structure on success, NULL on failure\n+ */\n+struct ixd_adapter *ixd_adapter_alloc(struct device *dev)\n+{\n+\tstruct devlink *devlink;\n+\n+\tdevlink = devlink_alloc(&ixd_devlink_ops, sizeof(struct ixd_adapter),\n+\t\t\t\tdev);\n+\tif (!devlink)\n+\t\treturn NULL;\n+\n+\treturn devlink_priv(devlink);\n+}\ndiff --git a/drivers/net/ethernet/intel/ixd/ixd_devlink.h b/drivers/net/ethernet/intel/ixd/ixd_devlink.h\nnew file mode 100644\nindex 000000000000..c43ce0655de2\n--- /dev/null\n+++ b/drivers/net/ethernet/intel/ixd/ixd_devlink.h\n@@ -0,0 +1,44 @@\n+/* SPDX-License-Identifier: GPL-2.0 */\n+/* Copyright (c) 2025, Intel Corporation. */\n+\n+#ifndef _IXD_DEVLINK_H_\n+#define _IXD_DEVLINK_H_\n+#include <net/devlink.h>\n+\n+struct ixd_adapter *ixd_adapter_alloc(struct device *dev);\n+\n+/**\n+ * ixd_devlink_free - teardown the devlink\n+ * @adapter: the adapter structure to free\n+ *\n+ */\n+static inline void ixd_devlink_free(struct ixd_adapter *adapter)\n+{\n+\tstruct devlink *devlink = priv_to_devlink(adapter);\n+\n+\tdevlink_free(devlink);\n+}\n+\n+/**\n+ * ixd_devlink_unregister - Unregister devlink resources for this adapter.\n+ * @adapter: the adapter structure to cleanup\n+ *\n+ * Releases resources used by devlink and cleans up associated memory.\n+ */\n+static inline void ixd_devlink_unregister(struct ixd_adapter *adapter)\n+{\n+\tdevlink_unregister(priv_to_devlink(adapter));\n+}\n+\n+/**\n+ * ixd_devlink_register - Register devlink interface for this adapter\n+ * @adapter: pointer to ixd adapter structure to be associated with devlink\n+ *\n+ * Register the devlink instance associated with this adapter\n+ */\n+static inline void ixd_devlink_register(struct ixd_adapter *adapter)\n+{\n+\tdevlink_register(priv_to_devlink(adapter));\n+}\n+\n+#endif /* _IXD_DEVLINK_H_ */\ndiff --git a/drivers/net/ethernet/intel/ixd/ixd_main.c b/drivers/net/ethernet/intel/ixd/ixd_main.c\nindex 6d5e6aca77df..ea6aa793a6a7 100644\n--- a/drivers/net/ethernet/intel/ixd/ixd_main.c\n+++ b/drivers/net/ethernet/intel/ixd/ixd_main.c\n@@ -4,6 +4,7 @@\n #include \"ixd.h\"\n #include \"ixd_ctlq.h\"\n #include \"ixd_lan_regs.h\"\n+#include \"ixd_devlink.h\"\n \n MODULE_DESCRIPTION(\"Intel(R) Control Plane Function Device Driver\");\n MODULE_IMPORT_NS(\"LIBIE_CP\");\n@@ -21,11 +22,14 @@ static void ixd_remove(struct pci_dev *pdev)\n \t/* Do not mix removal with (re)initialization */\n \tcancel_delayed_work_sync(&adapter->init_task.init_work);\n \n+\tixd_devlink_unregister(adapter);\n+\n \t/* Leave the device clean on exit */\n \tixd_trigger_reset(adapter);\n \tixd_deinit_dflt_mbx(adapter);\n \n \tlibie_pci_unmap_all_mmio_regions(&adapter->cp_ctx.mmio_info);\n+\tixd_devlink_free(adapter);\n }\n \n /**\n@@ -93,7 +97,7 @@ static int ixd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \tif (WARN_ON(ent->device != IXD_DEV_ID_CPF))\n \t\treturn -EINVAL;\n \n-\tadapter = devm_kzalloc(&pdev->dev, sizeof(*adapter), GFP_KERNEL);\n+\tadapter = ixd_adapter_alloc(&pdev->dev);\n \tif (!adapter)\n \t\treturn -ENOMEM;\n \n@@ -102,13 +106,13 @@ static int ixd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \n \terr = libie_pci_init_dev(pdev);\n \tif (err)\n-\t\treturn err;\n+\t\tgoto free_adapter;\n \n \tpci_set_drvdata(pdev, adapter);\n \n \terr = ixd_iomap_regions(adapter);\n \tif (err)\n-\t\treturn err;\n+\t\tgoto free_adapter;\n \n \tINIT_DELAYED_WORK(&adapter->init_task.init_work,\n \t\t\t ixd_init_task);\n@@ -118,7 +122,13 @@ static int ixd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \tqueue_delayed_work(system_unbound_wq, &adapter->init_task.init_work,\n \t\t\t msecs_to_jiffies(500));\n \n+\tixd_devlink_register(adapter);\n+\n \treturn 0;\n+\n+free_adapter:\n+\tixd_devlink_free(adapter);\n+\treturn err;\n }\n \n static const struct pci_device_id ixd_pci_tbl[] = {\n", "prefixes": [ "iwl-next", "v5", "15/15" ] }