i40e: 25G FEC status improvements

This patch improves the system log message. The log message will
be expanded to include the FEC mode the FW requested before link
was established.

Signed-off-by: Mariusz Stachura <mariusz.stachura@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 26785018
(cherry picked from commit 68e49702a1216bbf098ebfff954eeb8f6fd96415)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Kyle Fortin <kyle.fortin@oracle.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index a0bcd377039ac5dde8038de69b4c247e74eef0dc..82bdbd6993967385b037672b5a3cd7d05f34bb79 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -5332,6 +5332,7 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
        char *speed = "Unknown";
        char *fc = "Unknown";
        char *fec = "";
+       char *req_fec = "";
        char *an = "";
 
        new_speed = vsi->back->hw.phy.link_info.link_speed;
@@ -5393,6 +5394,7 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
        }
 
        if (vsi->back->hw.phy.link_info.link_speed == I40E_LINK_SPEED_25GB) {
+               req_fec = ", Requested FEC: None";
                fec = ", FEC: None";
                an = ", Autoneg: False";
 
@@ -5405,10 +5407,22 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
                else if (vsi->back->hw.phy.link_info.fec_info &
                         I40E_AQ_CONFIG_FEC_RS_ENA)
                        fec = ", FEC: CL108 RS-FEC";
+
+               /* 'CL108 RS-FEC' should be displayed when RS is requested, or
+                * both RS and FC are requested
+                */
+               if (vsi->back->hw.phy.link_info.req_fec_info &
+                   (I40E_AQ_REQUEST_FEC_KR | I40E_AQ_REQUEST_FEC_RS)) {
+                       if (vsi->back->hw.phy.link_info.req_fec_info &
+                           I40E_AQ_REQUEST_FEC_RS)
+                               req_fec = ", Requested FEC: CL108 RS-FEC";
+                       else
+                               req_fec = ", Requested FEC: CL74 FC-FEC/BASE-R";
+               }
        }
 
-       netdev_info(vsi->netdev, "NIC Link is Up, %sbps Full Duplex%s%s, Flow Control: %s\n",
-                   speed, fec, an, fc);
+       netdev_info(vsi->netdev, "NIC Link is Up, %sbps Full Duplex%s%s%s, Flow Control: %s\n",
+                   speed, req_fec, fec, an, fc);
 }
 
 /**