fbnic: Update FW link mode values to represent actual link modes

Make it so that the enum we use for the FW values represents actual link
modes that will be normally advertised by a link partner.

Signed-off-by: Alexander Duyck <alexanderduyck@fb.com>
Link: https://patch.msgid.link/175028446893.625704.10103673858068429312.stgit@ahduyck-xeon-server.home.arpa
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.h b/drivers/net/ethernet/meta/fbnic/fbnic_fw.h
index 08bc4b918de75ddf5f3b29b30f8c8331d2e252e1..08bf87c5ddf668516d0dd8432cc08e0dcda33928 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.h
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.h
@@ -155,10 +155,10 @@ enum {
 };
 
 enum {
-       FBNIC_FW_LINK_SPEED_25R1                = 1,
-       FBNIC_FW_LINK_SPEED_50R2                = 2,
-       FBNIC_FW_LINK_SPEED_50R1                = 3,
-       FBNIC_FW_LINK_SPEED_100R2               = 4,
+       FBNIC_FW_LINK_MODE_25CR                 = 1,
+       FBNIC_FW_LINK_MODE_50CR2                = 2,
+       FBNIC_FW_LINK_MODE_50CR                 = 3,
+       FBNIC_FW_LINK_MODE_100CR2               = 4,
 };
 
 enum {

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_mac.c b/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
index 0528724011c1533c734c512bf4af6b43c0be94c3..284fcfbedb74fb12b9e36b4db6847b84d651ac01 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
@@ -544,17 +544,17 @@ static void fbnic_mac_get_fw_settings(struct fbnic_dev *fbd, u8 *aui, u8 *fec)
 {
        /* Retrieve default speed from FW */
        switch (fbd->fw_cap.link_speed) {
-       case FBNIC_FW_LINK_SPEED_25R1:
+       case FBNIC_FW_LINK_MODE_25CR:
                *aui = FBNIC_AUI_25GAUI;
                break;
-       case FBNIC_FW_LINK_SPEED_50R2:
+       case FBNIC_FW_LINK_MODE_50CR2:
                *aui = FBNIC_AUI_LAUI2;
                break;
-       case FBNIC_FW_LINK_SPEED_50R1:
+       case FBNIC_FW_LINK_MODE_50CR:
                *aui = FBNIC_AUI_50GAUI1;
                *fec = FBNIC_FEC_RS;
                return;
-       case FBNIC_FW_LINK_SPEED_100R2:
+       case FBNIC_FW_LINK_MODE_100CR2:
                *aui = FBNIC_AUI_100GAUI2;
                *fec = FBNIC_FEC_RS;
                return;