Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/677873/?format=api
{ "id": 677873, "url": "http://patchwork.ozlabs.org/api/patches/677873/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20161004000958.22554.2468.stgit@localhost6.localdomain6/", "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": "<20161004000958.22554.2468.stgit@localhost6.localdomain6>", "list_archive_url": null, "date": "2016-10-04T00:09:58", "name": "[1/2] ixgbe: remove SFP ixfi support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "3d56264ae84f3baff7952bea66fdc9f945019fdc", "submitter": { "id": 1670, "url": "http://patchwork.ozlabs.org/api/people/1670/?format=api", "name": "Tantilov, Emil S", "email": "emil.s.tantilov@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/20161004000958.22554.2468.stgit@localhost6.localdomain6/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/677873/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/677873/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 3snzhN2yRVz9svs\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 4 Oct 2016 11:05:39 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 591E08AE40;\n\tTue, 4 Oct 2016 00:05:37 +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 MFxE_e2uEway; Tue, 4 Oct 2016 00:05:36 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id AD36D8A08A;\n\tTue, 4 Oct 2016 00:05:36 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 6E2F71C288B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 4 Oct 2016 00:05:35 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 6AC968A08A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 4 Oct 2016 00:05:35 +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 SKILbSTt0u2i for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 4 Oct 2016 00:05:34 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 738D78A076\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 4 Oct 2016 00:05:34 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga104.fm.intel.com with ESMTP; 03 Oct 2016 17:05:33 -0700", "from estantil-desk3.jf.intel.com (HELO localhost6.localdomain6)\n\t([134.134.3.186])\n\tby fmsmga002.fm.intel.com with ESMTP; 03 Oct 2016 17:05:33 -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.31,292,1473145200\"; d=\"scan'208\";\n\ta=\"1065698653\"", "From": "Emil Tantilov <emil.s.tantilov@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 03 Oct 2016 17:09:58 -0700", "Message-ID": "<20161004000958.22554.2468.stgit@localhost6.localdomain6>", "User-Agent": "StGit/0.17.1-17-ge4e0", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 1/2] ixgbe: remove SFP ixfi support", "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>", "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": "Remove SFP ixfi code since there is no HW that currently supports it.\n\nSigned-off-by: Emil Tantilov <emil.s.tantilov@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 76 ++++---------------------\n 1 file changed, 11 insertions(+), 65 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\nindex 7644a82..d4b8f8c 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n@@ -1351,7 +1351,7 @@ ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,\n \t\t\t\t__always_unused bool autoneg_wait_to_complete)\n {\n \ts32 status;\n-\tu16 slice, value;\n+\tu16 reg_slice, reg_val;\n \tbool setup_linear = false;\n \n \t/* Check if SFP module is supported and linear */\n@@ -1367,71 +1367,17 @@ ixgbe_setup_mac_link_sfp_x550em(struct ixgbe_hw *hw,\n \tif (status)\n \t\treturn status;\n \n-\tif (!(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {\n-\t\t/* Configure CS4227 LINE side to 10G SR. */\n-\t\tslice = IXGBE_CS4227_LINE_SPARE22_MSB + (hw->bus.lan_id << 12);\n-\t\tvalue = IXGBE_CS4227_SPEED_10G;\n-\t\tstatus = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227,\n-\t\t\t\t\t\t\t slice, value);\n-\t\tif (status)\n-\t\t\tgoto i2c_err;\n-\n-\t\tslice = IXGBE_CS4227_LINE_SPARE24_LSB + (hw->bus.lan_id << 12);\n-\t\tvalue = (IXGBE_CS4227_EDC_MODE_SR << 1) | 1;\n-\t\tstatus = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227,\n-\t\t\t\t\t\t\t slice, value);\n-\t\tif (status)\n-\t\t\tgoto i2c_err;\n-\n-\t\t/* Configure CS4227 for HOST connection rate then type. */\n-\t\tslice = IXGBE_CS4227_HOST_SPARE22_MSB + (hw->bus.lan_id << 12);\n-\t\tvalue = speed & IXGBE_LINK_SPEED_10GB_FULL ?\n-\t\t\tIXGBE_CS4227_SPEED_10G : IXGBE_CS4227_SPEED_1G;\n-\t\tstatus = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227,\n-\t\t\t\t\t\t\t slice, value);\n-\t\tif (status)\n-\t\t\tgoto i2c_err;\n-\n-\t\tslice = IXGBE_CS4227_HOST_SPARE24_LSB + (hw->bus.lan_id << 12);\n-\t\tif (setup_linear)\n-\t\t\tvalue = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 1;\n-\t\telse\n-\t\t\tvalue = (IXGBE_CS4227_EDC_MODE_SR << 1) | 1;\n-\t\tstatus = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227,\n-\t\t\t\t\t\t\t slice, value);\n-\t\tif (status)\n-\t\t\tgoto i2c_err;\n-\n-\t\t/* Setup XFI internal link. */\n-\t\tstatus = ixgbe_setup_ixfi_x550em(hw, &speed);\n-\t\tif (status) {\n-\t\t\thw_dbg(hw, \"setup_ixfi failed with %d\\n\", status);\n-\t\t\treturn status;\n-\t\t}\n-\t} else {\n-\t\t/* Configure internal PHY for KR/KX. */\n-\t\tstatus = ixgbe_setup_kr_speed_x550em(hw, speed);\n-\t\tif (status) {\n-\t\t\thw_dbg(hw, \"setup_kr_speed failed with %d\\n\", status);\n-\t\t\treturn status;\n-\t\t}\n-\n-\t\t/* Configure CS4227 LINE side to proper mode. */\n-\t\tslice = IXGBE_CS4227_LINE_SPARE24_LSB + (hw->bus.lan_id << 12);\n-\t\tif (setup_linear)\n-\t\t\tvalue = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 1;\n-\t\telse\n-\t\t\tvalue = (IXGBE_CS4227_EDC_MODE_SR << 1) | 1;\n-\t\tstatus = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227,\n-\t\t\t\t\t\t\t slice, value);\n-\t\tif (status)\n-\t\t\tgoto i2c_err;\n-\t}\n-\n-\treturn 0;\n+\t/* Configure internal PHY for KR/KX. */\n+\tixgbe_setup_kr_speed_x550em(hw, speed);\n \n-i2c_err:\n-\thw_dbg(hw, \"combined i2c access failed with %d\\n\", status);\n+\t/* Configure CS4227 LINE side to proper mode. */\n+\treg_slice = IXGBE_CS4227_LINE_SPARE24_LSB + (hw->bus.lan_id << 12);\n+\tif (setup_linear)\n+\t\treg_val = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;\n+\telse\n+\t\treg_val = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;\n+\tstatus = ixgbe_write_i2c_combined_generic(hw, IXGBE_CS4227,\n+\t\t\t\t\t\t reg_slice, reg_val);\n \treturn status;\n }\n \n", "prefixes": [ "1/2" ] }