{"id":806314,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806314/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20170828001603.75876-9-jeffrey.t.kirsher@intel.com>","date":"2017-08-28T00:15:56","name":"[net-next,08/15] i40e: 25G FEC status improvements","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"43123dffd5c8f3c9aff160572965e1fd08482ca6","submitter":{"id":473,"url":"http://patchwork.ozlabs.org/api/1.0/people/473/?format=json","name":"Kirsher, Jeffrey T","email":"jeffrey.t.kirsher@intel.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170828001603.75876-9-jeffrey.t.kirsher@intel.com/mbox/","series":[{"id":52,"url":"http://patchwork.ozlabs.org/api/1.0/series/52/?format=json","date":"2017-08-28T00:15:49","name":"40GbE Intel Wired LAN Driver Updates 2017-08-27","version":1,"mbox":"http://patchwork.ozlabs.org/series/52/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806314/checks/","tags":{},"headers":{"Return-Path":"<netdev-owner@vger.kernel.org>","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xgXPZ4fxGz9s82\n\tfor <patchwork-incoming@ozlabs.org>;\n\tMon, 28 Aug 2017 10:16:34 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751719AbdH1AQW (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tSun, 27 Aug 2017 20:16:22 -0400","from mga14.intel.com ([192.55.52.115]:39313 \"EHLO mga14.intel.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751674AbdH1AQT (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tSun, 27 Aug 2017 20:16:19 -0400","from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t27 Aug 2017 17:16:19 -0700","from davidpwo-mobl1.amr.corp.intel.com (HELO\n\tjtkirshe-DESK.amr.corp.intel.com.com) ([10.254.22.134])\n\tby fmsmga004.fm.intel.com with ESMTP; 27 Aug 2017 17:16:19 -0700"],"X-ExtLoop1":"1","X-IronPort-AV":"E=Sophos;i=\"5.41,439,1498546800\"; d=\"scan'208\";a=\"304981080\"","From":"Jeff Kirsher <jeffrey.t.kirsher@intel.com>","To":"davem@davemloft.net","Cc":"Mariusz Stachura <mariusz.stachura@intel.com>,\n\tnetdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,\n\tjogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>","Subject":"[net-next 08/15] i40e: 25G FEC status improvements","Date":"Sun, 27 Aug 2017 17:15:56 -0700","Message-Id":"<20170828001603.75876-9-jeffrey.t.kirsher@intel.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170828001603.75876-1-jeffrey.t.kirsher@intel.com>","References":"<20170828001603.75876-1-jeffrey.t.kirsher@intel.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"<netdev.vger.kernel.org>","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Mariusz Stachura <mariusz.stachura@intel.com>\n\nThis patch improves the system log message. The log message will\nbe expanded to include the FEC mode the FW requested before link\nwas established.\n\nSigned-off-by: Mariusz Stachura <mariusz.stachura@intel.com>\nTested-by: Andrew Bowers <andrewx.bowers@intel.com>\nSigned-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 18 ++++++++++++++++--\n 1 file changed, 16 insertions(+), 2 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 3a6a752c6c58..5a06cd23b9e6 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -5354,6 +5354,7 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)\n \tchar *speed = \"Unknown\";\n \tchar *fc = \"Unknown\";\n \tchar *fec = \"\";\n+\tchar *req_fec = \"\";\n \tchar *an = \"\";\n \n \tnew_speed = vsi->back->hw.phy.link_info.link_speed;\n@@ -5415,6 +5416,7 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)\n \t}\n \n \tif (vsi->back->hw.phy.link_info.link_speed == I40E_LINK_SPEED_25GB) {\n+\t\treq_fec = \", Requested FEC: None\";\n \t\tfec = \", FEC: None\";\n \t\tan = \", Autoneg: False\";\n \n@@ -5427,10 +5429,22 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)\n \t\telse if (vsi->back->hw.phy.link_info.fec_info &\n \t\t\t I40E_AQ_CONFIG_FEC_RS_ENA)\n \t\t\tfec = \", FEC: CL108 RS-FEC\";\n+\n+\t\t/* 'CL108 RS-FEC' should be displayed when RS is requested, or\n+\t\t * both RS and FC are requested\n+\t\t */\n+\t\tif (vsi->back->hw.phy.link_info.req_fec_info &\n+\t\t    (I40E_AQ_REQUEST_FEC_KR | I40E_AQ_REQUEST_FEC_RS)) {\n+\t\t\tif (vsi->back->hw.phy.link_info.req_fec_info &\n+\t\t\t    I40E_AQ_REQUEST_FEC_RS)\n+\t\t\t\treq_fec = \", Requested FEC: CL108 RS-FEC\";\n+\t\t\telse\n+\t\t\t\treq_fec = \", Requested FEC: CL74 FC-FEC/BASE-R\";\n+\t\t}\n \t}\n \n-\tnetdev_info(vsi->netdev, \"NIC Link is Up, %sbps Full Duplex%s%s, Flow Control: %s\\n\",\n-\t\t    speed, fec, an, fc);\n+\tnetdev_info(vsi->netdev, \"NIC Link is Up, %sbps Full Duplex%s%s%s, Flow Control: %s\\n\",\n+\t\t    speed, req_fec, fec, an, fc);\n }\n \n /**\n","prefixes":["net-next","08/15"]}