Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/514265/?format=api
{ "id": 514265, "url": "http://patchwork.ozlabs.org/api/patches/514265/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1441315142-173025-6-git-send-email-catherine.sullivan@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": "<1441315142-173025-6-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-09-03T21:18:52", "name": "[next,S15,05/15] i40e: Remove 100M SGMII unless hw is X722", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5db76b7a48bf4120a07ef50707b3a7a9bda9ddaf", "submitter": { "id": 13931, "url": "http://patchwork.ozlabs.org/api/people/13931/?format=api", "name": "Catherine Sullivan", "email": "catherine.sullivan@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/1441315142-173025-6-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/514265/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/514265/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 8FEC7140771\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 4 Sep 2015 07:18:41 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id E355295010;\n\tThu, 3 Sep 2015 21:18:40 +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 pGIsUupE9cLH; Thu, 3 Sep 2015 21:18:40 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 41C1F9515A;\n\tThu, 3 Sep 2015 21:18:40 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id DAB8C1C1E5F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 3 Sep 2015 21:18:38 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D6E768D72A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 3 Sep 2015 21:18:38 +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 2Zr7zfZI519R for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 3 Sep 2015 21:18:36 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 37D6C8D6DF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 3 Sep 2015 21:18:36 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga103.jf.intel.com with ESMTP; 03 Sep 2015 14:18:17 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby orsmga002.jf.intel.com with ESMTP; 03 Sep 2015 14:18:17 -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.17,464,1437462000\"; d=\"scan'208\";a=\"797335988\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 3 Sep 2015 17:18:52 -0400", "Message-Id": "<1441315142-173025-6-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1441315142-173025-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1441315142-173025-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S15 05/15] i40e: Remove 100M SGMII\n\tunless hw is X722", "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": "Only the X722 device now supports 100M SGMII, and nothing supports\n100M on 1000Base_T.\n\nSigned-off-by: Catherine Sullivan <catherine.sullivan@intel.com>\nSigned-off-by: Shannon Nelson <shannon.nelson@intel.com>\nChange-ID: I6f44dcd818944edd40041410e6de380f4a359a0c\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 42 ++++++++++++++++----------\n 1 file changed, 26 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 185ac91..a22f1d9 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -255,7 +255,8 @@ static void i40e_partition_setting_complaint(struct i40e_pf *pf)\n **/\n static void i40e_get_settings_link_up(struct i40e_hw *hw,\n \t\t\t\t struct ethtool_cmd *ecmd,\n-\t\t\t\t struct net_device *netdev)\n+\t\t\t\t struct net_device *netdev,\n+\t\t\t\t struct i40e_pf *pf)\n {\n \tstruct i40e_link_status *hw_link_info = &hw->phy.link_info;\n \tu32 link_speed = hw_link_info->link_speed;\n@@ -299,16 +300,18 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,\n \t\tbreak;\n \tcase I40E_PHY_TYPE_10GBASE_T:\n \tcase I40E_PHY_TYPE_1000BASE_T:\n-\tcase I40E_PHY_TYPE_100BASE_TX:\n \t\tecmd->supported = SUPPORTED_Autoneg |\n \t\t\t\t SUPPORTED_10000baseT_Full |\n-\t\t\t\t SUPPORTED_1000baseT_Full |\n-\t\t\t\t SUPPORTED_100baseT_Full;\n+\t\t\t\t SUPPORTED_1000baseT_Full;\n \t\tecmd->advertising = ADVERTISED_Autoneg;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)\n \t\t\tecmd->advertising |= ADVERTISED_10000baseT_Full;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)\n \t\t\tecmd->advertising |= ADVERTISED_1000baseT_Full;\n+\t\tbreak;\n+\tcase I40E_PHY_TYPE_100BASE_TX:\n+\t\tecmd->supported = SUPPORTED_Autoneg |\n+\t\t\t\t SUPPORTED_100baseT_Full;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB)\n \t\t\tecmd->advertising |= ADVERTISED_100baseT_Full;\n \t\tbreak;\n@@ -328,12 +331,15 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,\n \t\tbreak;\n \tcase I40E_PHY_TYPE_SGMII:\n \t\tecmd->supported = SUPPORTED_Autoneg |\n-\t\t\t\t SUPPORTED_1000baseT_Full |\n-\t\t\t\t SUPPORTED_100baseT_Full;\n+\t\t\t\t SUPPORTED_1000baseT_Full;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)\n \t\t\tecmd->advertising |= ADVERTISED_1000baseT_Full;\n-\t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB)\n-\t\t\tecmd->advertising |= ADVERTISED_100baseT_Full;\n+\t\tif (pf->hw.mac.type == I40E_MAC_X722) {\n+\t\t\tecmd->supported |= SUPPORTED_100baseT_Full;\n+\t\t\tif (hw_link_info->requested_speeds &\n+\t\t\t I40E_LINK_SPEED_100MB)\n+\t\t\t\tecmd->advertising |= ADVERTISED_100baseT_Full;\n+\t\t}\n \t\tbreak;\n \t/* Backplane is set based on supported phy types in get_settings\n \t * so don't set anything here but don't warn either\n@@ -381,7 +387,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,\n * Reports link settings that can be determined when link is down\n **/\n static void i40e_get_settings_link_down(struct i40e_hw *hw,\n-\t\t\t\t\tstruct ethtool_cmd *ecmd)\n+\t\t\t\t\tstruct ethtool_cmd *ecmd,\n+\t\t\t\t\tstruct i40e_pf *pf)\n {\n \tenum i40e_aq_capabilities_phy_type phy_types = hw->phy.phy_types;\n \n@@ -392,11 +399,13 @@ static void i40e_get_settings_link_down(struct i40e_hw *hw,\n \tecmd->advertising = 0x0;\n \tif (phy_types & I40E_CAP_PHY_TYPE_SGMII) {\n \t\tecmd->supported |= SUPPORTED_Autoneg |\n-\t\t\t\t SUPPORTED_1000baseT_Full |\n-\t\t\t\t SUPPORTED_100baseT_Full;\n+\t\t\t\tSUPPORTED_1000baseT_Full;\n \t\tecmd->advertising |= ADVERTISED_Autoneg |\n-\t\t\t\t ADVERTISED_1000baseT_Full |\n-\t\t\t\t ADVERTISED_100baseT_Full;\n+\t\t\t\t ADVERTISED_1000baseT_Full;\n+\t\tif (pf->hw.mac.type == I40E_MAC_X722) {\n+\t\t\tecmd->supported |= SUPPORTED_100baseT_Full;\n+\t\t\tecmd->advertising |= ADVERTISED_100baseT_Full;\n+\t\t}\n \t}\n \tif (phy_types & I40E_CAP_PHY_TYPE_XAUI ||\n \t phy_types & I40E_CAP_PHY_TYPE_XFI ||\n@@ -425,7 +434,8 @@ static void i40e_get_settings_link_down(struct i40e_hw *hw,\n \t\tecmd->advertising |= ADVERTISED_Autoneg |\n \t\t\t\t ADVERTISED_40000baseCR4_Full;\n \t}\n-\tif (phy_types & I40E_CAP_PHY_TYPE_100BASE_TX) {\n+\tif ((phy_types & I40E_CAP_PHY_TYPE_100BASE_TX) &&\n+\t !(phy_types & I40E_CAP_PHY_TYPE_1000BASE_T)) {\n \t\tecmd->supported |= SUPPORTED_Autoneg |\n \t\t\t\t SUPPORTED_100baseT_Full;\n \t\tecmd->advertising |= ADVERTISED_Autoneg |\n@@ -467,9 +477,9 @@ static int i40e_get_settings(struct net_device *netdev,\n \tbool link_up = hw_link_info->link_info & I40E_AQ_LINK_UP;\n \n \tif (link_up)\n-\t\ti40e_get_settings_link_up(hw, ecmd, netdev);\n+\t\ti40e_get_settings_link_up(hw, ecmd, netdev, pf);\n \telse\n-\t\ti40e_get_settings_link_down(hw, ecmd);\n+\t\ti40e_get_settings_link_down(hw, ecmd, pf);\n \n \t/* Now set the settings that don't rely on link being up/down */\n \n", "prefixes": [ "next", "S15", "05/15" ] }