Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/63528/?format=api
{ "id": 63528, "url": "http://patches.dpdk.org/api/patches/63528/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191203070318.39620-7-qi.z.zhang@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": "<20191203070318.39620-7-qi.z.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191203070318.39620-7-qi.z.zhang@intel.com", "date": "2019-12-03T07:03:07", "name": "[06/17] net/iavf/base: remove unnecessary compile option", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "7a2036fc070f96409764c4ccd3d2294417c87f54", "submitter": { "id": 504, "url": "http://patches.dpdk.org/api/people/504/?format=api", "name": "Qi Zhang", "email": "qi.z.zhang@intel.com" }, "delegate": { "id": 31221, "url": "http://patches.dpdk.org/api/users/31221/?format=api", "username": "yexl", "first_name": "xiaolong", "last_name": "ye", "email": "xiaolong.ye@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20191203070318.39620-7-qi.z.zhang@intel.com/mbox/", "series": [ { "id": 7716, "url": "http://patches.dpdk.org/api/series/7716/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7716", "date": "2019-12-03T07:03:01", "name": "iavf base code update", "version": 1, "mbox": "http://patches.dpdk.org/series/7716/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/63528/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/63528/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 94231A04B5;\n\tTue, 3 Dec 2019 08:01:23 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 1ABF41BF87;\n\tTue, 3 Dec 2019 08:00:29 +0100 (CET)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n by dpdk.org (Postfix) with ESMTP id AE6FE1BF70\n for <dev@dpdk.org>; Tue, 3 Dec 2019 08:00:25 +0100 (CET)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n 02 Dec 2019 23:00:24 -0800", "from dpdk51.sh.intel.com ([10.67.110.245])\n by fmsmga005.fm.intel.com with ESMTP; 02 Dec 2019 23:00:23 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.69,272,1571727600\"; d=\"scan'208\";a=\"410729690\"", "From": "Qi Zhang <qi.z.zhang@intel.com>", "To": "xiaolong.ye@intel.com", "Cc": "haiyue.wang@intel.com, dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>,\n Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>", "Date": "Tue, 3 Dec 2019 15:03:07 +0800", "Message-Id": "<20191203070318.39620-7-qi.z.zhang@intel.com>", "X-Mailer": "git-send-email 2.13.6", "In-Reply-To": "<20191203070318.39620-1-qi.z.zhang@intel.com>", "References": "<20191203070318.39620-1-qi.z.zhang@intel.com>", "Subject": "[dpdk-dev] [PATCH 06/17] net/iavf/base: remove unnecessary compile\n\toption", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Remove compile option INTEGRATED_VF.\n\nSigned-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\n---\n drivers/net/iavf/base/iavf_adminq.c | 19 -------------------\n drivers/net/iavf/base/iavf_common.c | 9 ++-------\n drivers/net/iavf/base/iavf_type.h | 8 --------\n 3 files changed, 2 insertions(+), 34 deletions(-)", "diff": "diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c\nindex 68c51daac..ef352ac4c 100644\n--- a/drivers/net/iavf/base/iavf_adminq.c\n+++ b/drivers/net/iavf/base/iavf_adminq.c\n@@ -262,14 +262,8 @@ STATIC enum iavf_status iavf_config_asq_regs(struct iavf_hw *hw)\n \twr32(hw, hw->aq.asq.tail, 0);\n \n \t/* set starting point */\n-#ifdef INTEGRATED_VF\n-\tif (iavf_is_vf(hw))\n-\t\twr32(hw, hw->aq.asq.len, (hw->aq.num_asq_entries |\n-\t\t\t\t\t IAVF_VF_ATQLEN1_ATQENABLE_MASK));\n-#else\n \twr32(hw, hw->aq.asq.len, (hw->aq.num_asq_entries |\n \t\t\t\t IAVF_VF_ATQLEN1_ATQENABLE_MASK));\n-#endif /* INTEGRATED_VF */\n \twr32(hw, hw->aq.asq.bal, IAVF_LO_DWORD(hw->aq.asq.desc_buf.pa));\n \twr32(hw, hw->aq.asq.bah, IAVF_HI_DWORD(hw->aq.asq.desc_buf.pa));\n \n@@ -297,14 +291,8 @@ STATIC enum iavf_status iavf_config_arq_regs(struct iavf_hw *hw)\n \twr32(hw, hw->aq.arq.tail, 0);\n \n \t/* set starting point */\n-#ifdef INTEGRATED_VF\n-\tif (iavf_is_vf(hw))\n-\t\twr32(hw, hw->aq.arq.len, (hw->aq.num_arq_entries |\n-\t\t\t\t\t IAVF_VF_ARQLEN1_ARQENABLE_MASK));\n-#else\n \twr32(hw, hw->aq.arq.len, (hw->aq.num_arq_entries |\n \t\t\t\t IAVF_VF_ARQLEN1_ARQENABLE_MASK));\n-#endif /* INTEGRATED_VF */\n \twr32(hw, hw->aq.arq.bal, IAVF_LO_DWORD(hw->aq.arq.desc_buf.pa));\n \twr32(hw, hw->aq.arq.bah, IAVF_HI_DWORD(hw->aq.arq.desc_buf.pa));\n \n@@ -897,14 +885,7 @@ enum iavf_status iavf_clean_arq_element(struct iavf_hw *hw,\n \t}\n \n \t/* set next_to_use to head */\n-#ifdef INTEGRATED_VF\n-\tif (!iavf_is_vf(hw))\n-\t\tntu = rd32(hw, hw->aq.arq.head) & IAVF_PF_ARQH_ARQH_MASK;\n-\telse\n-\t\tntu = rd32(hw, hw->aq.arq.head) & IAVF_VF_ARQH1_ARQH_MASK;\n-#else\n \tntu = rd32(hw, hw->aq.arq.head) & IAVF_VF_ARQH1_ARQH_MASK;\n-#endif /* INTEGRATED_VF */\n \tif (ntu == ntc) {\n \t\t/* nothing to do - shouldn't need to update ring's values */\n \t\tret_code = IAVF_ERR_ADMIN_QUEUE_NO_WORK;\ndiff --git a/drivers/net/iavf/base/iavf_common.c b/drivers/net/iavf/base/iavf_common.c\nindex 926081e87..53e877732 100644\n--- a/drivers/net/iavf/base/iavf_common.c\n+++ b/drivers/net/iavf/base/iavf_common.c\n@@ -331,15 +331,10 @@ void iavf_debug_aq(struct iavf_hw *hw, enum iavf_debug_mask mask, void *desc,\n bool iavf_check_asq_alive(struct iavf_hw *hw)\n {\n \tif (hw->aq.asq.len)\n-#ifdef INTEGRATED_VF\n-\t\tif (iavf_is_vf(hw))\n-\t\t\treturn !!(rd32(hw, hw->aq.asq.len) &\n-\t\t\t\tIAVF_VF_ATQLEN1_ATQENABLE_MASK);\n-#else\n \t\treturn !!(rd32(hw, hw->aq.asq.len) &\n \t\t\tIAVF_VF_ATQLEN1_ATQENABLE_MASK);\n-#endif /* INTEGRATED_VF */\n-\treturn false;\n+\telse\n+\t\treturn false;\n }\n \n /**\ndiff --git a/drivers/net/iavf/base/iavf_type.h b/drivers/net/iavf/base/iavf_type.h\nindex 487352f51..c1910ff75 100644\n--- a/drivers/net/iavf/base/iavf_type.h\n+++ b/drivers/net/iavf/base/iavf_type.h\n@@ -20,14 +20,8 @@\n #define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) (_p); (_q); (_r); (_s);\n #define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t) (_p); (_q); (_r); (_s); (_t);\n \n-#ifndef LINUX_MACROS\n-#ifndef BIT\n #define BIT(a) (1UL << (a))\n-#endif /* BIT */\n-#ifndef BIT_ULL\n #define BIT_ULL(a) (1ULL << (a))\n-#endif /* BIT_ULL */\n-#endif /* LINUX_MACROS */\n \n /* IAVF_MASK is a macro used on 32 bit registers */\n #define IAVF_MASK(mask, shift) (mask << shift)\n@@ -56,9 +50,7 @@\n struct iavf_hw;\n typedef void (*IAVF_ADMINQ_CALLBACK)(struct iavf_hw *, struct iavf_aq_desc *);\n \n-#ifndef ETH_ALEN\n #define ETH_ALEN\t6\n-#endif\n /* Data type manipulation macros. */\n #define IAVF_HI_DWORD(x)\t((u32)((((x) >> 16) >> 16) & 0xFFFFFFFF))\n #define IAVF_LO_DWORD(x)\t((u32)((x) & 0xFFFFFFFF))\n", "prefixes": [ "06/17" ] }