Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/690201/?format=api
{ "id": 690201, "url": "http://patchwork.ozlabs.org/api/patches/690201/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1478033907-10221-1-git-send-email-anthony.l.nguyen@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": "<1478033907-10221-1-git-send-email-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2016-11-01T20:58:27", "name": "ixgbe: Remove driver config for KX4 PHY", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0c8fb96b47e2be5fd7ab87366595e56e7ac8b951", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/1478033907-10221-1-git-send-email-anthony.l.nguyen@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/690201/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/690201/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 3t7lqH1XqYz9sCg\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 2 Nov 2016 09:13:14 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 4437EC1721;\n\tTue, 1 Nov 2016 22:13:13 +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 U_HxyQs7TgYl; Tue, 1 Nov 2016 22:13:12 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 78914C1500;\n\tTue, 1 Nov 2016 22:13:12 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 35AF11C2E7B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 1 Nov 2016 22:13:11 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 30E9731CFB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 1 Nov 2016 22:13:11 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id W1SE74+M6gJZ for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 1 Nov 2016 22:13:10 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 0544E31CF7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 1 Nov 2016 22:13:09 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga104.jf.intel.com with ESMTP; 01 Nov 2016 15:13:09 -0700", "from unknown (HELO anguy11-desk2.localdomain.com) ([10.166.12.51])\n\tby orsmga001.jf.intel.com with ESMTP; 01 Nov 2016 15:13:10 -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,433,1473145200\"; d=\"scan'208\";\n\ta=\"1053739973\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 1 Nov 2016 13:58:27 -0700", "Message-Id": "<1478033907-10221-1-git-send-email-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.4.0", "Subject": "[Intel-wired-lan] [PATCH] ixgbe: Remove driver config for KX4 PHY", "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": "The KX4 PHY is configured by the NVM. Currently, the driver is overwriting\nthe config; remove the code associated with KX4 configuration.\n\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 3 +-\n drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 12 --------\n drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 40 +--------------------------\n 3 files changed, 3 insertions(+), 52 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c\nindex b1711ff..df657ef 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c\n@@ -784,7 +784,8 @@ s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,\n \t\thw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_100_FULL;\n \n \t/* Setup link based on the new speed settings */\n-\thw->phy.ops.setup_link(hw);\n+\tif (hw->phy.ops.setup_link)\n+\t\thw->phy.ops.setup_link(hw);\n \n \treturn 0;\n }\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\nindex bde7e33..9ad110d 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n@@ -3679,15 +3679,6 @@ struct ixgbe_info {\n #define IXGBE_KRM_TX_COEFF_CTRL_1_CZERO_EN\t\tBIT(3)\n #define IXGBE_KRM_TX_COEFF_CTRL_1_OVRRD_EN\t\tBIT(31)\n \n-#define IXGBE_KX4_LINK_CNTL_1\t\t\t\t0x4C\n-#define IXGBE_KX4_LINK_CNTL_1_TETH_AN_CAP_KX\t\tBIT(16)\n-#define IXGBE_KX4_LINK_CNTL_1_TETH_AN_CAP_KX4\t\tBIT(17)\n-#define IXGBE_KX4_LINK_CNTL_1_TETH_EEE_CAP_KX\t\tBIT(24)\n-#define IXGBE_KX4_LINK_CNTL_1_TETH_EEE_CAP_KX4\t\tBIT(25)\n-#define IXGBE_KX4_LINK_CNTL_1_TETH_AN_ENABLE\t\tBIT(29)\n-#define IXGBE_KX4_LINK_CNTL_1_TETH_FORCE_LINK_UP\tBIT(30)\n-#define IXGBE_KX4_LINK_CNTL_1_TETH_AN_RESTART\t\tBIT(31)\n-\n #define IXGBE_SB_IOSF_INDIRECT_CTRL\t\t0x00011144\n #define IXGBE_SB_IOSF_INDIRECT_DATA\t\t0x00011148\n \n@@ -3704,9 +3695,6 @@ struct ixgbe_info {\n #define IXGBE_SB_IOSF_CTRL_BUSY_SHIFT\t\t31\n #define IXGBE_SB_IOSF_CTRL_BUSY\t\tBIT(IXGBE_SB_IOSF_CTRL_BUSY_SHIFT)\n #define IXGBE_SB_IOSF_TARGET_KR_PHY\t0\n-#define IXGBE_SB_IOSF_TARGET_KX4_UNIPHY\t1\n-#define IXGBE_SB_IOSF_TARGET_KX4_PCS0\t2\n-#define IXGBE_SB_IOSF_TARGET_KX4_PCS1\t3\n \n #define IXGBE_NW_MNG_IF_SEL\t\t0x00011178\n #define IXGBE_NW_MNG_IF_SEL_MDIO_ACT\t\tBIT(1)\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\nindex 92f2b5e..80be82d 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n@@ -2146,44 +2146,6 @@ static s32 ixgbe_setup_kr_speed_x550em(struct ixgbe_hw *hw,\n \treturn ixgbe_restart_an_internal_phy_x550em(hw);\n }\n \n-/** ixgbe_setup_kx4_x550em - Configure the KX4 PHY.\n- * @hw: pointer to hardware structure\n- *\n- * Configures the integrated KX4 PHY.\n- **/\n-static s32 ixgbe_setup_kx4_x550em(struct ixgbe_hw *hw)\n-{\n-\ts32 status;\n-\tu32 reg_val;\n-\n-\tstatus = hw->mac.ops.read_iosf_sb_reg(hw, IXGBE_KX4_LINK_CNTL_1,\n-\t\t\t\t\t IXGBE_SB_IOSF_TARGET_KX4_PCS0 +\n-\t\t\t\t\t hw->bus.lan_id, ®_val);\n-\tif (status)\n-\t\treturn status;\n-\n-\treg_val &= ~(IXGBE_KX4_LINK_CNTL_1_TETH_AN_CAP_KX4 |\n-\t\t IXGBE_KX4_LINK_CNTL_1_TETH_AN_CAP_KX);\n-\n-\treg_val |= IXGBE_KX4_LINK_CNTL_1_TETH_AN_ENABLE;\n-\n-\t/* Advertise 10G support. */\n-\tif (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)\n-\t\treg_val |= IXGBE_KX4_LINK_CNTL_1_TETH_AN_CAP_KX4;\n-\n-\t/* Advertise 1G support. */\n-\tif (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)\n-\t\treg_val |= IXGBE_KX4_LINK_CNTL_1_TETH_AN_CAP_KX;\n-\n-\t/* Restart auto-negotiation. */\n-\treg_val |= IXGBE_KX4_LINK_CNTL_1_TETH_AN_RESTART;\n-\tstatus = hw->mac.ops.write_iosf_sb_reg(hw, IXGBE_KX4_LINK_CNTL_1,\n-\t\t\t\t\t IXGBE_SB_IOSF_TARGET_KX4_PCS0 +\n-\t\t\t\t\t hw->bus.lan_id, reg_val);\n-\n-\treturn status;\n-}\n-\n /**\n * ixgbe_setup_kr_x550em - Configure the KR PHY\n * @hw: pointer to hardware structure\n@@ -2764,7 +2726,7 @@ static s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)\n \t/* Set functions pointers based on phy type */\n \tswitch (hw->phy.type) {\n \tcase ixgbe_phy_x550em_kx4:\n-\t\tphy->ops.setup_link = ixgbe_setup_kx4_x550em;\n+\t\tphy->ops.setup_link = NULL;\n \t\tphy->ops.read_reg = ixgbe_read_phy_reg_x550em;\n \t\tphy->ops.write_reg = ixgbe_write_phy_reg_x550em;\n \t\tbreak;\n", "prefixes": [] }