Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/123018/?format=api
{ "id": 123018, "url": "http://patches.dpdk.org/api/patches/123018/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230203094340.8103-5-beilei.xing@intel.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": "<20230203094340.8103-5-beilei.xing@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230203094340.8103-5-beilei.xing@intel.com", "date": "2023-02-03T09:43:25", "name": "[v6,04/19] common/idpf: introduce adapter init and deinit", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "336317015473b9744fd6cea9dc1cefec8686fa44", "submitter": { "id": 410, "url": "http://patches.dpdk.org/api/people/410/?format=api", "name": "Xing, Beilei", "email": "beilei.xing@intel.com" }, "delegate": { "id": 1540, "url": "http://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230203094340.8103-5-beilei.xing@intel.com/mbox/", "series": [ { "id": 26786, "url": "http://patches.dpdk.org/api/series/26786/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=26786", "date": "2023-02-03T09:43:21", "name": "net/idpf: introduce idpf common modle", "version": 6, "mbox": "http://patches.dpdk.org/series/26786/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/123018/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/123018/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 28D2941BBB;\n\tFri, 3 Feb 2023 11:10:27 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id CE23542D3A;\n\tFri, 3 Feb 2023 11:10:22 +0100 (CET)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n by mails.dpdk.org (Postfix) with ESMTP id B6CFB42D16\n for <dev@dpdk.org>; Fri, 3 Feb 2023 11:10:20 +0100 (CET)", "from orsmga007.jf.intel.com ([10.7.209.58])\n by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 03 Feb 2023 02:10:15 -0800", "from dpdk-beileix-3.sh.intel.com ([10.67.110.253])\n by orsmga007.jf.intel.com with ESMTP; 03 Feb 2023 02:10:13 -0800" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1675419020; x=1706955020;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=cyUYq9+sLOrOUqdN+671QbourL8aGFi+eJoHYo5lQ6g=;\n b=FvgnLODJULP4yg6dOpmYs5tw0gDvoLaJeLxxQ52Qd9Hp1oMhLGKw6RXn\n 7ngcgtmjqoiK5eO0PjvRktjDzeSnXFx+ql+iS8YaBGDgyO7DflcOoNq/X\n VuQPuJ12a83C8RsLPvdzQUqrny4q3DadjnMgM2gJNrxodnUF2VFtHyCQ5\n SkG6e3dVLGDXwOSPc9ksn7bau+3NPr2R4cHEJiUiqGtxZZCpM1/4g1QWe\n Fq279V3PmAubn2R5bZ2rk23T5HBtYc9ilzU4RmQIC+R8KxtjDRdtuYVoy\n hyCEKaOyX2CDiHJ+/oLvT0BGJWhgnkdC7J+QHWRxztUQ6lNC0Gez6ZwTT g==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10609\"; a=\"356052788\"", "E=Sophos;i=\"5.97,270,1669104000\"; d=\"scan'208\";a=\"356052788\"", "E=McAfee;i=\"6500,9779,10609\"; a=\"659047788\"", "E=Sophos;i=\"5.97,270,1669104000\"; d=\"scan'208\";a=\"659047788\"" ], "X-ExtLoop1": "1", "From": "beilei.xing@intel.com", "To": "jingjing.wu@intel.com", "Cc": "dev@dpdk.org, qi.z.zhang@intel.com, Beilei Xing <beilei.xing@intel.com>,\n Wenjun Wu <wenjun1.wu@intel.com>", "Subject": "[PATCH v6 04/19] common/idpf: introduce adapter init and deinit", "Date": "Fri, 3 Feb 2023 09:43:25 +0000", "Message-Id": "<20230203094340.8103-5-beilei.xing@intel.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20230203094340.8103-1-beilei.xing@intel.com>", "References": "<20230202095357.37929-1-beilei.xing@intel.com>\n <20230203094340.8103-1-beilei.xing@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "From: Beilei Xing <beilei.xing@intel.com>\n\nIntroduce idpf_adapter_init and idpf_adapter_deinit\nfunctions in common module.\nAnd also introduce idpf_adapter_ext_init and\nidpf_adapter_ext_deinit functions.\n\nSigned-off-by: Wenjun Wu <wenjun1.wu@intel.com>\nSigned-off-by: Beilei Xing <beilei.xing@intel.com>\n---\n drivers/common/idpf/base/idpf_controlq_api.h | 2 -\n drivers/common/idpf/idpf_common_device.c | 153 ++++++++++++++++++\n drivers/common/idpf/idpf_common_device.h | 6 +\n drivers/common/idpf/version.map | 4 +-\n drivers/net/idpf/idpf_ethdev.c | 158 ++-----------------\n drivers/net/idpf/idpf_ethdev.h | 2 -\n 6 files changed, 178 insertions(+), 147 deletions(-)", "diff": "diff --git a/drivers/common/idpf/base/idpf_controlq_api.h b/drivers/common/idpf/base/idpf_controlq_api.h\nindex 891a0f10f6..32d17baadf 100644\n--- a/drivers/common/idpf/base/idpf_controlq_api.h\n+++ b/drivers/common/idpf/base/idpf_controlq_api.h\n@@ -161,7 +161,6 @@ enum idpf_mbx_opc {\n /* Will init all required q including default mb. \"q_info\" is an array of\n * create_info structs equal to the number of control queues to be created.\n */\n-__rte_internal\n int idpf_ctlq_init(struct idpf_hw *hw, u8 num_q,\n \t\t struct idpf_ctlq_create_info *q_info);\n \n@@ -199,7 +198,6 @@ int idpf_ctlq_post_rx_buffs(struct idpf_hw *hw,\n \t\t\t struct idpf_dma_mem **buffs);\n \n /* Will destroy all q including the default mb */\n-__rte_internal\n int idpf_ctlq_deinit(struct idpf_hw *hw);\n \n #endif /* _IDPF_CONTROLQ_API_H_ */\ndiff --git a/drivers/common/idpf/idpf_common_device.c b/drivers/common/idpf/idpf_common_device.c\nindex 5062780362..b2b42443e4 100644\n--- a/drivers/common/idpf/idpf_common_device.c\n+++ b/drivers/common/idpf/idpf_common_device.c\n@@ -4,5 +4,158 @@\n \n #include <rte_log.h>\n #include <idpf_common_device.h>\n+#include <idpf_common_virtchnl.h>\n+\n+static void\n+idpf_reset_pf(struct idpf_hw *hw)\n+{\n+\tuint32_t reg;\n+\n+\treg = IDPF_READ_REG(hw, PFGEN_CTRL);\n+\tIDPF_WRITE_REG(hw, PFGEN_CTRL, (reg | PFGEN_CTRL_PFSWR));\n+}\n+\n+#define IDPF_RESET_WAIT_CNT 100\n+static int\n+idpf_check_pf_reset_done(struct idpf_hw *hw)\n+{\n+\tuint32_t reg;\n+\tint i;\n+\n+\tfor (i = 0; i < IDPF_RESET_WAIT_CNT; i++) {\n+\t\treg = IDPF_READ_REG(hw, PFGEN_RSTAT);\n+\t\tif (reg != 0xFFFFFFFF && (reg & PFGEN_RSTAT_PFR_STATE_M))\n+\t\t\treturn 0;\n+\t\trte_delay_ms(1000);\n+\t}\n+\n+\tDRV_LOG(ERR, \"IDPF reset timeout\");\n+\treturn -EBUSY;\n+}\n+\n+#define CTLQ_NUM 2\n+static int\n+idpf_init_mbx(struct idpf_hw *hw)\n+{\n+\tstruct idpf_ctlq_create_info ctlq_info[CTLQ_NUM] = {\n+\t\t{\n+\t\t\t.type = IDPF_CTLQ_TYPE_MAILBOX_TX,\n+\t\t\t.id = IDPF_CTLQ_ID,\n+\t\t\t.len = IDPF_CTLQ_LEN,\n+\t\t\t.buf_size = IDPF_DFLT_MBX_BUF_SIZE,\n+\t\t\t.reg = {\n+\t\t\t\t.head = PF_FW_ATQH,\n+\t\t\t\t.tail = PF_FW_ATQT,\n+\t\t\t\t.len = PF_FW_ATQLEN,\n+\t\t\t\t.bah = PF_FW_ATQBAH,\n+\t\t\t\t.bal = PF_FW_ATQBAL,\n+\t\t\t\t.len_mask = PF_FW_ATQLEN_ATQLEN_M,\n+\t\t\t\t.len_ena_mask = PF_FW_ATQLEN_ATQENABLE_M,\n+\t\t\t\t.head_mask = PF_FW_ATQH_ATQH_M,\n+\t\t\t}\n+\t\t},\n+\t\t{\n+\t\t\t.type = IDPF_CTLQ_TYPE_MAILBOX_RX,\n+\t\t\t.id = IDPF_CTLQ_ID,\n+\t\t\t.len = IDPF_CTLQ_LEN,\n+\t\t\t.buf_size = IDPF_DFLT_MBX_BUF_SIZE,\n+\t\t\t.reg = {\n+\t\t\t\t.head = PF_FW_ARQH,\n+\t\t\t\t.tail = PF_FW_ARQT,\n+\t\t\t\t.len = PF_FW_ARQLEN,\n+\t\t\t\t.bah = PF_FW_ARQBAH,\n+\t\t\t\t.bal = PF_FW_ARQBAL,\n+\t\t\t\t.len_mask = PF_FW_ARQLEN_ARQLEN_M,\n+\t\t\t\t.len_ena_mask = PF_FW_ARQLEN_ARQENABLE_M,\n+\t\t\t\t.head_mask = PF_FW_ARQH_ARQH_M,\n+\t\t\t}\n+\t\t}\n+\t};\n+\tstruct idpf_ctlq_info *ctlq;\n+\tint ret;\n+\n+\tret = idpf_ctlq_init(hw, CTLQ_NUM, ctlq_info);\n+\tif (ret != 0)\n+\t\treturn ret;\n+\n+\tLIST_FOR_EACH_ENTRY_SAFE(ctlq, NULL, &hw->cq_list_head,\n+\t\t\t\t struct idpf_ctlq_info, cq_list) {\n+\t\tif (ctlq->q_id == IDPF_CTLQ_ID &&\n+\t\t ctlq->cq_type == IDPF_CTLQ_TYPE_MAILBOX_TX)\n+\t\t\thw->asq = ctlq;\n+\t\tif (ctlq->q_id == IDPF_CTLQ_ID &&\n+\t\t ctlq->cq_type == IDPF_CTLQ_TYPE_MAILBOX_RX)\n+\t\t\thw->arq = ctlq;\n+\t}\n+\n+\tif (hw->asq == NULL || hw->arq == NULL) {\n+\t\tidpf_ctlq_deinit(hw);\n+\t\tret = -ENOENT;\n+\t}\n+\n+\treturn ret;\n+}\n+\n+int\n+idpf_adapter_init(struct idpf_adapter *adapter)\n+{\n+\tstruct idpf_hw *hw = &adapter->hw;\n+\tint ret;\n+\n+\tidpf_reset_pf(hw);\n+\tret = idpf_check_pf_reset_done(hw);\n+\tif (ret != 0) {\n+\t\tDRV_LOG(ERR, \"IDPF is still resetting\");\n+\t\tgoto err_check_reset;\n+\t}\n+\n+\tret = idpf_init_mbx(hw);\n+\tif (ret != 0) {\n+\t\tDRV_LOG(ERR, \"Failed to init mailbox\");\n+\t\tgoto err_check_reset;\n+\t}\n+\n+\tadapter->mbx_resp = rte_zmalloc(\"idpf_adapter_mbx_resp\",\n+\t\t\t\t\tIDPF_DFLT_MBX_BUF_SIZE, 0);\n+\tif (adapter->mbx_resp == NULL) {\n+\t\tDRV_LOG(ERR, \"Failed to allocate idpf_adapter_mbx_resp memory\");\n+\t\tret = -ENOMEM;\n+\t\tgoto err_mbx_resp;\n+\t}\n+\n+\tret = idpf_vc_check_api_version(adapter);\n+\tif (ret != 0) {\n+\t\tDRV_LOG(ERR, \"Failed to check api version\");\n+\t\tgoto err_check_api;\n+\t}\n+\n+\tret = idpf_vc_get_caps(adapter);\n+\tif (ret != 0) {\n+\t\tDRV_LOG(ERR, \"Failed to get capabilities\");\n+\t\tgoto err_check_api;\n+\t}\n+\n+\treturn 0;\n+\n+err_check_api:\n+\trte_free(adapter->mbx_resp);\n+\tadapter->mbx_resp = NULL;\n+err_mbx_resp:\n+\tidpf_ctlq_deinit(hw);\n+err_check_reset:\n+\treturn ret;\n+}\n+\n+int\n+idpf_adapter_deinit(struct idpf_adapter *adapter)\n+{\n+\tstruct idpf_hw *hw = &adapter->hw;\n+\n+\tidpf_ctlq_deinit(hw);\n+\trte_free(adapter->mbx_resp);\n+\tadapter->mbx_resp = NULL;\n+\n+\treturn 0;\n+}\n \n RTE_LOG_REGISTER_SUFFIX(idpf_common_logtype, common, NOTICE);\ndiff --git a/drivers/common/idpf/idpf_common_device.h b/drivers/common/idpf/idpf_common_device.h\nindex a7537281d1..e4344ea392 100644\n--- a/drivers/common/idpf/idpf_common_device.h\n+++ b/drivers/common/idpf/idpf_common_device.h\n@@ -9,6 +9,7 @@\n #include <base/virtchnl2.h>\n #include <idpf_common_logs.h>\n \n+#define IDPF_CTLQ_ID\t\t-1\n #define IDPF_CTLQ_LEN\t\t64\n #define IDPF_DFLT_MBX_BUF_SIZE\t4096\n \n@@ -137,4 +138,9 @@ atomic_set_cmd(struct idpf_adapter *adapter, uint32_t ops)\n \treturn !ret;\n }\n \n+__rte_internal\n+int idpf_adapter_init(struct idpf_adapter *adapter);\n+__rte_internal\n+int idpf_adapter_deinit(struct idpf_adapter *adapter);\n+\n #endif /* _IDPF_COMMON_DEVICE_H_ */\ndiff --git a/drivers/common/idpf/version.map b/drivers/common/idpf/version.map\nindex 9bc0d2a909..8056996e3c 100644\n--- a/drivers/common/idpf/version.map\n+++ b/drivers/common/idpf/version.map\n@@ -1,8 +1,8 @@\n INTERNAL {\n \tglobal:\n \n-\tidpf_ctlq_deinit;\n-\tidpf_ctlq_init;\n+\tidpf_adapter_deinit;\n+\tidpf_adapter_init;\n \tidpf_execute_vc_cmd;\n \tidpf_vc_alloc_vectors;\n \tidpf_vc_check_api_version;\ndiff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c\nindex 759fc981d7..c17c7bb472 100644\n--- a/drivers/net/idpf/idpf_ethdev.c\n+++ b/drivers/net/idpf/idpf_ethdev.c\n@@ -786,148 +786,32 @@ idpf_parse_devargs(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *adap\n \treturn ret;\n }\n \n-static void\n-idpf_reset_pf(struct idpf_hw *hw)\n-{\n-\tuint32_t reg;\n-\n-\treg = IDPF_READ_REG(hw, PFGEN_CTRL);\n-\tIDPF_WRITE_REG(hw, PFGEN_CTRL, (reg | PFGEN_CTRL_PFSWR));\n-}\n-\n-#define IDPF_RESET_WAIT_CNT 100\n static int\n-idpf_check_pf_reset_done(struct idpf_hw *hw)\n+idpf_adapter_ext_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *adapter)\n {\n-\tuint32_t reg;\n-\tint i;\n-\n-\tfor (i = 0; i < IDPF_RESET_WAIT_CNT; i++) {\n-\t\treg = IDPF_READ_REG(hw, PFGEN_RSTAT);\n-\t\tif (reg != 0xFFFFFFFF && (reg & PFGEN_RSTAT_PFR_STATE_M))\n-\t\t\treturn 0;\n-\t\trte_delay_ms(1000);\n-\t}\n-\n-\tPMD_INIT_LOG(ERR, \"IDPF reset timeout\");\n-\treturn -EBUSY;\n-}\n-\n-#define CTLQ_NUM 2\n-static int\n-idpf_init_mbx(struct idpf_hw *hw)\n-{\n-\tstruct idpf_ctlq_create_info ctlq_info[CTLQ_NUM] = {\n-\t\t{\n-\t\t\t.type = IDPF_CTLQ_TYPE_MAILBOX_TX,\n-\t\t\t.id = IDPF_CTLQ_ID,\n-\t\t\t.len = IDPF_CTLQ_LEN,\n-\t\t\t.buf_size = IDPF_DFLT_MBX_BUF_SIZE,\n-\t\t\t.reg = {\n-\t\t\t\t.head = PF_FW_ATQH,\n-\t\t\t\t.tail = PF_FW_ATQT,\n-\t\t\t\t.len = PF_FW_ATQLEN,\n-\t\t\t\t.bah = PF_FW_ATQBAH,\n-\t\t\t\t.bal = PF_FW_ATQBAL,\n-\t\t\t\t.len_mask = PF_FW_ATQLEN_ATQLEN_M,\n-\t\t\t\t.len_ena_mask = PF_FW_ATQLEN_ATQENABLE_M,\n-\t\t\t\t.head_mask = PF_FW_ATQH_ATQH_M,\n-\t\t\t}\n-\t\t},\n-\t\t{\n-\t\t\t.type = IDPF_CTLQ_TYPE_MAILBOX_RX,\n-\t\t\t.id = IDPF_CTLQ_ID,\n-\t\t\t.len = IDPF_CTLQ_LEN,\n-\t\t\t.buf_size = IDPF_DFLT_MBX_BUF_SIZE,\n-\t\t\t.reg = {\n-\t\t\t\t.head = PF_FW_ARQH,\n-\t\t\t\t.tail = PF_FW_ARQT,\n-\t\t\t\t.len = PF_FW_ARQLEN,\n-\t\t\t\t.bah = PF_FW_ARQBAH,\n-\t\t\t\t.bal = PF_FW_ARQBAL,\n-\t\t\t\t.len_mask = PF_FW_ARQLEN_ARQLEN_M,\n-\t\t\t\t.len_ena_mask = PF_FW_ARQLEN_ARQENABLE_M,\n-\t\t\t\t.head_mask = PF_FW_ARQH_ARQH_M,\n-\t\t\t}\n-\t\t}\n-\t};\n-\tstruct idpf_ctlq_info *ctlq;\n-\tint ret;\n-\n-\tret = idpf_ctlq_init(hw, CTLQ_NUM, ctlq_info);\n-\tif (ret != 0)\n-\t\treturn ret;\n-\n-\tLIST_FOR_EACH_ENTRY_SAFE(ctlq, NULL, &hw->cq_list_head,\n-\t\t\t\t struct idpf_ctlq_info, cq_list) {\n-\t\tif (ctlq->q_id == IDPF_CTLQ_ID &&\n-\t\t ctlq->cq_type == IDPF_CTLQ_TYPE_MAILBOX_TX)\n-\t\t\thw->asq = ctlq;\n-\t\tif (ctlq->q_id == IDPF_CTLQ_ID &&\n-\t\t ctlq->cq_type == IDPF_CTLQ_TYPE_MAILBOX_RX)\n-\t\t\thw->arq = ctlq;\n-\t}\n-\n-\tif (hw->asq == NULL || hw->arq == NULL) {\n-\t\tidpf_ctlq_deinit(hw);\n-\t\tret = -ENOENT;\n-\t}\n-\n-\treturn ret;\n-}\n-\n-static int\n-idpf_adapter_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *adapter)\n-{\n-\tstruct idpf_hw *hw = &adapter->base.hw;\n+\tstruct idpf_adapter *base = &adapter->base;\n+\tstruct idpf_hw *hw = &base->hw;\n \tint ret = 0;\n \n \thw->hw_addr = (void *)pci_dev->mem_resource[0].addr;\n \thw->hw_addr_len = pci_dev->mem_resource[0].len;\n-\thw->back = &adapter->base;\n+\thw->back = base;\n \thw->vendor_id = pci_dev->id.vendor_id;\n \thw->device_id = pci_dev->id.device_id;\n \thw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id;\n \n \tstrncpy(adapter->name, pci_dev->device.name, PCI_PRI_STR_SIZE);\n \n-\tidpf_reset_pf(hw);\n-\tret = idpf_check_pf_reset_done(hw);\n-\tif (ret != 0) {\n-\t\tPMD_INIT_LOG(ERR, \"IDPF is still resetting\");\n-\t\tgoto err;\n-\t}\n-\n-\tret = idpf_init_mbx(hw);\n-\tif (ret != 0) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to init mailbox\");\n-\t\tgoto err;\n-\t}\n-\n-\tadapter->base.mbx_resp = rte_zmalloc(\"idpf_adapter_mbx_resp\",\n-\t\t\t\t\t IDPF_DFLT_MBX_BUF_SIZE, 0);\n-\tif (adapter->base.mbx_resp == NULL) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to allocate idpf_adapter_mbx_resp memory\");\n-\t\tret = -ENOMEM;\n-\t\tgoto err_mbx;\n-\t}\n-\n-\tret = idpf_vc_check_api_version(&adapter->base);\n+\tret = idpf_adapter_init(base);\n \tif (ret != 0) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to check api version\");\n-\t\tgoto err_api;\n+\t\tPMD_INIT_LOG(ERR, \"Failed to init adapter\");\n+\t\tgoto err_adapter_init;\n \t}\n \n \tret = idpf_get_pkt_type(adapter);\n \tif (ret != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to set ptype table\");\n-\t\tgoto err_api;\n-\t}\n-\n-\tret = idpf_vc_get_caps(&adapter->base);\n-\tif (ret != 0) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to get capabilities\");\n-\t\tgoto err_api;\n+\t\tgoto err_get_ptype;\n \t}\n \n \tadapter->max_vport_nb = adapter->base.caps.max_vports;\n@@ -939,7 +823,7 @@ idpf_adapter_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *adapt\n \tif (adapter->vports == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to allocate vports memory\");\n \t\tret = -ENOMEM;\n-\t\tgoto err_api;\n+\t\tgoto err_get_ptype;\n \t}\n \n \tadapter->cur_vports = 0;\n@@ -949,12 +833,9 @@ idpf_adapter_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *adapt\n \n \treturn ret;\n \n-err_api:\n-\trte_free(adapter->base.mbx_resp);\n-\tadapter->base.mbx_resp = NULL;\n-err_mbx:\n-\tidpf_ctlq_deinit(hw);\n-err:\n+err_get_ptype:\n+\tidpf_adapter_deinit(base);\n+err_adapter_init:\n \treturn ret;\n }\n \n@@ -1093,14 +974,9 @@ idpf_find_adapter_ext(struct rte_pci_device *pci_dev)\n }\n \n static void\n-idpf_adapter_rel(struct idpf_adapter_ext *adapter)\n+idpf_adapter_ext_deinit(struct idpf_adapter_ext *adapter)\n {\n-\tstruct idpf_hw *hw = &adapter->base.hw;\n-\n-\tidpf_ctlq_deinit(hw);\n-\n-\trte_free(adapter->base.mbx_resp);\n-\tadapter->base.mbx_resp = NULL;\n+\tidpf_adapter_deinit(&adapter->base);\n \n \trte_free(adapter->vports);\n \tadapter->vports = NULL;\n@@ -1133,7 +1009,7 @@ idpf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t\t\treturn -ENOMEM;\n \t\t}\n \n-\t\tretval = idpf_adapter_init(pci_dev, adapter);\n+\t\tretval = idpf_adapter_ext_init(pci_dev, adapter);\n \t\tif (retval != 0) {\n \t\t\tPMD_INIT_LOG(ERR, \"Failed to init adapter.\");\n \t\t\treturn retval;\n@@ -1196,7 +1072,7 @@ idpf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t\trte_spinlock_lock(&idpf_adapter_lock);\n \t\tTAILQ_REMOVE(&idpf_adapter_list, adapter, next);\n \t\trte_spinlock_unlock(&idpf_adapter_lock);\n-\t\tidpf_adapter_rel(adapter);\n+\t\tidpf_adapter_ext_deinit(adapter);\n \t\trte_free(adapter);\n \t}\n \treturn retval;\n@@ -1216,7 +1092,7 @@ idpf_pci_remove(struct rte_pci_device *pci_dev)\n \trte_spinlock_lock(&idpf_adapter_lock);\n \tTAILQ_REMOVE(&idpf_adapter_list, adapter, next);\n \trte_spinlock_unlock(&idpf_adapter_lock);\n-\tidpf_adapter_rel(adapter);\n+\tidpf_adapter_ext_deinit(adapter);\n \trte_free(adapter);\n \n \treturn 0;\ndiff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/idpf/idpf_ethdev.h\nindex efc540fa32..07ffe8e408 100644\n--- a/drivers/net/idpf/idpf_ethdev.h\n+++ b/drivers/net/idpf/idpf_ethdev.h\n@@ -31,8 +31,6 @@\n #define IDPF_RXQ_PER_GRP\t1\n #define IDPF_RX_BUFQ_PER_GRP\t2\n \n-#define IDPF_CTLQ_ID\t\t-1\n-\n #define IDPF_DFLT_Q_VEC_NUM\t1\n #define IDPF_DFLT_INTERVAL\t16\n \n", "prefixes": [ "v6", "04/19" ] }