Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/603190/?format=api
{ "id": 603190, "url": "http://patchwork.ozlabs.org/api/patches/603190/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160329235812.68428.4760.stgit@mdrustad-wks.jf.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": "<20160329235812.68428.4760.stgit@mdrustad-wks.jf.intel.com>", "list_archive_url": null, "date": "2016-03-29T23:58:12", "name": "[V4,09/11] ixgbe: Add support for SGMII backplane interface", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ae3cbbb8a2dc29ad5faeab6fe1e34c69e81968b1", "submitter": { "id": 13252, "url": "http://patchwork.ozlabs.org/api/people/13252/?format=api", "name": "Rustad, Mark D", "email": "mark.d.rustad@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/20160329235812.68428.4760.stgit@mdrustad-wks.jf.intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/603190/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/603190/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\tby ozlabs.org (Postfix) with ESMTP id 3qZSQn4ynMz9sBM\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Mar 2016 10:58:25 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0B98F8AEE8;\n\tTue, 29 Mar 2016 23:58:25 +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 wNFNATigGMQk; Tue, 29 Mar 2016 23:58:24 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 762DD8AD1E;\n\tTue, 29 Mar 2016 23:58:24 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id C2AFA1C2BB2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Mar 2016 23:58:22 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id BE4C98AE92\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Mar 2016 23:58:22 +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 PF2uPyoWhXJl for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Mar 2016 23:58:21 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A695B8AE65\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Mar 2016 23:58:21 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga103.fm.intel.com with ESMTP; 29 Mar 2016 16:58:12 -0700", "from mdrustad-wks.jf.intel.com ([134.134.3.71])\n\tby fmsmga001.fm.intel.com with ESMTP; 29 Mar 2016 16:58:13 -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.24,413,1455004800\"; d=\"scan'208\";a=\"934309617\"", "From": "Mark D Rustad <mark.d.rustad@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 29 Mar 2016 16:58:12 -0700", "Message-ID": "<20160329235812.68428.4760.stgit@mdrustad-wks.jf.intel.com>", "In-Reply-To": "<20160329235544.68428.93935.stgit@mdrustad-wks.jf.intel.com>", "References": "<20160329235544.68428.93935.stgit@mdrustad-wks.jf.intel.com>", "User-Agent": "StGit/unknown-version", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH V4 09/11] ixgbe: Add support for SGMII\n\tbackplane interface", "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": "Add support for an SGMII backplane interface.\n\nSigned-off-by: Mark Rustad <mark.d.rustad@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +\n drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 9 ++++\n drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 58 +++++++++++++++++++++++++\n 3 files changed, 69 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 1712917cd0a3..41bc816bbe87 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -131,6 +131,8 @@ static const struct pci_device_id ixgbe_pci_tbl[] = {\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_A_SFP_N), board_x550em_a },\n+\t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII), board_x550em_a },\n+\t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII_L), board_x550em_a },\n \t{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP), board_x550em_a },\n \t/* required last entry */\n \t{0, }\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\nindex 40121b8b0220..eada335c03f8 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n@@ -81,6 +81,8 @@\n #define IXGBE_DEV_ID_X550EM_X_10G_T\t0x15AD\n #define IXGBE_DEV_ID_X550EM_X_1G_T\t0x15AE\n #define IXGBE_DEV_ID_X550EM_A_SFP_N\t0x15C4\n+#define IXGBE_DEV_ID_X550EM_A_SGMII\t0x15C6\n+#define IXGBE_DEV_ID_X550EM_A_SGMII_L\t0x15C7\n #define IXGBE_DEV_ID_X550EM_A_SFP\t0x15CE\n \n /* VF Device IDs */\n@@ -3064,6 +3066,7 @@ enum ixgbe_phy_type {\n \tixgbe_phy_qsfp_intel,\n \tixgbe_phy_qsfp_unknown,\n \tixgbe_phy_sfp_unsupported,\n+\tixgbe_phy_sgmii,\n \tixgbe_phy_generic\n };\n \n@@ -3581,6 +3584,7 @@ struct ixgbe_info {\n #define IXGBE_KRM_LINK_CTRL_1(P)\t((P) ? 0x820C : 0x420C)\n #define IXGBE_KRM_AN_CNTL_1(P)\t\t((P) ? 0x822C : 0x422C)\n #define IXGBE_KRM_AN_CNTL_8(P)\t\t((P) ? 0x8248 : 0x4248)\n+#define IXGBE_KRM_SGMII_CTRL(P)\t\t((P) ? 0x82A0 : 0x42A0)\n #define IXGBE_KRM_DSP_TXFFE_STATE_4(P)\t((P) ? 0x8634 : 0x4634)\n #define IXGBE_KRM_DSP_TXFFE_STATE_5(P)\t((P) ? 0x8638 : 0x4638)\n #define IXGBE_KRM_RX_TRN_LINKUP_CTRL(P)\t((P) ? 0x8B00 : 0x4B00)\n@@ -3594,6 +3598,8 @@ struct ixgbe_info {\n #define IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_MASK\t(0x7 << 8)\n #define IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_1G\t(2 << 8)\n #define IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_10G\t(4 << 8)\n+#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_SGMII_EN\t\t(1 << 12)\n+#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_CLAUSE_37_EN\t(1 << 13)\n #define IXGBE_KRM_LINK_CTRL_1_TETH_AN_FEC_REQ\t\t(1 << 14)\n #define IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC\t\t(1 << 15)\n #define IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_KX\t\t(1 << 16)\n@@ -3609,6 +3615,9 @@ struct ixgbe_info {\n #define IXGBE_KRM_AN_CNTL_8_LINEAR\t\t\tBIT(0)\n #define IXGBE_KRM_AN_CNTL_8_LIMITING\t\t\tBIT(1)\n \n+#define IXGBE_KRM_SGMII_CTRL_MAC_TAR_FORCE_100_D\t(1 << 12)\n+#define IXGBE_KRM_SGMII_CTRL_MAC_TAR_FORCE_10_D\t\t(1 << 19)\n+\n #define IXGBE_KRM_DSP_TXFFE_STATE_C0_EN\t\t\t(1 << 6)\n #define IXGBE_KRM_DSP_TXFFE_STATE_CP1_CN1_EN\t\t(1 << 15)\n #define IXGBE_KRM_DSP_TXFFE_STATE_CO_ADAPT_EN\t\t(1 << 16)\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\nindex 74f76fbb56cb..bf82a30285d6 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n@@ -1558,6 +1558,57 @@ static s32 ixgbe_check_link_t_X550em(struct ixgbe_hw *hw,\n \treturn 0;\n }\n \n+/**\n+ * ixgbe_setup_sgmii - Set up link for sgmii\n+ * @hw: pointer to hardware structure\n+ */\n+static s32\n+ixgbe_setup_sgmii(struct ixgbe_hw *hw, __always_unused ixgbe_link_speed speed,\n+\t\t __always_unused bool autoneg_wait_to_complete)\n+{\n+\tstruct ixgbe_mac_info *mac = &hw->mac;\n+\tu32 lval, sval;\n+\ts32 rc;\n+\n+\trc = mac->ops.read_iosf_sb_reg(hw,\n+\t\t\t\t IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),\n+\t\t\t\t IXGBE_SB_IOSF_TARGET_KR_PHY, &lval);\n+\tif (rc)\n+\t\treturn rc;\n+\n+\tlval &= ~IXGBE_KRM_LINK_CTRL_1_TETH_AN_ENABLE;\n+\tlval &= ~IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_MASK;\n+\tlval |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_SGMII_EN;\n+\tlval |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_CLAUSE_37_EN;\n+\tlval |= IXGBE_KRM_LINK_CTRL_1_TETH_FORCE_SPEED_1G;\n+\trc = mac->ops.write_iosf_sb_reg(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, lval);\n+\tif (rc)\n+\t\treturn rc;\n+\n+\trc = mac->ops.read_iosf_sb_reg(hw,\n+\t\t\t\t IXGBE_KRM_SGMII_CTRL(hw->bus.lan_id),\n+\t\t\t\t IXGBE_SB_IOSF_TARGET_KR_PHY, &sval);\n+\tif (rc)\n+\t\treturn rc;\n+\n+\tsval |= IXGBE_KRM_SGMII_CTRL_MAC_TAR_FORCE_10_D;\n+\tsval |= IXGBE_KRM_SGMII_CTRL_MAC_TAR_FORCE_100_D;\n+\trc = mac->ops.write_iosf_sb_reg(hw,\n+\t\t\t\t\tIXGBE_KRM_SGMII_CTRL(hw->bus.lan_id),\n+\t\t\t\t\tIXGBE_SB_IOSF_TARGET_KR_PHY, sval);\n+\tif (rc)\n+\t\treturn rc;\n+\n+\tlval |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART;\n+\trc = mac->ops.write_iosf_sb_reg(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, lval);\n+\n+\treturn rc;\n+}\n+\n /** ixgbe_init_mac_link_ops_X550em - init mac link function pointers\n * @hw: pointer to hardware structure\n **/\n@@ -1597,6 +1648,9 @@ static void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw)\n \t\tmac->ops.check_link = ixgbe_check_link_t_X550em;\n \t\treturn;\n \tcase ixgbe_media_type_backplane:\n+\t\tif (hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII ||\n+\t\t hw->device_id == IXGBE_DEV_ID_X550EM_A_SGMII_L)\n+\t\t\tmac->ops.setup_link = ixgbe_setup_sgmii;\n \t\tbreak;\n \tdefault:\n \t\tmac->ops.setup_fc = ixgbe_setup_fc_x550em;\n@@ -2377,6 +2431,10 @@ static enum ixgbe_media_type ixgbe_get_media_type_X550em(struct ixgbe_hw *hw)\n \n \t/* Detect if there is a copper PHY attached. */\n \tswitch (hw->device_id) {\n+\tcase IXGBE_DEV_ID_X550EM_A_SGMII:\n+\tcase IXGBE_DEV_ID_X550EM_A_SGMII_L:\n+\t\thw->phy.type = ixgbe_phy_sgmii;\n+\t\t/* Fallthrough */\n \tcase IXGBE_DEV_ID_X550EM_X_KR:\n \tcase IXGBE_DEV_ID_X550EM_X_KX4:\n \t\tmedia_type = ixgbe_media_type_backplane;\n", "prefixes": [ "V4", "09/11" ] }