Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1070220/?format=api
{ "id": 1070220, "url": "http://patchwork.ozlabs.org/api/patches/1070220/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190329220840.51187-9-alice.michael@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": "<20190329220840.51187-9-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-03-29T22:08:38", "name": "[next,S4,09/11] i40e: Add support for X710 B/P & SFP+ cards", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "318f50225bfa75760edab136feda01ed5e95ce8c", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20190329220840.51187-9-alice.michael@intel.com/mbox/", "series": [ { "id": 100029, "url": "http://patchwork.ozlabs.org/api/series/100029/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=100029", "date": "2019-03-29T22:08:31", "name": "[next,S4,01/11] i40e: VF's promiscuous attribute is not kept", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/100029/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1070220/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1070220/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.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 44WGCZ5mwWz9sPq\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 30 Mar 2019 09:11:06 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 76AB8861F2;\n\tFri, 29 Mar 2019 22:11:04 +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 GEJpwRk8dhvA; Fri, 29 Mar 2019 22:11:03 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id AEBAF861E3;\n\tFri, 29 Mar 2019 22:11:02 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 7008E1BF988\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Mar 2019 22:10:30 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6DC3A2EC4F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Mar 2019 22:10:30 +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 SUGKDPP7tHFz for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Mar 2019 22:10:28 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 9E85F2F989\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Mar 2019 22:10:27 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t29 Mar 2019 15:10:26 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby fmsmga001.fm.intel.com with ESMTP; 29 Mar 2019 15:10:26 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.60,286,1549958400\"; d=\"scan'208\";a=\"159698905\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 29 Mar 2019 15:08:38 -0700", "Message-Id": "<20190329220840.51187-9-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.19.2", "In-Reply-To": "<20190329220840.51187-1-alice.michael@intel.com>", "References": "<20190329220840.51187-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S4 09/11] i40e: Add support for X710\n\tB/P & SFP+ cards", "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\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>", "Cc": "Aleksandr Loktionov <aleksandr.loktionov@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": "From: Aleksandr Loktionov <aleksandr.loktionov@intel.com>\n\nNew device ids are created to support X710 backplane and SFP+ cards.\n\nThis patch adds in i40e driver support for 2.5GbaseT and 5GbaseT speed.\nIt's implemented by checking I40E_CAP_PHY_TYPE_2_5GBASE_T,\nI40E_CAP_PHY_TYPE_5GBASE_T bits from f/w and setting corresponding bits\nin ethtool link ksettings supported and advertising masks.\n\nSigned-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>\nSigned-off-by: Alice Michael <alice.michael@intel.com>\n---\n .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 12 +++++-\n drivers/net/ethernet/intel/i40e/i40e_common.c | 5 +++\n drivers/net/ethernet/intel/i40e/i40e_devids.h | 3 ++\n .../net/ethernet/intel/i40e/i40e_ethtool.c | 42 ++++++++++++++++++-\n drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++\n drivers/net/ethernet/intel/i40e/i40e_type.h | 6 +++\n 6 files changed, 74 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\nindex abcf79eb3261..6536023fa074 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h\n@@ -1888,6 +1888,8 @@ enum i40e_aq_phy_type {\n \tI40E_PHY_TYPE_25GBASE_LR\t\t= 0x22,\n \tI40E_PHY_TYPE_25GBASE_AOC\t\t= 0x23,\n \tI40E_PHY_TYPE_25GBASE_ACC\t\t= 0x24,\n+\tI40E_PHY_TYPE_2_5GBASE_T\t\t= 0x30,\n+\tI40E_PHY_TYPE_5GBASE_T\t\t\t= 0x31,\n \tI40E_PHY_TYPE_MAX,\n \tI40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP\t= 0xFD,\n \tI40E_PHY_TYPE_EMPTY\t\t\t= 0xFE,\n@@ -1929,19 +1931,25 @@ enum i40e_aq_phy_type {\n \t\t\t\tBIT_ULL(I40E_PHY_TYPE_25GBASE_SR) | \\\n \t\t\t\tBIT_ULL(I40E_PHY_TYPE_25GBASE_LR) | \\\n \t\t\t\tBIT_ULL(I40E_PHY_TYPE_25GBASE_AOC) | \\\n-\t\t\t\tBIT_ULL(I40E_PHY_TYPE_25GBASE_ACC))\n+\t\t\t\tBIT_ULL(I40E_PHY_TYPE_25GBASE_ACC) | \\\n+\t\t\t\tBIT_ULL(I40E_PHY_TYPE_2_5GBASE_T) | \\\n+\t\t\t\tBIT_ULL(I40E_PHY_TYPE_5GBASE_T))\n \n+#define I40E_LINK_SPEED_2_5GB_SHIFT\t0x0\n #define I40E_LINK_SPEED_100MB_SHIFT\t0x1\n #define I40E_LINK_SPEED_1000MB_SHIFT\t0x2\n #define I40E_LINK_SPEED_10GB_SHIFT\t0x3\n #define I40E_LINK_SPEED_40GB_SHIFT\t0x4\n #define I40E_LINK_SPEED_20GB_SHIFT\t0x5\n #define I40E_LINK_SPEED_25GB_SHIFT\t0x6\n+#define I40E_LINK_SPEED_5GB_SHIFT\t0x7\n \n enum i40e_aq_link_speed {\n \tI40E_LINK_SPEED_UNKNOWN\t= 0,\n \tI40E_LINK_SPEED_100MB\t= BIT(I40E_LINK_SPEED_100MB_SHIFT),\n \tI40E_LINK_SPEED_1GB\t= BIT(I40E_LINK_SPEED_1000MB_SHIFT),\n+\tI40E_LINK_SPEED_2_5GB\t= (1 << I40E_LINK_SPEED_2_5GB_SHIFT),\n+\tI40E_LINK_SPEED_5GB\t= (1 << I40E_LINK_SPEED_5GB_SHIFT),\n \tI40E_LINK_SPEED_10GB\t= BIT(I40E_LINK_SPEED_10GB_SHIFT),\n \tI40E_LINK_SPEED_40GB\t= BIT(I40E_LINK_SPEED_40GB_SHIFT),\n \tI40E_LINK_SPEED_20GB\t= BIT(I40E_LINK_SPEED_20GB_SHIFT),\n@@ -1987,6 +1995,8 @@ struct i40e_aq_get_phy_abilities_resp {\n #define I40E_AQ_PHY_TYPE_EXT_25G_LR\t0x08\n #define I40E_AQ_PHY_TYPE_EXT_25G_AOC\t0x10\n #define I40E_AQ_PHY_TYPE_EXT_25G_ACC\t0x20\n+#define I40E_AQ_PHY_TYPE_EXT_2_5GBASE_T\t0x40\n+#define I40E_AQ_PHY_TYPE_EXT_5GBASE_T\t0x80\n \tu8\tfec_cfg_curr_mod_ext_info;\n #define I40E_AQ_ENABLE_FEC_KR\t\t0x01\n #define I40E_AQ_ENABLE_FEC_RS\t\t0x02\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c\nindex 8de6e007b4a0..ecb1adaa54ec 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_common.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c\n@@ -28,6 +28,8 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw)\n \t\tcase I40E_DEV_ID_QSFP_C:\n \t\tcase I40E_DEV_ID_10G_BASE_T:\n \t\tcase I40E_DEV_ID_10G_BASE_T4:\n+\t\tcase I40E_DEV_ID_10G_B:\n+\t\tcase I40E_DEV_ID_10G_SFP:\n \t\tcase I40E_DEV_ID_20G_KR2:\n \t\tcase I40E_DEV_ID_20G_KR2_A:\n \t\tcase I40E_DEV_ID_25G_B:\n@@ -1151,6 +1153,8 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw)\n \t\tbreak;\n \tcase I40E_PHY_TYPE_100BASE_TX:\n \tcase I40E_PHY_TYPE_1000BASE_T:\n+\tcase I40E_PHY_TYPE_2_5GBASE_T:\n+\tcase I40E_PHY_TYPE_5GBASE_T:\n \tcase I40E_PHY_TYPE_10GBASE_T:\n \t\tmedia = I40E_MEDIA_TYPE_BASET;\n \t\tbreak;\n@@ -4900,6 +4904,7 @@ i40e_status i40e_read_phy_register(struct i40e_hw *hw,\n \t\tbreak;\n \tcase I40E_DEV_ID_10G_BASE_T:\n \tcase I40E_DEV_ID_10G_BASE_T4:\n+\tcase I40E_DEV_ID_10G_BASE_T_BC:\n \tcase I40E_DEV_ID_10G_BASE_T_X722:\n \tcase I40E_DEV_ID_25G_B:\n \tcase I40E_DEV_ID_25G_SFP28:\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_devids.h b/drivers/net/ethernet/intel/i40e/i40e_devids.h\nindex 16be4d5286bd..bac4da031f9b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_devids.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_devids.h\n@@ -20,6 +20,9 @@\n #define I40E_DEV_ID_10G_BASE_T4\t\t0x1589\n #define I40E_DEV_ID_25G_B\t\t0x158A\n #define I40E_DEV_ID_25G_SFP28\t\t0x158B\n+#define I40E_DEV_ID_10G_BASE_T_BC\t0x15FF\n+#define I40E_DEV_ID_10G_B\t\t0x104F\n+#define I40E_DEV_ID_10G_SFP\t\t0x104E\n #define I40E_DEV_ID_KX_X722\t\t0x37CE\n #define I40E_DEV_ID_QSFP_X722\t\t0x37CF\n #define I40E_DEV_ID_SFP_X722\t\t0x37D0\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 74c2f15cf42e..d5e7e3babc41 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -508,6 +508,20 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf,\n \t\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n \t\t\t\t\t\t\t 10000baseT_Full);\n \t}\n+\tif (phy_types & I40E_CAP_PHY_TYPE_2_5GBASE_T) {\n+\t\tethtool_link_ksettings_add_link_mode(ks, supported,\n+\t\t\t\t\t\t 2500baseT_Full);\n+\t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_2_5GB)\n+\t\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n+\t\t\t\t\t\t\t 2500baseT_Full);\n+\t}\n+\tif (phy_types & I40E_CAP_PHY_TYPE_5GBASE_T) {\n+\t\tethtool_link_ksettings_add_link_mode(ks, supported,\n+\t\t\t\t\t\t 5000baseT_Full);\n+\t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_5GB)\n+\t\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n+\t\t\t\t\t\t\t 5000baseT_Full);\n+\t}\n \tif (phy_types & I40E_CAP_PHY_TYPE_XLAUI ||\n \t phy_types & I40E_CAP_PHY_TYPE_XLPPI ||\n \t phy_types & I40E_CAP_PHY_TYPE_40GBASE_AOC)\n@@ -674,13 +688,15 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf,\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_10GBASE_T ||\n+\t phy_types & I40E_CAP_PHY_TYPE_5GBASE_T ||\n+\t phy_types & I40E_CAP_PHY_TYPE_2_5GBASE_T ||\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@@ -790,11 +806,17 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,\n \t\t\t\t\t\t\t 10000baseT_Full);\n \t\tbreak;\n \tcase I40E_PHY_TYPE_10GBASE_T:\n+\tcase I40E_PHY_TYPE_5GBASE_T:\n+\tcase I40E_PHY_TYPE_2_5GBASE_T:\n \tcase I40E_PHY_TYPE_1000BASE_T:\n \tcase I40E_PHY_TYPE_100BASE_TX:\n \t\tethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);\n \t\tethtool_link_ksettings_add_link_mode(ks, supported,\n \t\t\t\t\t\t 10000baseT_Full);\n+\t\tethtool_link_ksettings_add_link_mode(ks, supported,\n+\t\t\t\t\t\t 5000baseT_Full);\n+\t\tethtool_link_ksettings_add_link_mode(ks, supported,\n+\t\t\t\t\t\t 2500baseT_Full);\n \t\tethtool_link_ksettings_add_link_mode(ks, supported,\n \t\t\t\t\t\t 1000baseT_Full);\n \t\tethtool_link_ksettings_add_link_mode(ks, supported,\n@@ -803,6 +825,12 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)\n \t\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n \t\t\t\t\t\t\t 10000baseT_Full);\n+\t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_5GB)\n+\t\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n+\t\t\t\t\t\t\t 5000baseT_Full);\n+\t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_2_5GB)\n+\t\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n+\t\t\t\t\t\t\t 2500baseT_Full);\n \t\tif (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)\n \t\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n \t\t\t\t\t\t\t 1000baseT_Full);\n@@ -958,6 +986,12 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,\n \tcase I40E_LINK_SPEED_10GB:\n \t\tks->base.speed = SPEED_10000;\n \t\tbreak;\n+\tcase I40E_LINK_SPEED_5GB:\n+\t\tks->base.speed = SPEED_5000;\n+\t\tbreak;\n+\tcase I40E_LINK_SPEED_2_5GB:\n+\t\tks->base.speed = SPEED_2500;\n+\t\tbreak;\n \tcase I40E_LINK_SPEED_1GB:\n \t\tks->base.speed = SPEED_1000;\n \t\tbreak;\n@@ -1243,6 +1277,12 @@ static int i40e_set_link_ksettings(struct net_device *netdev,\n \t ethtool_link_ksettings_test_link_mode(ks, advertising,\n \t\t\t\t\t\t 10000baseLR_Full))\n \t\tconfig.link_speed |= I40E_LINK_SPEED_10GB;\n+\tif (ethtool_link_ksettings_test_link_mode(ks, advertising,\n+\t\t\t\t\t\t 2500baseT_Full))\n+\t\tconfig.link_speed |= I40E_LINK_SPEED_2_5GB;\n+\tif (ethtool_link_ksettings_test_link_mode(ks, advertising,\n+\t\t\t\t\t\t 5000baseT_Full))\n+\t\tconfig.link_speed |= I40E_LINK_SPEED_5GB;\n \tif (ethtool_link_ksettings_test_link_mode(ks, advertising,\n \t\t\t\t\t\t 20000baseKR2_Full))\n \t\tconfig.link_speed |= I40E_LINK_SPEED_20GB;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex a3b225502f23..21bc910dc99c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -69,6 +69,8 @@ static const struct pci_device_id i40e_pci_tbl[] = {\n \t{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0},\n \t{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T), 0},\n \t{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T4), 0},\n+\t{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_SFP), 0},\n+\t{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_B), 0},\n \t{PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_X722), 0},\n \t{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_X722), 0},\n \t{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722), 0},\n@@ -6516,6 +6518,12 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)\n \tcase I40E_LINK_SPEED_10GB:\n \t\tspeed = \"10 G\";\n \t\tbreak;\n+\tcase I40E_LINK_SPEED_5GB:\n+\t\tspeed = \"5 G\";\n+\t\tbreak;\n+\tcase I40E_LINK_SPEED_2_5GB:\n+\t\tspeed = \"2.5 G\";\n+\t\tbreak;\n \tcase I40E_LINK_SPEED_1GB:\n \t\tspeed = \"1000 M\";\n \t\tbreak;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex 820af0043cc8..8f43aa47c263 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -252,6 +252,12 @@ struct i40e_phy_info {\n \t\t\t\t\t I40E_PHY_TYPE_OFFSET)\n #define I40E_CAP_PHY_TYPE_25GBASE_ACC BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC + \\\n \t\t\t\t\t I40E_PHY_TYPE_OFFSET)\n+/* Offset for 2.5G/5G PHY Types value to bit number conversion */\n+#define I40E_PHY_TYPE_OFFSET2 (-10)\n+#define I40E_CAP_PHY_TYPE_2_5GBASE_T BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T + \\\n+\t\t\t\t\t I40E_PHY_TYPE_OFFSET2)\n+#define I40E_CAP_PHY_TYPE_5GBASE_T BIT_ULL(I40E_PHY_TYPE_5GBASE_T + \\\n+\t\t\t\t\t I40E_PHY_TYPE_OFFSET2)\n #define I40E_HW_CAP_MAX_GPIO\t\t\t30\n /* Capabilities of a PF or a VF or the whole device */\n struct i40e_hw_capabilities {\n", "prefixes": [ "next", "S4", "09/11" ] }