Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1317381/?format=api
{ "id": 1317381, "url": "http://patchwork.ozlabs.org/api/patches/1317381/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200626050228.1287009-1-jeffrey.t.kirsher@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": "<20200626050228.1287009-1-jeffrey.t.kirsher@intel.com>", "list_archive_url": null, "date": "2020-06-26T05:02:28", "name": "[next-queue] ixgbe: Add ethtool support to enable 2.5 and 5.0 Gbps support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "6df4bb89fb7d082a6c62e2d3d9a235c372918a9b", "submitter": { "id": 473, "url": "http://patchwork.ozlabs.org/api/people/473/?format=api", "name": "Kirsher, Jeffrey T", "email": "jeffrey.t.kirsher@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/20200626050228.1287009-1-jeffrey.t.kirsher@intel.com/mbox/", "series": [ { "id": 185915, "url": "http://patchwork.ozlabs.org/api/series/185915/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=185915", "date": "2020-06-26T05:02:28", "name": "[next-queue] ixgbe: Add ethtool support to enable 2.5 and 5.0 Gbps support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/185915/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1317381/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1317381/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 spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.136; helo=silver.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49tPs01fy9z9sSn\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 26 Jun 2020 15:02:42 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id C2AD82042D;\n\tFri, 26 Jun 2020 05:02:39 +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 aIYf7KvK7WQP; Fri, 26 Jun 2020 05:02:36 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id B03EC2039E;\n\tFri, 26 Jun 2020 05:02:35 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n by ash.osuosl.org (Postfix) with ESMTP id B13F41BF5A9\n for <intel-wired-lan@lists.osuosl.org>; Fri, 26 Jun 2020 05:02:33 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by hemlock.osuosl.org (Postfix) with ESMTP id AC77C8567A\n for <intel-wired-lan@lists.osuosl.org>; Fri, 26 Jun 2020 05:02:33 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id ybxk6rkPirII for <intel-wired-lan@lists.osuosl.org>;\n Fri, 26 Jun 2020 05:02:32 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by hemlock.osuosl.org (Postfix) with ESMTPS id 938AD855F7\n for <intel-wired-lan@lists.osuosl.org>; Fri, 26 Jun 2020 05:02:32 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 25 Jun 2020 22:02:31 -0700", "from jtkirshe-desk1.jf.intel.com ([134.134.177.86])\n by orsmga006.jf.intel.com with ESMTP; 25 Jun 2020 22:02:31 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n +s69QTKO9e1qD/FKc42+GDtT8UHXHLWoBtOm94kTNZIFoCvrIv1V5MjkcvzSD5NGYqU8T4BcK+\n r4F50LjVdSPQ==", "\n rX0B9N+mrnclwJJvJgyIs9l1A4QnqT/wOefc5oltasUQqMUF+eEpmUp+4wlNj1eABQUNrwkLh3\n 710z/Y1r8B6Q==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9663\"; a=\"144285968\"", "E=Sophos;i=\"5.75,282,1589266800\"; d=\"scan'208\";a=\"144285968\"", "E=Sophos;i=\"5.75,282,1589266800\"; d=\"scan'208\";a=\"280046808\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 25 Jun 2020 22:02:28 -0700", "Message-Id": "<20200626050228.1287009-1-jeffrey.t.kirsher@intel.com>", "X-Mailer": "git-send-email 2.26.2", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next-queue] ixgbe: Add ethtool support to enable\n 2.5 and 5.0 Gbps support", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <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 <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "Aleksandr Loktionov <aleksandr.loktionov@intel.com>,\n Arthur F Mclean <arthur.f.mclean@intel.com>", "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": "Update the ixgbe ethtool interface to support 2.5 and 5 GbE support by\nupdated the getting and setting advertised and supported speed modes.\n\nCC: Arthur F Mclean <arthur.f.mclean@intel.com>\nCC: Aleksandr Loktionov <aleksandr.loktionov@intel.com>\nSigned-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>\n---\n .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 234 ++++++++++++------\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +\n 2 files changed, 155 insertions(+), 81 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c\nindex 8ae2c8c2f6a1..c4e4aa33c91d 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c\n@@ -149,28 +149,6 @@ static const char ixgbe_priv_flags_strings[][ETH_GSTRING_LEN] = {\n \n #define ixgbe_isbackplane(type) ((type) == ixgbe_media_type_backplane)\n \n-static u32 ixgbe_get_supported_10gtypes(struct ixgbe_hw *hw)\n-{\n-\tif (!ixgbe_isbackplane(hw->phy.media_type))\n-\t\treturn SUPPORTED_10000baseT_Full;\n-\n-\tswitch (hw->device_id) {\n-\tcase IXGBE_DEV_ID_82598:\n-\tcase IXGBE_DEV_ID_82599_KX4:\n-\tcase IXGBE_DEV_ID_82599_KX4_MEZZ:\n-\tcase IXGBE_DEV_ID_X550EM_X_KX4:\n-\t\treturn SUPPORTED_10000baseKX4_Full;\n-\tcase IXGBE_DEV_ID_82598_BX:\n-\tcase IXGBE_DEV_ID_82599_KR:\n-\tcase IXGBE_DEV_ID_X550EM_X_KR:\n-\tcase IXGBE_DEV_ID_X550EM_X_XFI:\n-\t\treturn SUPPORTED_10000baseKR_Full;\n-\tdefault:\n-\t\treturn SUPPORTED_10000baseKX4_Full |\n-\t\t SUPPORTED_10000baseKR_Full;\n-\t}\n-}\n-\n static int ixgbe_get_link_ksettings(struct net_device *netdev,\n \t\t\t\t struct ethtool_link_ksettings *cmd)\n {\n@@ -178,55 +156,131 @@ static int ixgbe_get_link_ksettings(struct net_device *netdev,\n \tstruct ixgbe_hw *hw = &adapter->hw;\n \tixgbe_link_speed supported_link;\n \tbool autoneg = false;\n-\tu32 supported, advertising;\n \n-\tethtool_convert_link_mode_to_legacy_u32(&supported,\n-\t\t\t\t\t\tcmd->link_modes.supported);\n+\tethtool_link_ksettings_zero_link_mode(cmd, supported);\n+\tethtool_link_ksettings_zero_link_mode(cmd, advertising);\n \n \thw->mac.ops.get_link_capabilities(hw, &supported_link, &autoneg);\n-\n \t/* set the supported link speeds */\n-\tif (supported_link & IXGBE_LINK_SPEED_10GB_FULL)\n-\t\tsupported |= ixgbe_get_supported_10gtypes(hw);\n-\tif (supported_link & IXGBE_LINK_SPEED_1GB_FULL)\n-\t\tsupported |= (ixgbe_isbackplane(hw->phy.media_type)) ?\n-\t\t\t\t SUPPORTED_1000baseKX_Full :\n-\t\t\t\t SUPPORTED_1000baseT_Full;\n-\tif (supported_link & IXGBE_LINK_SPEED_100_FULL)\n-\t\tsupported |= SUPPORTED_100baseT_Full;\n-\tif (supported_link & IXGBE_LINK_SPEED_10_FULL)\n-\t\tsupported |= SUPPORTED_10baseT_Full;\n-\n-\t/* default advertised speed if phy.autoneg_advertised isn't set */\n-\tadvertising = supported;\n+\tif (supported_link & IXGBE_LINK_SPEED_10GB_FULL) {\n+\t\tif (ixgbe_isbackplane(hw->phy.media_type)) {\n+\t\t\tswitch (hw->device_id) {\n+\t\t\tcase IXGBE_DEV_ID_82598:\n+\t\t\tcase IXGBE_DEV_ID_82599_KX4:\n+\t\t\tcase IXGBE_DEV_ID_82599_KX4_MEZZ:\n+\t\t\tcase IXGBE_DEV_ID_X550EM_X_KX4:\n+\t\t\t\tethtool_link_ksettings_add_link_mode\n+\t\t\t\t\t(cmd, supported, 10000baseKX4_Full);\n+\t\t\t\tethtool_link_ksettings_add_link_mode\n+\t\t\t\t\t(cmd, advertising, 10000baseKX4_Full);\n+\t\t\t\tbreak;\n+\t\t\tcase IXGBE_DEV_ID_82598_BX:\n+\t\t\tcase IXGBE_DEV_ID_82599_KR:\n+\t\t\tcase IXGBE_DEV_ID_X550EM_X_KR:\n+\t\t\tcase IXGBE_DEV_ID_X550EM_X_XFI:\n+\t\t\t\tethtool_link_ksettings_add_link_mode\n+\t\t\t\t\t(cmd, supported, 10000baseKR_Full);\n+\t\t\t\tethtool_link_ksettings_add_link_mode\n+\t\t\t\t\t(cmd, advertising, 10000baseKR_Full);\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tethtool_link_ksettings_add_link_mode\n+\t\t\t\t\t(cmd, supported, 10000baseKX4_Full);\n+\t\t\t\tethtool_link_ksettings_add_link_mode\n+\t\t\t\t\t(cmd, advertising, 10000baseKX4_Full);\n+\t\t\t\tethtool_link_ksettings_add_link_mode\n+\t\t\t\t\t(cmd, supported, 10000baseKR_Full);\n+\t\t\t\tethtool_link_ksettings_add_link_mode\n+\t\t\t\t\t(cmd, advertising, 10000baseKR_Full);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t} else {\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t\t 10000baseT_Full);\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 10000baseT_Full);\n+\t\t}\n+\t}\n+\tif (supported_link & IXGBE_LINK_SPEED_5GB_FULL)\n+\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t 5000baseT_Full);\n+\tif (supported_link & IXGBE_LINK_SPEED_2_5GB_FULL)\n+\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t 2500baseT_Full);\n+\tif (supported_link & IXGBE_LINK_SPEED_1GB_FULL) {\n+\t\tif (ixgbe_isbackplane(hw->phy.media_type)) {\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t\t 1000baseKX_Full);\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 1000baseKX_Full);\n+\t\t} else {\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t\t 1000baseT_Full);\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 1000baseT_Full);\n+\t\t}\n+\t}\n+\tif (supported_link & IXGBE_LINK_SPEED_100_FULL) {\n+\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t 100baseT_Full);\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t 100baseT_Full);\n+\t}\n+\tif (supported_link & IXGBE_LINK_SPEED_10_FULL) {\n+\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t 10baseT_Full);\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t 10baseT_Full);\n+\t}\n+\n \t/* set the advertised speeds */\n \tif (hw->phy.autoneg_advertised) {\n-\t\tadvertising = 0;\n+\t\tethtool_link_ksettings_zero_link_mode(cmd, advertising);\n \t\tif (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10_FULL)\n-\t\t\tadvertising |= ADVERTISED_10baseT_Full;\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 10baseT_Full);\n \t\tif (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)\n-\t\t\tadvertising |= ADVERTISED_100baseT_Full;\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 100baseT_Full);\n \t\tif (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)\n-\t\t\tadvertising |= supported & ADVRTSD_MSK_10G;\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 10000baseT_Full);\n \t\tif (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL) {\n-\t\t\tif (supported & SUPPORTED_1000baseKX_Full)\n-\t\t\t\tadvertising |= ADVERTISED_1000baseKX_Full;\n+\t\t\tif (ethtool_link_ksettings_test_link_mode(cmd,\n+\t\t\t\t\t\t\t supported,\n+\t\t\t\t\t\t\t 1000baseKX_Full))\n+\t\t\t\tethtool_link_ksettings_add_link_mode(cmd,\n+\t\t\t\t\t\t\t advertising,\n+\t\t\t\t\t\t\t 1000baseKX_Full);\n \t\t\telse\n-\t\t\t\tadvertising |= ADVERTISED_1000baseT_Full;\n+\t\t\t\tethtool_link_ksettings_add_link_mode(cmd,\n+\t\t\t\t\t\t\t advertising,\n+\t\t\t\t\t\t\t 1000baseT_Full);\n+\t\t}\n+\t\tif (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_5GB_FULL) {\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 5000baseT_Full);\n+\t\t}\n+\t\tif (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_2_5GB_FULL) {\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 2500baseT_Full);\n \t\t}\n \t} else {\n \t\tif (hw->phy.multispeed_fiber && !autoneg) {\n \t\t\tif (supported_link & IXGBE_LINK_SPEED_10GB_FULL)\n-\t\t\t\tadvertising = ADVERTISED_10000baseT_Full;\n+\t\t\t\tethtool_link_ksettings_add_link_mode(cmd,\n+\t\t\t\t\t\t\t advertising,\n+\t\t\t\t\t\t\t 10000baseT_Full);\n \t\t}\n \t}\n \n \tif (autoneg) {\n-\t\tsupported |= SUPPORTED_Autoneg;\n-\t\tadvertising |= ADVERTISED_Autoneg;\n+\t\tethtool_link_ksettings_add_link_mode(cmd, supported, Autoneg);\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg);\n \t\tcmd->base.autoneg = AUTONEG_ENABLE;\n-\t} else\n+\t} else {\n \t\tcmd->base.autoneg = AUTONEG_DISABLE;\n+\t}\n \n \t/* Determine the remaining settings based on the PHY type. */\n \tswitch (adapter->hw.phy.type) {\n@@ -235,13 +289,13 @@ static int ixgbe_get_link_ksettings(struct net_device *netdev,\n \tcase ixgbe_phy_x550em_ext_t:\n \tcase ixgbe_phy_fw:\n \tcase ixgbe_phy_cu_unknown:\n-\t\tsupported |= SUPPORTED_TP;\n-\t\tadvertising |= ADVERTISED_TP;\n+\t\tethtool_link_ksettings_add_link_mode(cmd, supported, TP);\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, TP);\n \t\tcmd->base.port = PORT_TP;\n \t\tbreak;\n \tcase ixgbe_phy_qt:\n-\t\tsupported |= SUPPORTED_FIBRE;\n-\t\tadvertising |= ADVERTISED_FIBRE;\n+\t\tethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE);\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);\n \t\tcmd->base.port = PORT_FIBRE;\n \t\tbreak;\n \tcase ixgbe_phy_nl:\n@@ -255,13 +309,15 @@ static int ixgbe_get_link_ksettings(struct net_device *netdev,\n \tcase ixgbe_phy_qsfp_active_unknown:\n \tcase ixgbe_phy_qsfp_intel:\n \tcase ixgbe_phy_qsfp_unknown:\n-\t\t/* SFP+ devices, further checking needed */\n \t\tswitch (adapter->hw.phy.sfp_type) {\n+\t\t/* SFP+ devices, further checking needed */\n \t\tcase ixgbe_sfp_type_da_cu:\n \t\tcase ixgbe_sfp_type_da_cu_core0:\n \t\tcase ixgbe_sfp_type_da_cu_core1:\n-\t\t\tsupported |= SUPPORTED_FIBRE;\n-\t\t\tadvertising |= ADVERTISED_FIBRE;\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t\t FIBRE);\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t FIBRE);\n \t\t\tcmd->base.port = PORT_DA;\n \t\t\tbreak;\n \t\tcase ixgbe_sfp_type_sr:\n@@ -272,61 +328,72 @@ static int ixgbe_get_link_ksettings(struct net_device *netdev,\n \t\tcase ixgbe_sfp_type_1g_sx_core1:\n \t\tcase ixgbe_sfp_type_1g_lx_core0:\n \t\tcase ixgbe_sfp_type_1g_lx_core1:\n-\t\t\tsupported |= SUPPORTED_FIBRE;\n-\t\t\tadvertising |= ADVERTISED_FIBRE;\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t\t FIBRE);\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t FIBRE);\n \t\t\tcmd->base.port = PORT_FIBRE;\n \t\t\tbreak;\n \t\tcase ixgbe_sfp_type_not_present:\n-\t\t\tsupported |= SUPPORTED_FIBRE;\n-\t\t\tadvertising |= ADVERTISED_FIBRE;\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t\t FIBRE);\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t FIBRE);\n \t\t\tcmd->base.port = PORT_NONE;\n \t\t\tbreak;\n \t\tcase ixgbe_sfp_type_1g_cu_core0:\n \t\tcase ixgbe_sfp_type_1g_cu_core1:\n-\t\t\tsupported |= SUPPORTED_TP;\n-\t\t\tadvertising |= ADVERTISED_TP;\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t\t TP);\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t TP);\n \t\t\tcmd->base.port = PORT_TP;\n \t\t\tbreak;\n \t\tcase ixgbe_sfp_type_unknown:\n \t\tdefault:\n-\t\t\tsupported |= SUPPORTED_FIBRE;\n-\t\t\tadvertising |= ADVERTISED_FIBRE;\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, supported,\n+\t\t\t\t\t\t\t FIBRE);\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t FIBRE);\n \t\t\tcmd->base.port = PORT_OTHER;\n \t\t\tbreak;\n \t\t}\n \t\tbreak;\n \tcase ixgbe_phy_xaui:\n-\t\tsupported |= SUPPORTED_FIBRE;\n-\t\tadvertising |= ADVERTISED_FIBRE;\n+\t\tethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE);\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);\n \t\tcmd->base.port = PORT_NONE;\n \t\tbreak;\n \tcase ixgbe_phy_unknown:\n \tcase ixgbe_phy_generic:\n \tcase ixgbe_phy_sfp_unsupported:\n \tdefault:\n-\t\tsupported |= SUPPORTED_FIBRE;\n-\t\tadvertising |= ADVERTISED_FIBRE;\n+\t\tethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE);\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);\n \t\tcmd->base.port = PORT_OTHER;\n \t\tbreak;\n \t}\n \n \t/* Indicate pause support */\n-\tsupported |= SUPPORTED_Pause;\n+\tethtool_link_ksettings_add_link_mode(cmd, supported, Pause);\n \n \tswitch (hw->fc.requested_mode) {\n \tcase ixgbe_fc_full:\n-\t\tadvertising |= ADVERTISED_Pause;\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);\n \t\tbreak;\n \tcase ixgbe_fc_rx_pause:\n-\t\tadvertising |= ADVERTISED_Pause |\n-\t\t\t\t ADVERTISED_Asym_Pause;\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t Asym_Pause);\n \t\tbreak;\n \tcase ixgbe_fc_tx_pause:\n-\t\tadvertising |= ADVERTISED_Asym_Pause;\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t Asym_Pause);\n \t\tbreak;\n \tdefault:\n-\t\tadvertising &= ~(ADVERTISED_Pause |\n-\t\t\t\t ADVERTISED_Asym_Pause);\n+\t\tethtool_link_ksettings_del_link_mode(cmd, advertising, Pause);\n+\t\tethtool_link_ksettings_del_link_mode(cmd, advertising,\n+\t\t\t\t\t\t Asym_Pause);\n \t}\n \n \tif (netif_carrier_ok(netdev)) {\n@@ -358,11 +425,6 @@ static int ixgbe_get_link_ksettings(struct net_device *netdev,\n \t\tcmd->base.duplex = DUPLEX_UNKNOWN;\n \t}\n \n-\tethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,\n-\t\t\t\t\t\tsupported);\n-\tethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.advertising,\n-\t\t\t\t\t\tadvertising);\n-\n \treturn 0;\n }\n \n@@ -402,6 +464,16 @@ static int ixgbe_set_link_ksettings(struct net_device *netdev,\n \t\tif (advertising & ADVERTISED_10000baseT_Full)\n \t\t\tadvertised |= IXGBE_LINK_SPEED_10GB_FULL;\n \n+\t\tif (ethtool_link_ksettings_test_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 5000baseT_Full))\n+\t\t\tadvertised |= IXGBE_LINK_SPEED_5GB_FULL;\n+\n+\t\tif (ethtool_link_ksettings_test_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 2500baseT_Full))\n+\t\t\tadvertised |= IXGBE_LINK_SPEED_2_5GB_FULL;\n+\n+\t\tif (ethtool_link_ksettings_test_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 1000baseT_Full))\n \t\tif (advertising & ADVERTISED_1000baseT_Full)\n \t\t\tadvertised |= IXGBE_LINK_SPEED_1GB_FULL;\n \ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 7515ed825fe2..0c7d208d9ab0 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -5512,6 +5512,8 @@ static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw)\n \tif (ret)\n \t\treturn ret;\n \n+\tspeed &= ~(IXGBE_LINK_SPEED_5GB_FULL | IXGBE_LINK_SPEED_2_5GB_FULL);\n+\n \tif (hw->mac.ops.setup_link)\n \t\tret = hw->mac.ops.setup_link(hw, speed, link_up);\n \n", "prefixes": [ "next-queue" ] }