Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/673094/?format=api
{ "id": 673094, "url": "http://patchwork.ozlabs.org/api/patches/673094/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1474503712-1901-1-git-send-email-donald.c.skidmore@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": "<1474503712-1901-1-git-send-email-donald.c.skidmore@intel.com>", "list_archive_url": null, "date": "2016-09-22T00:21:52", "name": "ixgbe: Add X552 iXFI configuration helper function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "dd2b7ca4df28d3509845d62214845a66071fc568", "submitter": { "id": 4487, "url": "http://patchwork.ozlabs.org/api/people/4487/?format=api", "name": "Skidmore, Donald C", "email": "donald.c.skidmore@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/1474503712-1901-1-git-send-email-donald.c.skidmore@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/673094/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/673094/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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 3sfbLW3kPSz9sCp\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 22 Sep 2016 09:24:34 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id AFACE8AA9C;\n\tWed, 21 Sep 2016 23:24:32 +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 sD0JnP0LsqEL; Wed, 21 Sep 2016 23:24:32 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2DFEE8AA93;\n\tWed, 21 Sep 2016 23:24:32 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9E0081C1EB7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 21 Sep 2016 23:24:30 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 95FDA8AA7E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 21 Sep 2016 23:24:30 +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 HNGZJUqqLtZN for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 21 Sep 2016 23:24:24 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 983AB8AA72\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 21 Sep 2016 23:24:24 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby fmsmga103.fm.intel.com with ESMTP; 21 Sep 2016 16:24:25 -0700", "from dcskidmo-m40.jf.intel.com ([134.134.3.25])\n\tby orsmga004.jf.intel.com with ESMTP; 21 Sep 2016 16:24:23 -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.30,375,1470726000\"; d=\"scan'208\";a=\"12332548\"", "From": "Donald C Skidmore <donald.c.skidmore@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 21 Sep 2016 20:21:52 -0400", "Message-Id": "<1474503712-1901-1-git-send-email-donald.c.skidmore@intel.com>", "X-Mailer": "git-send-email 2.4.3", "Subject": "[Intel-wired-lan] [PATCH] ixgbe: Add X552 iXFI configuration helper\n\tfunction", "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": "X553 doesn't need all the initialization that X552 did for iXFI. This\npatch will allow native SPI SFP+ to work with X553 devices. Future\npatches will add additional configuration as needed.\n\nSigned-off-by: Don Skidmore <donald.c.skidmore@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 86 ++++++++++++++++-----------\n 1 file changed, 52 insertions(+), 34 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\nindex 7e6b926..3e3458e 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n@@ -1128,47 +1128,17 @@ out:\n \treturn ret;\n }\n \n-/** ixgbe_setup_ixfi_x550em - Configure the KR PHY for iXFI mode.\n+/**\n+ * ixgbe_setup_ixfi_x550em_x - MAC specific iXFI configuration\n * @hw: pointer to hardware structure\n- * @speed: the link speed to force\n *\n- * Configures the integrated KR PHY to use iXFI mode. Used to connect an\n- * internal and external PHY at a specific speed, without autonegotiation.\n+ * iXfI configuration needed for ixgbe_mac_X550EM_x devices.\n **/\n-static s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed)\n+static s32 ixgbe_setup_ixfi_x550em_x(struct ixgbe_hw *hw)\n {\n \ts32 status;\n \tu32 reg_val;\n \n-\t/* Disable AN and force speed to 10G Serial. */\n-\tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n-\t\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n-\t\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n-\tif (status)\n-\t\treturn status;\n-\n-\treg_val &= ~IXGBE_KRM_LINK_CTRL_1_TETH_AN_ENABLE;\n-\treg_val &= ~IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_MASK;\n-\n-\t/* Select forced link speed for internal PHY. */\n-\tswitch (*speed) {\n-\tcase IXGBE_LINK_SPEED_10GB_FULL:\n-\t\treg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_10G;\n-\t\tbreak;\n-\tcase IXGBE_LINK_SPEED_1GB_FULL:\n-\t\treg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_1G;\n-\t\tbreak;\n-\tdefault:\n-\t\t/* Other link speeds are not supported by internal KR PHY. */\n-\t\treturn IXGBE_ERR_LINK_SETUP;\n-\t}\n-\n-\tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n-\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n-\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n-\tif (status)\n-\t\treturn status;\n-\n \t/* Disable training protocol FSM. */\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n \t\t\t\tIXGBE_KRM_RX_TRN_LINKUP_CTRL(hw->bus.lan_id),\n@@ -1228,9 +1198,57 @@ static s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed)\n \tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n \t\t\t\tIXGBE_KRM_TX_COEFF_CTRL_1(hw->bus.lan_id),\n \t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n+\treturn status;\n+}\n+\n+/** ixgbe_setup_ixfi_x550em - Configure the KR PHY for iXFI mode.\n+ * @hw: pointer to hardware structure\n+ * @speed: the link speed to force\n+ *\n+ * Configures the integrated KR PHY to use iXFI mode. Used to connect an\n+ * internal and external PHY at a specific speed, without autonegotiation.\n+ **/\n+static s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed)\n+{\n+\ts32 status;\n+\tu32 reg_val;\n+\n+\t/* Disable AN and force speed to 10G Serial. */\n+\tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n+\t\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n+\t\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, ®_val);\n+\tif (status)\n+\t\treturn status;\n+\n+\treg_val &= ~IXGBE_KRM_LINK_CTRL_1_TETH_AN_ENABLE;\n+\treg_val &= ~IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_MASK;\n+\n+\t/* Select forced link speed for internal PHY. */\n+\tswitch (*speed) {\n+\tcase IXGBE_LINK_SPEED_10GB_FULL:\n+\t\treg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_10G;\n+\t\tbreak;\n+\tcase IXGBE_LINK_SPEED_1GB_FULL:\n+\t\treg_val |= IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_1G;\n+\t\tbreak;\n+\tdefault:\n+\t\t/* Other link speeds are not supported by internal KR PHY. */\n+\t\treturn IXGBE_ERR_LINK_SETUP;\n+\t}\n+\n+\tstatus = ixgbe_write_iosf_sb_reg_x550(hw,\n+\t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n+\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, reg_val);\n \tif (status)\n \t\treturn status;\n \n+\t/* Additional configuration needed for x550em_x */\n+\tif (hw->mac.type == ixgbe_mac_X550EM_x) {\n+\t\tstatus = ixgbe_setup_ixfi_x550em_x(hw);\n+\t\tif (status)\n+\t\t\treturn status;\n+\t}\n+\n \t/* Toggle port SW reset by AN reset. */\n \tstatus = ixgbe_read_iosf_sb_reg_x550(hw,\n \t\t\t\tIXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n", "prefixes": [] }