Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/970161/?format=api
{ "id": 970161, "url": "http://patchwork.ozlabs.org/api/patches/970161/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180915003757.169108-8-jesse.brandeburg@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": "<20180915003757.169108-8-jesse.brandeburg@intel.com>", "list_archive_url": null, "date": "2018-09-15T00:37:50", "name": "[net-next,v2,07/14] iavf: rename device ID defines", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "cb510d8531c935329078b6b6c9ed1171b60dc249", "submitter": { "id": 189, "url": "http://patchwork.ozlabs.org/api/people/189/?format=api", "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180915003757.169108-8-jesse.brandeburg@intel.com/mbox/", "series": [ { "id": 65816, "url": "http://patchwork.ozlabs.org/api/series/65816/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=65816", "date": "2018-09-15T00:37:43", "name": "[net-next,v2,01/14] intel-ethernet: rename i40evf to iavf", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/65816/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/970161/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/970161/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@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 42Btlg2wywz9sCS\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 15 Sep 2018 10:38:06 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id C92B588DBC;\n\tSat, 15 Sep 2018 00:38:04 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id ThBWQlgYhlMc; Sat, 15 Sep 2018 00:38:04 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 9678388D9D;\n\tSat, 15 Sep 2018 00:38:03 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id D6DFD1C2E94\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:38:00 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id BF8D787865\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:38:00 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 9VVLyg160FKv for <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:37:59 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 94A5B877A7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:37:59 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t14 Sep 2018 17:37:59 -0700", "from jfsjbrandeb002.jf.intel.com ([10.166.241.63])\n\tby fmsmga001.fm.intel.com with ESMTP; 14 Sep 2018 17:37:58 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.53,375,1531810800\"; d=\"scan'208\";a=\"90189562\"", "From": "Jesse Brandeburg <jesse.brandeburg@intel.com>", "To": "netdev@vger.kernel.org,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 14 Sep 2018 17:37:50 -0700", "Message-Id": "<20180915003757.169108-8-jesse.brandeburg@intel.com>", "X-Mailer": "git-send-email 2.14.4", "In-Reply-To": "<20180915003757.169108-1-jesse.brandeburg@intel.com>", "References": "<20180915003757.169108-1-jesse.brandeburg@intel.com>", "Subject": "[Intel-wired-lan] [PATCH net-next v2 07/14] iavf: rename device ID\n\tdefines", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<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\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "Rename the device ID defines to have IAVF in them\nand remove all the unused defines.\n\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\n---\n drivers/net/ethernet/intel/iavf/i40e_adminq.c | 22 +++++++--------\n drivers/net/ethernet/intel/iavf/i40e_common.c | 29 +++----------------\n drivers/net/ethernet/intel/iavf/i40e_devids.h | 40 ++++++---------------------\n drivers/net/ethernet/intel/iavf/i40e_type.h | 6 ----\n drivers/net/ethernet/intel/iavf/iavf_main.c | 8 +++---\n 5 files changed, 27 insertions(+), 78 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/i40e_adminq.c b/drivers/net/ethernet/intel/iavf/i40e_adminq.c\nindex 50e0f1225298..8110b92fa2b0 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_adminq.c\n+++ b/drivers/net/ethernet/intel/iavf/i40e_adminq.c\n@@ -16,18 +16,16 @@\n static void i40e_adminq_init_regs(struct i40e_hw *hw)\n {\n \t/* set head and tail registers in our local struct */\n-\tif (i40e_is_vf(hw)) {\n-\t\thw->aq.asq.tail = IAVF_VF_ATQT1;\n-\t\thw->aq.asq.head = IAVF_VF_ATQH1;\n-\t\thw->aq.asq.len = IAVF_VF_ATQLEN1;\n-\t\thw->aq.asq.bal = IAVF_VF_ATQBAL1;\n-\t\thw->aq.asq.bah = IAVF_VF_ATQBAH1;\n-\t\thw->aq.arq.tail = IAVF_VF_ARQT1;\n-\t\thw->aq.arq.head = IAVF_VF_ARQH1;\n-\t\thw->aq.arq.len = IAVF_VF_ARQLEN1;\n-\t\thw->aq.arq.bal = IAVF_VF_ARQBAL1;\n-\t\thw->aq.arq.bah = IAVF_VF_ARQBAH1;\n-\t}\n+\thw->aq.asq.tail = IAVF_VF_ATQT1;\n+\thw->aq.asq.head = IAVF_VF_ATQH1;\n+\thw->aq.asq.len = IAVF_VF_ATQLEN1;\n+\thw->aq.asq.bal = IAVF_VF_ATQBAL1;\n+\thw->aq.asq.bah = IAVF_VF_ATQBAH1;\n+\thw->aq.arq.tail = IAVF_VF_ARQT1;\n+\thw->aq.arq.head = IAVF_VF_ARQH1;\n+\thw->aq.arq.len = IAVF_VF_ARQLEN1;\n+\thw->aq.arq.bal = IAVF_VF_ARQBAL1;\n+\thw->aq.arq.bah = IAVF_VF_ARQBAH1;\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/iavf/i40e_common.c b/drivers/net/ethernet/intel/iavf/i40e_common.c\nindex 733e5cfeaf71..b97e8925d20e 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_common.c\n+++ b/drivers/net/ethernet/intel/iavf/i40e_common.c\n@@ -19,33 +19,12 @@ iavf_status i40e_set_mac_type(struct i40e_hw *hw)\n \n \tif (hw->vendor_id == PCI_VENDOR_ID_INTEL) {\n \t\tswitch (hw->device_id) {\n-\t\tcase I40E_DEV_ID_SFP_XL710:\n-\t\tcase I40E_DEV_ID_QEMU:\n-\t\tcase I40E_DEV_ID_KX_B:\n-\t\tcase I40E_DEV_ID_KX_C:\n-\t\tcase I40E_DEV_ID_QSFP_A:\n-\t\tcase I40E_DEV_ID_QSFP_B:\n-\t\tcase I40E_DEV_ID_QSFP_C:\n-\t\tcase I40E_DEV_ID_10G_BASE_T:\n-\t\tcase I40E_DEV_ID_10G_BASE_T4:\n-\t\tcase I40E_DEV_ID_20G_KR2:\n-\t\tcase I40E_DEV_ID_20G_KR2_A:\n-\t\tcase I40E_DEV_ID_25G_B:\n-\t\tcase I40E_DEV_ID_25G_SFP28:\n-\t\t\thw->mac.type = I40E_MAC_XL710;\n-\t\t\tbreak;\n-\t\tcase I40E_DEV_ID_SFP_X722:\n-\t\tcase I40E_DEV_ID_1G_BASE_T_X722:\n-\t\tcase I40E_DEV_ID_10G_BASE_T_X722:\n-\t\tcase I40E_DEV_ID_SFP_I_X722:\n-\t\t\thw->mac.type = I40E_MAC_X722;\n-\t\t\tbreak;\n-\t\tcase I40E_DEV_ID_X722_VF:\n+\t\tcase IAVF_DEV_ID_X722_VF:\n \t\t\thw->mac.type = I40E_MAC_X722_VF;\n \t\t\tbreak;\n-\t\tcase I40E_DEV_ID_VF:\n-\t\tcase I40E_DEV_ID_VF_HV:\n-\t\tcase I40E_DEV_ID_ADAPTIVE_VF:\n+\t\tcase IAVF_DEV_ID_VF:\n+\t\tcase IAVF_DEV_ID_VF_HV:\n+\t\tcase IAVF_DEV_ID_ADAPTIVE_VF:\n \t\t\thw->mac.type = I40E_MAC_VF;\n \t\t\tbreak;\n \t\tdefault:\ndiff --git a/drivers/net/ethernet/intel/iavf/i40e_devids.h b/drivers/net/ethernet/intel/iavf/i40e_devids.h\nindex f300bf271824..8eb7b697e96c 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_devids.h\n+++ b/drivers/net/ethernet/intel/iavf/i40e_devids.h\n@@ -1,34 +1,12 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n /* Copyright(c) 2013 - 2018 Intel Corporation. */\n \n-#ifndef _I40E_DEVIDS_H_\n-#define _I40E_DEVIDS_H_\n-\n-/* Device IDs */\n-#define I40E_DEV_ID_SFP_XL710\t\t0x1572\n-#define I40E_DEV_ID_QEMU\t\t0x1574\n-#define I40E_DEV_ID_KX_B\t\t0x1580\n-#define I40E_DEV_ID_KX_C\t\t0x1581\n-#define I40E_DEV_ID_QSFP_A\t\t0x1583\n-#define I40E_DEV_ID_QSFP_B\t\t0x1584\n-#define I40E_DEV_ID_QSFP_C\t\t0x1585\n-#define I40E_DEV_ID_10G_BASE_T\t\t0x1586\n-#define I40E_DEV_ID_20G_KR2\t\t0x1587\n-#define I40E_DEV_ID_20G_KR2_A\t\t0x1588\n-#define I40E_DEV_ID_10G_BASE_T4\t\t0x1589\n-#define I40E_DEV_ID_25G_B\t\t0x158A\n-#define I40E_DEV_ID_25G_SFP28\t\t0x158B\n-#define I40E_DEV_ID_VF\t\t\t0x154C\n-#define I40E_DEV_ID_VF_HV\t\t0x1571\n-#define I40E_DEV_ID_ADAPTIVE_VF\t\t0x1889\n-#define I40E_DEV_ID_SFP_X722\t\t0x37D0\n-#define I40E_DEV_ID_1G_BASE_T_X722\t0x37D1\n-#define I40E_DEV_ID_10G_BASE_T_X722\t0x37D2\n-#define I40E_DEV_ID_SFP_I_X722\t\t0x37D3\n-#define I40E_DEV_ID_X722_VF\t\t0x37CD\n-\n-#define i40e_is_40G_device(d)\t\t((d) == I40E_DEV_ID_QSFP_A || \\\n-\t\t\t\t\t (d) == I40E_DEV_ID_QSFP_B || \\\n-\t\t\t\t\t (d) == I40E_DEV_ID_QSFP_C)\n-\n-#endif /* _I40E_DEVIDS_H_ */\n+#ifndef _IAVF_DEVIDS_H_\n+#define _IAVF_DEVIDS_H_\n+\n+/* Device IDs for the VF driver */\n+#define IAVF_DEV_ID_VF\t\t\t0x154C\n+#define IAVF_DEV_ID_VF_HV\t\t0x1571\n+#define IAVF_DEV_ID_ADAPTIVE_VF\t\t0x1889\n+#define IAVF_DEV_ID_X722_VF\t\t0x37CD\n+#endif /* _IAVF_DEVIDS_H_ */\ndiff --git a/drivers/net/ethernet/intel/iavf/i40e_type.h b/drivers/net/ethernet/intel/iavf/i40e_type.h\nindex eea5b86a37b4..bcb1805a2f3a 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/iavf/i40e_type.h\n@@ -193,12 +193,6 @@ struct i40e_hw {\n \tchar err_str[16];\n };\n \n-static inline bool i40e_is_vf(struct i40e_hw *hw)\n-{\n-\treturn (hw->mac.type == I40E_MAC_VF ||\n-\t\thw->mac.type == I40E_MAC_X722_VF);\n-}\n-\n struct i40e_driver_version {\n \tu8 major_version;\n \tu8 minor_version;\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c\nindex 01fd440b4bbe..5a3884b65ca8 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -41,10 +41,10 @@ static const char iavf_copyright[] =\n * Class, Class Mask, private data (not used) }\n */\n static const struct pci_device_id iavf_pci_tbl[] = {\n-\t{PCI_VDEVICE(INTEL, I40E_DEV_ID_VF), 0},\n-\t{PCI_VDEVICE(INTEL, I40E_DEV_ID_VF_HV), 0},\n-\t{PCI_VDEVICE(INTEL, I40E_DEV_ID_X722_VF), 0},\n-\t{PCI_VDEVICE(INTEL, I40E_DEV_ID_ADAPTIVE_VF), 0},\n+\t{PCI_VDEVICE(INTEL, IAVF_DEV_ID_VF), 0},\n+\t{PCI_VDEVICE(INTEL, IAVF_DEV_ID_VF_HV), 0},\n+\t{PCI_VDEVICE(INTEL, IAVF_DEV_ID_X722_VF), 0},\n+\t{PCI_VDEVICE(INTEL, IAVF_DEV_ID_ADAPTIVE_VF), 0},\n \t/* required last entry */\n \t{0, }\n };\n", "prefixes": [ "net-next", "v2", "07/14" ] }