Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1165382/?format=api
{ "id": 1165382, "url": "http://patchwork.ozlabs.org/api/patches/1165382/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190920091724.51767-3-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": "<20190920091724.51767-3-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-09-20T09:17:17", "name": "[next,S10,03/10] i40e: Wrong 'Advertised FEC modes' after set FEC to AUTO", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9c70fd671025b26edae02566787156af29aa9ef8", "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/20190920091724.51767-3-alice.michael@intel.com/mbox/", "series": [ { "id": 131821, "url": "http://patchwork.ozlabs.org/api/series/131821/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=131821", "date": "2019-09-20T09:17:15", "name": "[next,S10,01/10] i40e: Fix for persistent lldp support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/131821/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1165382/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1165382/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 46Zgw22VPHz9sN1\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 21 Sep 2019 03:40:02 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id BD84A862E4;\n\tFri, 20 Sep 2019 17:40:00 +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 JrAwo3Dtrs4G; Fri, 20 Sep 2019 17:40:00 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2590285852;\n\tFri, 20 Sep 2019 17:40:00 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 06F8F1BF2C6\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:55 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 03DF485764\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:55 +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 qW_6OBFaJex0 for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:52 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id AB501857C1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:52 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t20 Sep 2019 10:39:51 -0700", "from alicemic-1.jf.intel.com ([10.166.17.62])\n\tby fmsmga004.fm.intel.com with ESMTP; 20 Sep 2019 10:39:51 -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.64,529,1559545200\"; d=\"scan'208\";a=\"212635326\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 20 Sep 2019 02:17:17 -0700", "Message-Id": "<20190920091724.51767-3-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190920091724.51767-1-alice.michael@intel.com>", "References": "<20190920091724.51767-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S10 03/10] i40e: Wrong 'Advertised\n\tFEC modes' after set FEC to AUTO", "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": "Jaroslaw Gawin <jaroslawx.gawin@intel.com>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Jaroslaw Gawin <jaroslawx.gawin@intel.com>\n\nFix display of parameters \"Configured FEC encodings:\" and \"Advertised\nFEC modes:\" in ethtool. Implemented by setting proper FEC bits in\n“advertising” bitmask of link_modes struct and “fec” bitmask in\nethtool_fecparam struct. Without this patch wrong FEC settings\ncan be shown.\n\nSigned-off-by: Jaroslaw Gawin <jaroslawx.gawin@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_common.c | 13 ++++++--\n .../net/ethernet/intel/i40e/i40e_ethtool.c | 32 +++++++++----------\n 2 files changed, 26 insertions(+), 19 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c\nindex d37c6e0e5f08..f1d67267c983 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_common.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c\n@@ -2570,9 +2570,16 @@ noinline_for_stack i40e_status i40e_update_link_info(struct i40e_hw *hw)\n \t\tif (status)\n \t\t\treturn status;\n \n-\t\thw->phy.link_info.req_fec_info =\n-\t\t\tabilities.fec_cfg_curr_mod_ext_info &\n-\t\t\t(I40E_AQ_REQUEST_FEC_KR | I40E_AQ_REQUEST_FEC_RS);\n+\t\tif (abilities.fec_cfg_curr_mod_ext_info &\n+\t\t I40E_AQ_ENABLE_FEC_AUTO)\n+\t\t\thw->phy.link_info.req_fec_info =\n+\t\t\t\t(I40E_AQ_REQUEST_FEC_KR |\n+\t\t\t\t I40E_AQ_REQUEST_FEC_RS);\n+\t\telse\n+\t\t\thw->phy.link_info.req_fec_info =\n+\t\t\t\tabilities.fec_cfg_curr_mod_ext_info &\n+\t\t\t\t(I40E_AQ_REQUEST_FEC_KR |\n+\t\t\t\t I40E_AQ_REQUEST_FEC_RS);\n \n \t\tmemcpy(hw->phy.link_info.module_type, &abilities.module_type,\n \t\t sizeof(hw->phy.link_info.module_type));\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex c814c756b4bb..765bc5174ead 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -761,7 +761,14 @@ static void i40e_get_settings_link_up_fec(u8 req_fec_info,\n \tethtool_link_ksettings_add_link_mode(ks, supported, FEC_RS);\n \tethtool_link_ksettings_add_link_mode(ks, supported, FEC_BASER);\n \n-\tif (I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) {\n+\tif ((I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) &&\n+\t (I40E_AQ_SET_FEC_REQUEST_KR & req_fec_info)) {\n+\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n+\t\t\t\t\t\t FEC_NONE);\n+\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n+\t\t\t\t\t\t FEC_BASER);\n+\t\tethtool_link_ksettings_add_link_mode(ks, advertising, FEC_RS);\n+\t} else if (I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) {\n \t\tethtool_link_ksettings_add_link_mode(ks, advertising, FEC_RS);\n \t} else if (I40E_AQ_SET_FEC_REQUEST_KR & req_fec_info) {\n \t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n@@ -769,12 +776,6 @@ static void i40e_get_settings_link_up_fec(u8 req_fec_info,\n \t} else {\n \t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n \t\t\t\t\t\t FEC_NONE);\n-\t\tif (I40E_AQ_SET_FEC_AUTO & req_fec_info) {\n-\t\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n-\t\t\t\t\t\t\t FEC_RS);\n-\t\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n-\t\t\t\t\t\t\t FEC_BASER);\n-\t\t}\n \t}\n }\n \n@@ -1476,6 +1477,7 @@ static int i40e_get_fec_param(struct net_device *netdev,\n \tstruct i40e_hw *hw = &pf->hw;\n \ti40e_status status = 0;\n \tint err = 0;\n+\tu8 fec_cfg;\n \n \t/* Get the current phy config */\n \tmemset(&abilities, 0, sizeof(abilities));\n@@ -1487,18 +1489,16 @@ static int i40e_get_fec_param(struct net_device *netdev,\n \t}\n \n \tfecparam->fec = 0;\n-\tif (abilities.fec_cfg_curr_mod_ext_info & I40E_AQ_SET_FEC_AUTO)\n+\tfec_cfg = abilities.fec_cfg_curr_mod_ext_info;\n+\tif (fec_cfg & I40E_AQ_SET_FEC_AUTO)\n \t\tfecparam->fec |= ETHTOOL_FEC_AUTO;\n-\tif ((abilities.fec_cfg_curr_mod_ext_info &\n-\t I40E_AQ_SET_FEC_REQUEST_RS) ||\n-\t (abilities.fec_cfg_curr_mod_ext_info &\n-\t I40E_AQ_SET_FEC_ABILITY_RS))\n+\telse if (fec_cfg & (I40E_AQ_SET_FEC_REQUEST_RS |\n+\t\t I40E_AQ_SET_FEC_ABILITY_RS))\n \t\tfecparam->fec |= ETHTOOL_FEC_RS;\n-\tif ((abilities.fec_cfg_curr_mod_ext_info &\n-\t I40E_AQ_SET_FEC_REQUEST_KR) ||\n-\t (abilities.fec_cfg_curr_mod_ext_info & I40E_AQ_SET_FEC_ABILITY_KR))\n+\telse if (fec_cfg & (I40E_AQ_SET_FEC_REQUEST_KR |\n+\t\t I40E_AQ_SET_FEC_ABILITY_KR))\n \t\tfecparam->fec |= ETHTOOL_FEC_BASER;\n-\tif (abilities.fec_cfg_curr_mod_ext_info == 0)\n+\tif (fec_cfg == 0)\n \t\tfecparam->fec |= ETHTOOL_FEC_OFF;\n \n \tif (hw->phy.link_info.fec_info & I40E_AQ_CONFIG_FEC_KR_ENA)\n", "prefixes": [ "next", "S10", "03/10" ] }