Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/822121/?format=api
{ "id": 822121, "url": "http://patchwork.ozlabs.org/api/patches/822121/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20171005215344.2886-9-alan.brady@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": "<20171005215344.2886-9-alan.brady@intel.com>", "list_archive_url": null, "date": "2017-10-05T21:53:38", "name": "[v3,08/14,net-next] i40e: group autoneg PHY types together", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "38a21555acf4414d488dbc803507fa713cc04596", "submitter": { "id": 69551, "url": "http://patchwork.ozlabs.org/api/people/69551/?format=api", "name": "Alan Brady", "email": "alan.brady@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/20171005215344.2886-9-alan.brady@intel.com/mbox/", "series": [ { "id": 6727, "url": "http://patchwork.ozlabs.org/api/series/6727/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=6727", "date": "2017-10-05T21:53:35", "name": "i40e: refactor ethtool interface", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/6727/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/822121/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/822121/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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" ], "Authentication-Results": "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "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 3y7RSz5G1Wz9t45\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 6 Oct 2017 08:57:23 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 36A8C82899;\n\tThu, 5 Oct 2017 21:57: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 y0wUz5e1nmLq; Thu, 5 Oct 2017 21:57:16 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 7440688E85;\n\tThu, 5 Oct 2017 21:57:13 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id D86371C097A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 5 Oct 2017 21:57:06 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id C8BF9880C4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 5 Oct 2017 21:57:06 +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 TsfvWwSFSRXz for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 5 Oct 2017 21:57:05 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 4A8F08816D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 5 Oct 2017 21:57:05 +0000 (UTC)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t05 Oct 2017 14:56:41 -0700", "from dev1-atbrady.jf.intel.com ([10.165.248.38])\n\tby fmsmga005.fm.intel.com with ESMTP; 05 Oct 2017 14:56:41 -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.42,482,1500966000\"; d=\"scan'208\";a=\"159384225\"", "From": "Alan Brady <alan.brady@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 5 Oct 2017 14:53:38 -0700", "Message-Id": "<20171005215344.2886-9-alan.brady@intel.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20171005215344.2886-1-alan.brady@intel.com>", "References": "<20171005215344.2886-1-alan.brady@intel.com>", "Subject": "[Intel-wired-lan] [PATCH v3 08/14 net-next] i40e: group autoneg PHY\n\ttypes together", "X-BeenThere": "intel-wired-lan@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.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@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@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "This separates the setting of autoneg in i40e_phy_types_to_ethtool into\nits own conditional. Doing this adds clarity as what PHYs\nsupport/advertise autoneg and makes it easier to add new PHY types in\nthe future.\n\nThis also fixes an issue on devices with CRT_RETIMER where advertising\nautoneg was being set, but supported autoneg was not.\n\nSigned-off-by: Alan Brady <alan.brady@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 85 +++++++++++++-------------\n 1 file changed, 41 insertions(+), 44 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 6296bb2e8bd3..08288b0a8cad 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -268,9 +268,7 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, u32 *supported,\n \t*advertising = 0x0;\n \n \tif (phy_types & I40E_CAP_PHY_TYPE_SGMII) {\n-\t\t*supported |= SUPPORTED_Autoneg |\n-\t\t\t SUPPORTED_1000baseT_Full;\n-\t\t*advertising |= ADVERTISED_Autoneg;\n+\t\t*supported |= SUPPORTED_1000baseT_Full;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)\n \t\t\t*advertising |= ADVERTISED_1000baseT_Full;\n \t\tif (pf->hw_features & I40E_HW_100M_SGMII_CAPABLE) {\n@@ -289,9 +287,7 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, u32 *supported,\n \t phy_types & I40E_CAP_PHY_TYPE_10GBASE_T ||\n \t phy_types & I40E_CAP_PHY_TYPE_10GBASE_SR ||\n \t phy_types & I40E_CAP_PHY_TYPE_10GBASE_LR) {\n-\t\t*supported |= SUPPORTED_Autoneg |\n-\t\t\t SUPPORTED_10000baseT_Full;\n-\t\t*advertising |= ADVERTISED_Autoneg;\n+\t\t*supported |= SUPPORTED_10000baseT_Full;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)\n \t\t\t*advertising |= ADVERTISED_10000baseT_Full;\n \t}\n@@ -301,16 +297,12 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, u32 *supported,\n \t\t*supported |= SUPPORTED_40000baseCR4_Full;\n \tif (phy_types & I40E_CAP_PHY_TYPE_40GBASE_CR4_CU ||\n \t phy_types & I40E_CAP_PHY_TYPE_40GBASE_CR4) {\n-\t\t*supported |= SUPPORTED_Autoneg |\n-\t\t\t SUPPORTED_40000baseCR4_Full;\n-\t\t*advertising |= ADVERTISED_Autoneg;\n+\t\t*supported |= SUPPORTED_40000baseCR4_Full;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_40GB)\n \t\t\t*advertising |= ADVERTISED_40000baseCR4_Full;\n \t}\n \tif (phy_types & I40E_CAP_PHY_TYPE_100BASE_TX) {\n-\t\t*supported |= SUPPORTED_Autoneg |\n-\t\t\t SUPPORTED_100baseT_Full;\n-\t\t*advertising |= ADVERTISED_Autoneg;\n+\t\t*supported |= SUPPORTED_100baseT_Full;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB)\n \t\t\t*advertising |= ADVERTISED_100baseT_Full;\n \t}\n@@ -318,9 +310,7 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, u32 *supported,\n \t phy_types & I40E_CAP_PHY_TYPE_1000BASE_SX ||\n \t phy_types & I40E_CAP_PHY_TYPE_1000BASE_LX ||\n \t phy_types & I40E_CAP_PHY_TYPE_1000BASE_T_OPTICAL) {\n-\t\t*supported |= SUPPORTED_Autoneg |\n-\t\t\t SUPPORTED_1000baseT_Full;\n-\t\t*advertising |= ADVERTISED_Autoneg;\n+\t\t*supported |= SUPPORTED_1000baseT_Full;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)\n \t\t\t*advertising |= ADVERTISED_1000baseT_Full;\n \t}\n@@ -329,47 +319,54 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, u32 *supported,\n \tif (phy_types & I40E_CAP_PHY_TYPE_40GBASE_LR4)\n \t\t*supported |= SUPPORTED_40000baseLR4_Full;\n \tif (phy_types & I40E_CAP_PHY_TYPE_40GBASE_KR4) {\n-\t\t*supported |= SUPPORTED_40000baseKR4_Full |\n-\t\t\t SUPPORTED_Autoneg;\n-\t\t*advertising |= ADVERTISED_40000baseKR4_Full |\n-\t\t\t\tADVERTISED_Autoneg;\n+\t\t*supported |= SUPPORTED_40000baseKR4_Full;\n+\t\t*advertising |= ADVERTISED_40000baseKR4_Full;\n \t}\n \tif (phy_types & I40E_CAP_PHY_TYPE_20GBASE_KR2) {\n-\t\t*supported |= SUPPORTED_20000baseKR2_Full |\n-\t\t\t SUPPORTED_Autoneg;\n-\t\t*advertising |= ADVERTISED_Autoneg;\n+\t\t*supported |= SUPPORTED_20000baseKR2_Full;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_20GB)\n \t\t\t*advertising |= ADVERTISED_20000baseKR2_Full;\n \t}\n-\tif (phy_types & I40E_CAP_PHY_TYPE_10GBASE_KR) {\n-\t\tif (!(pf->hw_features & I40E_HW_HAVE_CRT_RETIMER))\n-\t\t\t*supported |= SUPPORTED_10000baseKR_Full |\n-\t\t\t\t SUPPORTED_Autoneg;\n-\t\t*advertising |= ADVERTISED_Autoneg;\n-\t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)\n-\t\t\tif (!(pf->hw_features & I40E_HW_HAVE_CRT_RETIMER))\n-\t\t\t\t*advertising |= ADVERTISED_10000baseKR_Full;\n-\t}\n \tif (phy_types & I40E_CAP_PHY_TYPE_10GBASE_KX4) {\n-\t\t*supported |= SUPPORTED_10000baseKX4_Full |\n-\t\t\t SUPPORTED_Autoneg;\n-\t\t*advertising |= ADVERTISED_Autoneg;\n+\t\t*supported |= SUPPORTED_10000baseKX4_Full;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)\n \t\t\t*advertising |= ADVERTISED_10000baseKX4_Full;\n \t}\n-\tif (phy_types & I40E_CAP_PHY_TYPE_1000BASE_KX) {\n-\t\tif (!(pf->hw_features & I40E_HW_HAVE_CRT_RETIMER))\n-\t\t\t*supported |= SUPPORTED_1000baseKX_Full |\n-\t\t\t\t SUPPORTED_Autoneg;\n-\t\t*advertising |= ADVERTISED_Autoneg;\n+\tif (phy_types & I40E_CAP_PHY_TYPE_10GBASE_KR &&\n+\t !(pf->hw_features & I40E_HW_HAVE_CRT_RETIMER)) {\n+\t\t*supported |= SUPPORTED_10000baseKR_Full;\n+\t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)\n+\t\t\t*advertising |= ADVERTISED_10000baseKR_Full;\n+\t}\n+\tif (phy_types & I40E_CAP_PHY_TYPE_1000BASE_KX &&\n+\t !(pf->hw_features & I40E_HW_HAVE_CRT_RETIMER)) {\n+\t\t*supported |= SUPPORTED_1000baseKX_Full;\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)\n-\t\t\tif (!(pf->hw_features & I40E_HW_HAVE_CRT_RETIMER))\n-\t\t\t\t*advertising |= ADVERTISED_1000baseKX_Full;\n+\t\t\t*advertising |= ADVERTISED_1000baseKX_Full;\n \t}\n-\tif (phy_types & I40E_CAP_PHY_TYPE_25GBASE_KR ||\n-\t phy_types & I40E_CAP_PHY_TYPE_25GBASE_CR ||\n+\t/* Autoneg PHY types */\n+\tif (phy_types & I40E_CAP_PHY_TYPE_SGMII ||\n+\t phy_types & I40E_CAP_PHY_TYPE_40GBASE_KR4 ||\n+\t phy_types & I40E_CAP_PHY_TYPE_40GBASE_CR4_CU ||\n+\t phy_types & I40E_CAP_PHY_TYPE_40GBASE_CR4 ||\n \t phy_types & I40E_CAP_PHY_TYPE_25GBASE_SR ||\n-\t phy_types & I40E_CAP_PHY_TYPE_25GBASE_LR) {\n+\t phy_types & I40E_CAP_PHY_TYPE_25GBASE_LR ||\n+\t phy_types & I40E_CAP_PHY_TYPE_25GBASE_KR ||\n+\t phy_types & I40E_CAP_PHY_TYPE_25GBASE_CR ||\n+\t phy_types & I40E_CAP_PHY_TYPE_20GBASE_KR2 ||\n+\t phy_types & I40E_CAP_PHY_TYPE_10GBASE_T ||\n+\t phy_types & I40E_CAP_PHY_TYPE_10GBASE_SR ||\n+\t phy_types & I40E_CAP_PHY_TYPE_10GBASE_LR ||\n+\t phy_types & I40E_CAP_PHY_TYPE_10GBASE_KX4 ||\n+\t phy_types & I40E_CAP_PHY_TYPE_10GBASE_KR ||\n+\t phy_types & I40E_CAP_PHY_TYPE_10GBASE_CR1_CU ||\n+\t phy_types & I40E_CAP_PHY_TYPE_10GBASE_CR1 ||\n+\t phy_types & I40E_CAP_PHY_TYPE_1000BASE_T_OPTICAL ||\n+\t phy_types & I40E_CAP_PHY_TYPE_1000BASE_T ||\n+\t phy_types & I40E_CAP_PHY_TYPE_1000BASE_SX ||\n+\t phy_types & I40E_CAP_PHY_TYPE_1000BASE_LX ||\n+\t phy_types & I40E_CAP_PHY_TYPE_1000BASE_KX ||\n+\t phy_types & I40E_CAP_PHY_TYPE_100BASE_TX) {\n \t\t*supported |= SUPPORTED_Autoneg;\n \t\t*advertising |= ADVERTISED_Autoneg;\n \t}\n", "prefixes": [ "v3", "08/14", "net-next" ] }