Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/750577/?format=api
{ "id": 750577, "url": "http://patchwork.ozlabs.org/api/patches/750577/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1492085227-52152-1-git-send-email-paul.greenwalt@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": "<1492085227-52152-1-git-send-email-paul.greenwalt@intel.com>", "list_archive_url": null, "date": "2017-04-13T12:07:07", "name": "ixgbe: Add 1000Base-T device based on X550EM_X MAC", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1b9763561b47c4ff00bb382b1e30b353ddf99d05", "submitter": { "id": 71166, "url": "http://patchwork.ozlabs.org/api/people/71166/?format=api", "name": "Paul Greenwalt", "email": "paul.greenwalt@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/1492085227-52152-1-git-send-email-paul.greenwalt@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/750577/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/750577/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3w3rC766zbz9sNV\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 14 Apr 2017 05:17:23 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 96CCF89D84;\n\tThu, 13 Apr 2017 19:17:13 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 3Ozl-sr0kim9; Thu, 13 Apr 2017 19:17:11 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 992D789D66;\n\tThu, 13 Apr 2017 19:17:11 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 419081BFB06\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 19:17:10 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 3A2E8888C9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 19:17:10 +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 UPyReQ3FBwCY for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 19:17:08 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id C795788879\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 19:17:08 +0000 (UTC)", "from fmsmga006.fm.intel.com ([10.253.24.20])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t13 Apr 2017 12:17:08 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.152.55])\n\tby fmsmga006.fm.intel.com with ESMTP; 13 Apr 2017 12:17:07 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.37,195,1488873600\"; d=\"scan'208\";a=\"88817630\"", "From": "Paul Greenwalt <paul.greenwalt@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 13 Apr 2017 08:07:07 -0400", "Message-Id": "<1492085227-52152-1-git-send-email-paul.greenwalt@intel.com>", "X-Mailer": "git-send-email 2.7.4", "Subject": "[Intel-wired-lan] [PATCH] ixgbe: Add 1000Base-T device based on\n\tX550EM_X MAC", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.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@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "Add support for new 1000Base-T device based on X550EM_X MAC\ntype. All PHY operations are disabled as the PHY is controlled\nby FW.\n\nSigned-off-by: Paul Greenwalt <paul.greenwalt@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 ++\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 ++\n drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +\n drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 45 ++++++++++++++++++++++++++-\n 4 files changed, 49 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\nindex e8cd449..85b1afb 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n@@ -826,6 +826,7 @@ enum ixgbe_boards {\n \tboard_X540,\n \tboard_X550,\n \tboard_X550EM_x,\n+\tboard_x550em_x_fw,\n \tboard_x550em_a,\n \tboard_x550em_a_fw,\n };\n@@ -835,6 +836,7 @@ extern const struct ixgbe_info ixgbe_82599_info;\n extern const struct ixgbe_info ixgbe_X540_info;\n extern const struct ixgbe_info ixgbe_X550_info;\n extern const struct ixgbe_info ixgbe_X550EM_x_info;\n+extern const struct ixgbe_info ixgbe_x550em_x_fw_info;\n extern const struct ixgbe_info ixgbe_x550em_a_info;\n extern const struct ixgbe_info ixgbe_x550em_a_fw_info;\n #ifdef CONFIG_IXGBE_DCB\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 750b204..c397667 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -89,6 +89,7 @@ static const struct ixgbe_info *ixgbe_info_tbl[] = {\n \t[board_X540]\t\t= &ixgbe_X540_info,\n \t[board_X550]\t\t= &ixgbe_X550_info,\n \t[board_X550EM_x]\t= &ixgbe_X550EM_x_info,\n+\t[board_x550em_x_fw]\t= &ixgbe_x550em_x_fw_info,\n \t[board_x550em_a]\t= &ixgbe_x550em_a_info,\n \t[board_x550em_a_fw]\t= &ixgbe_x550em_a_fw_info,\n };\n@@ -139,6 +140,7 @@ static const struct pci_device_id ixgbe_pci_tbl[] = {\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KR), board_X550EM_x},\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_10G_T), board_X550EM_x},\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_SFP), board_X550EM_x},\n+\t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_1G_T), board_x550em_x_fw},\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_KR), board_x550em_a },\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_KR_L), board_x550em_a },\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP_N), board_x550em_a },\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\nindex 2f06e4d..9c2460c 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n@@ -3128,6 +3128,7 @@ enum ixgbe_phy_type {\n \tixgbe_phy_x550em_kx4,\n \tixgbe_phy_x550em_xfi,\n \tixgbe_phy_x550em_ext_t,\n+\tixgbe_phy_ext_1g_t,\n \tixgbe_phy_cu_unknown,\n \tixgbe_phy_qt,\n \tixgbe_phy_xaui,\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\nindex 58d3bca..2ba024b 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n@@ -49,6 +49,18 @@ static s32 ixgbe_get_invariants_X550_x(struct ixgbe_hw *hw)\n \treturn 0;\n }\n \n+static s32 ixgbe_get_invariants_X550_x_fw(struct ixgbe_hw *hw)\n+{\n+\tstruct ixgbe_phy_info *phy = &hw->phy;\n+\n+\t/* Start with X540 invariants, since so similar */\n+\tixgbe_get_invariants_X540(hw);\n+\n+\tphy->ops.set_phy_power = NULL;\n+\n+\treturn 0;\n+}\n+\n static s32 ixgbe_get_invariants_X550_a(struct ixgbe_hw *hw)\n {\n \tstruct ixgbe_mac_info *mac = &hw->mac;\n@@ -334,9 +346,11 @@ static s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw)\n \t\telse\n \t\t\thw->phy.phy_semaphore_mask = IXGBE_GSSR_PHY0_SM;\n \t\t/* Fallthrough */\n-\tcase IXGBE_DEV_ID_X550EM_X_1G_T:\n \tcase IXGBE_DEV_ID_X550EM_X_10G_T:\n \t\treturn ixgbe_identify_phy_generic(hw);\n+\tcase IXGBE_DEV_ID_X550EM_X_1G_T:\n+\t\thw->phy.type = ixgbe_phy_ext_1g_t;\n+\t\tbreak;\n \tcase IXGBE_DEV_ID_X550EM_A_1G_T:\n \tcase IXGBE_DEV_ID_X550EM_A_1G_T_L:\n \t\thw->phy.type = ixgbe_phy_fw;\n@@ -2158,6 +2172,8 @@ static void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw)\n \t\t\t\t\tixgbe_set_soft_rate_select_speed;\n \t\tbreak;\n \tcase ixgbe_media_type_copper:\n+\t\tif (hw->device_id == IXGBE_DEV_ID_X550EM_X_1G_T)\n+\t\t\tbreak;\n \t\tmac->ops.setup_link = ixgbe_setup_mac_link_t_X550em;\n \t\tmac->ops.setup_fc = ixgbe_setup_fc_generic;\n \t\tmac->ops.check_link = ixgbe_check_link_t_X550em;\n@@ -2238,6 +2254,7 @@ static s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,\n \t\t\t*speed = IXGBE_LINK_SPEED_1GB_FULL |\n \t\t\t\t IXGBE_LINK_SPEED_10GB_FULL;\n \t\t\tbreak;\n+\t\tcase ixgbe_phy_ext_1g_t:\n \t\tcase ixgbe_phy_sgmii:\n \t\t\t*speed = IXGBE_LINK_SPEED_1GB_FULL;\n \t\t\tbreak;\n@@ -3185,6 +3202,11 @@ static s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)\n \t\tphy->ops.setup_link = ixgbe_setup_fw_link;\n \t\tphy->ops.reset = ixgbe_reset_phy_fw;\n \t\tbreak;\n+\tcase ixgbe_phy_ext_1g_t:\n+\t\tphy->ops.setup_link = NULL;\n+\t\tphy->ops.read_reg = NULL;\n+\t\tphy->ops.write_reg = NULL;\n+\t\tbreak;\n \tdefault:\n \t\tbreak;\n \t}\n@@ -3888,6 +3910,17 @@ static const struct ixgbe_phy_operations phy_ops_X550EM_x = {\n \t.write_reg\t\t= &ixgbe_write_phy_reg_generic,\n };\n \n+static const struct ixgbe_phy_operations phy_ops_x550em_x_fw = {\n+\tX550_COMMON_PHY\n+\t.check_overtemp\t\t= NULL,\n+\t.init\t\t\t= ixgbe_init_phy_ops_X550em,\n+\t.identify\t\t= ixgbe_identify_phy_x550em,\n+\t.read_reg\t\t= NULL,\n+\t.write_reg\t\t= NULL,\n+\t.read_reg_mdi\t\t= NULL,\n+\t.write_reg_mdi\t\t= NULL,\n+};\n+\n static const struct ixgbe_phy_operations phy_ops_x550em_a = {\n \tX550_COMMON_PHY\n \t.check_overtemp\t\t= &ixgbe_tn_check_overtemp,\n@@ -3950,6 +3983,16 @@ const struct ixgbe_info ixgbe_X550EM_x_info = {\n \t.link_ops\t\t= &link_ops_x550em_x,\n };\n \n+const struct ixgbe_info ixgbe_x550em_x_fw_info = {\n+\t.mac\t\t\t= ixgbe_mac_X550EM_x,\n+\t.get_invariants\t\t= ixgbe_get_invariants_X550_x_fw,\n+\t.mac_ops\t\t= &mac_ops_X550EM_x,\n+\t.eeprom_ops\t\t= &eeprom_ops_X550EM_x,\n+\t.phy_ops\t\t= &phy_ops_x550em_x_fw,\n+\t.mbx_ops\t\t= &mbx_ops_generic,\n+\t.mvals\t\t\t= ixgbe_mvals_X550EM_x,\n+};\n+\n const struct ixgbe_info ixgbe_x550em_a_info = {\n \t.mac\t\t\t= ixgbe_mac_x550em_a,\n \t.get_invariants\t\t= &ixgbe_get_invariants_X550_a,\n", "prefixes": [] }