net: atlantic: rename AQ_NIC_RATE_2GS to AQ_NIC_RATE_2G5

This patch changes the constant name to a more logical "2G5"
(for 2.5G speeds).

Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_common.h b/drivers/net/ethernet/aquantia/atlantic/aq_common.h
index 53620ba6d7a616508d6f804a257a813e984f06d2..52ad9433cabc1c582575cdb264ac68a18a187841 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_common.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_common.h
@@ -1,7 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * aQuantia Corporation Network Driver
- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved
+/* Atlantic Network Driver
+ *
+ * Copyright (C) 2014-2019 aQuantia Corporation
+ * Copyright (C) 2019-2020 Marvell International Ltd.
  */
 
 /* File aq_common.h: Basic includes for all files in project. */
@@ -53,14 +54,14 @@
 #define AQ_NIC_RATE_10G                BIT(0)
 #define AQ_NIC_RATE_5G         BIT(1)
 #define AQ_NIC_RATE_5GSR       BIT(2)
-#define AQ_NIC_RATE_2GS                BIT(3)
+#define AQ_NIC_RATE_2G5                BIT(3)
 #define AQ_NIC_RATE_1G         BIT(4)
 #define AQ_NIC_RATE_100M       BIT(5)
 #define AQ_NIC_RATE_10M                BIT(6)
 
 #define AQ_NIC_RATE_EEE_10G    BIT(7)
 #define AQ_NIC_RATE_EEE_5G     BIT(8)
-#define AQ_NIC_RATE_EEE_2GS    BIT(9)
+#define AQ_NIC_RATE_EEE_2G5    BIT(9)
 #define AQ_NIC_RATE_EEE_1G     BIT(10)
 #define AQ_NIC_RATE_EEE_100M   BIT(11)
 

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
index 0c9dd8edc06248f4d4f0749f589cfa40dfb167d0..86fc77d85fdae9e3090488dc2a65f4d173e56ca4 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
@@ -605,7 +605,7 @@ static enum hw_atl_fw2x_rate eee_mask_to_ethtool_mask(u32 speed)
        if (speed & AQ_NIC_RATE_EEE_10G)
                rate |= SUPPORTED_10000baseT_Full;
 
-       if (speed & AQ_NIC_RATE_EEE_2GS)
+       if (speed & AQ_NIC_RATE_EEE_2G5)
                rate |= SUPPORTED_2500baseX_Full;
 
        if (speed & AQ_NIC_RATE_EEE_1G)

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index f97b073efd8e20fb4a8bd88e4d87dd8f99a440e1..18cad06f2ea7f9a399a0b0eb60390eb4bccf8a3e 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/*
- * aQuantia Corporation Network Driver
- * Copyright (C) 2014-2019 aQuantia Corporation. All rights reserved
+/* Atlantic Network Driver
+ *
+ * Copyright (C) 2014-2019 aQuantia Corporation
+ * Copyright (C) 2019-2020 Marvell International Ltd.
  */
 
 /* File aq_nic.c: Definition of common code for NIC. */
@@ -894,7 +895,7 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self,
                ethtool_link_ksettings_add_link_mode(cmd, supported,
                                                     5000baseT_Full);
 
-       if (self->aq_nic_cfg.aq_hw_caps->link_speed_msk & AQ_NIC_RATE_2GS)
+       if (self->aq_nic_cfg.aq_hw_caps->link_speed_msk & AQ_NIC_RATE_2G5)
                ethtool_link_ksettings_add_link_mode(cmd, supported,
                                                     2500baseT_Full);
 
@@ -937,7 +938,7 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self,
                ethtool_link_ksettings_add_link_mode(cmd, advertising,
                                                     5000baseT_Full);
 
-       if (self->aq_nic_cfg.link_speed_msk  & AQ_NIC_RATE_2GS)
+       if (self->aq_nic_cfg.link_speed_msk  & AQ_NIC_RATE_2G5)
                ethtool_link_ksettings_add_link_mode(cmd, advertising,
                                                     2500baseT_Full);
 
@@ -996,7 +997,7 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self,
                        break;
 
                case SPEED_2500:
-                       rate = AQ_NIC_RATE_2GS;
+                       rate = AQ_NIC_RATE_2G5;
                        break;
 
                case SPEED_5000:

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
index eee265b4415aaaeca746167d41832aa97537eb4e..70f06c40bdf2fb683221536c470418cca90033be 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/*
- * aQuantia Corporation Network Driver
- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved
+/* Atlantic Network Driver
+ *
+ * Copyright (C) 2014-2019 aQuantia Corporation
+ * Copyright (C) 2019-2020 Marvell International Ltd.
  */
 
 /* File hw_atl_a0.c: Definition of Atlantic hardware specific functions. */
@@ -47,7 +48,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc100 = {
        DEFAULT_A0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_FIBRE,
        .link_speed_msk = AQ_NIC_RATE_5G |
-                         AQ_NIC_RATE_2GS |
+                         AQ_NIC_RATE_2G5 |
                          AQ_NIC_RATE_1G |
                          AQ_NIC_RATE_100M,
 };
@@ -57,7 +58,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc107 = {
        .media_type = AQ_HW_MEDIA_TYPE_TP,
        .link_speed_msk = AQ_NIC_RATE_10G |
                          AQ_NIC_RATE_5G |
-                         AQ_NIC_RATE_2GS |
+                         AQ_NIC_RATE_2G5 |
                          AQ_NIC_RATE_1G |
                          AQ_NIC_RATE_100M,
 };
@@ -66,7 +67,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc108 = {
        DEFAULT_A0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_TP,
        .link_speed_msk = AQ_NIC_RATE_5G |
-                         AQ_NIC_RATE_2GS |
+                         AQ_NIC_RATE_2G5 |
                          AQ_NIC_RATE_1G |
                          AQ_NIC_RATE_100M,
 };
@@ -74,7 +75,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc108 = {
 const struct aq_hw_caps_s hw_atl_a0_caps_aqc109 = {
        DEFAULT_A0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_TP,
-       .link_speed_msk = AQ_NIC_RATE_2GS |
+       .link_speed_msk = AQ_NIC_RATE_2G5 |
                          AQ_NIC_RATE_1G |
                          AQ_NIC_RATE_100M,
 };

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
index cbb7a00d61b486aea06818622d85b8f96849478b..1d872547a87c2e72eaa843ae2c1e6bd6600bb2fa 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/*
- * aQuantia Corporation Network Driver
- * Copyright (C) 2014-2019 aQuantia Corporation. All rights reserved
+/* Atlantic Network Driver
+ *
+ * Copyright (C) 2014-2019 aQuantia Corporation
+ * Copyright (C) 2019-2020 Marvell International Ltd.
  */
 
 /* File hw_atl_b0.c: Definition of Atlantic hardware specific functions. */
@@ -59,7 +60,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc100 = {
        .media_type = AQ_HW_MEDIA_TYPE_FIBRE,
        .link_speed_msk = AQ_NIC_RATE_10G |
                          AQ_NIC_RATE_5G |
-                         AQ_NIC_RATE_2GS |
+                         AQ_NIC_RATE_2G5 |
                          AQ_NIC_RATE_1G |
                          AQ_NIC_RATE_100M,
 };
@@ -69,7 +70,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc107 = {
        .media_type = AQ_HW_MEDIA_TYPE_TP,
        .link_speed_msk = AQ_NIC_RATE_10G |
                          AQ_NIC_RATE_5G |
-                         AQ_NIC_RATE_2GS |
+                         AQ_NIC_RATE_2G5 |
                          AQ_NIC_RATE_1G |
                          AQ_NIC_RATE_100M,
 };
@@ -78,7 +79,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc108 = {
        DEFAULT_B0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_TP,
        .link_speed_msk = AQ_NIC_RATE_5G |
-                         AQ_NIC_RATE_2GS |
+                         AQ_NIC_RATE_2G5 |
                          AQ_NIC_RATE_1G |
                          AQ_NIC_RATE_100M,
 };
@@ -86,7 +87,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc108 = {
 const struct aq_hw_caps_s hw_atl_b0_caps_aqc109 = {
        DEFAULT_B0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_TP,
-       .link_speed_msk = AQ_NIC_RATE_2GS |
+       .link_speed_msk = AQ_NIC_RATE_2G5 |
                          AQ_NIC_RATE_1G |
                          AQ_NIC_RATE_100M,
 };

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
index 1100d40a0302687c5911cbc2537e636b8968ca47..73c0f41df8d8b0aa377da3d1f242e53d8ef07368 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/*
- * aQuantia Corporation Network Driver
- * Copyright (C) 2014-2019 aQuantia Corporation. All rights reserved
+/* Atlantic Network Driver
+ *
+ * Copyright (C) 2014-2019 aQuantia Corporation
+ * Copyright (C) 2019-2020 Marvell International Ltd.
  */
 
 /* File hw_atl_utils.c: Definition of common functions for Atlantic hardware
@@ -687,7 +688,7 @@ int hw_atl_utils_mpi_get_link_status(struct aq_hw_s *self)
                        link_status->mbps = 5000U;
                        break;
 
-               case HAL_ATLANTIC_RATE_2GS:
+               case HAL_ATLANTIC_RATE_2G5:
                        link_status->mbps = 2500U;
                        break;
 

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
index 99c1b6644ec3cb5ee5f0b8dabaa742d70ed24931..0b4b54fc1de03a907e8bbee10798531004eaeb81 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
@@ -1,7 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * aQuantia Corporation Network Driver
- * Copyright (C) 2014-2019 aQuantia Corporation. All rights reserved
+/* Atlantic Network Driver
+ *
+ * Copyright (C) 2014-2019 aQuantia Corporation
+ * Copyright (C) 2019-2020 Marvell International Ltd.
  */
 
 /* File hw_atl_utils.h: Declaration of common functions for Atlantic hardware
@@ -418,7 +419,7 @@ enum hal_atl_utils_fw_state_e {
 #define HAL_ATLANTIC_RATE_10G        BIT(0)
 #define HAL_ATLANTIC_RATE_5G         BIT(1)
 #define HAL_ATLANTIC_RATE_5GSR       BIT(2)
-#define HAL_ATLANTIC_RATE_2GS        BIT(3)
+#define HAL_ATLANTIC_RATE_2G5        BIT(3)
 #define HAL_ATLANTIC_RATE_1G         BIT(4)
 #define HAL_ATLANTIC_RATE_100M       BIT(5)
 #define HAL_ATLANTIC_RATE_INVALID    BIT(6)

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c
index 1ad10cc14918d2f4d2704ac8fe8c25a3db8668a5..017364486703af390d098bbcc222bffd12ed6bc3 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/*
- * aQuantia Corporation Network Driver
- * Copyright (C) 2014-2019 aQuantia Corporation. All rights reserved
+/* Atlantic Network Driver
+ *
+ * Copyright (C) 2014-2019 aQuantia Corporation
+ * Copyright (C) 2019-2020 Marvell International Ltd.
  */
 
 /* File hw_atl_utils_fw2x.c: Definition of firmware 2.x functions for
@@ -134,7 +135,7 @@ static enum hw_atl_fw2x_rate link_speed_mask_2fw2x_ratemask(u32 speed)
        if (speed & AQ_NIC_RATE_5GSR)
                rate |= FW2X_RATE_5G;
 
-       if (speed & AQ_NIC_RATE_2GS)
+       if (speed & AQ_NIC_RATE_2G5)
                rate |= FW2X_RATE_2G5;
 
        if (speed & AQ_NIC_RATE_1G)
@@ -155,7 +156,7 @@ static u32 fw2x_to_eee_mask(u32 speed)
        if (speed & HW_ATL_FW2X_CAP_EEE_5G_MASK)
                rate |= AQ_NIC_RATE_EEE_5G;
        if (speed & HW_ATL_FW2X_CAP_EEE_2G5_MASK)
-               rate |= AQ_NIC_RATE_EEE_2GS;
+               rate |= AQ_NIC_RATE_EEE_2G5;
        if (speed & HW_ATL_FW2X_CAP_EEE_1G_MASK)
                rate |= AQ_NIC_RATE_EEE_1G;
 
@@ -170,7 +171,7 @@ static u32 eee_mask_to_fw2x(u32 speed)
                rate |= HW_ATL_FW2X_CAP_EEE_10G_MASK;
        if (speed & AQ_NIC_RATE_EEE_5G)
                rate |= HW_ATL_FW2X_CAP_EEE_5G_MASK;
-       if (speed & AQ_NIC_RATE_EEE_2GS)
+       if (speed & AQ_NIC_RATE_EEE_2G5)
                rate |= HW_ATL_FW2X_CAP_EEE_2G5_MASK;
        if (speed & AQ_NIC_RATE_EEE_1G)
                rate |= HW_ATL_FW2X_CAP_EEE_1G_MASK;

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
index 04d194f754facc35cec09294e5d42dba0a031c95..84d9b828dc4ef78910427f340d5c054c15a85bf5 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
@@ -60,7 +60,7 @@ const struct aq_hw_caps_s hw_atl2_caps_aqc113 = {
        .media_type = AQ_HW_MEDIA_TYPE_TP,
        .link_speed_msk = AQ_NIC_RATE_10G |
                          AQ_NIC_RATE_5G  |
-                         AQ_NIC_RATE_2GS |
+                         AQ_NIC_RATE_2G5 |
                          AQ_NIC_RATE_1G  |
                          AQ_NIC_RATE_100M      |
                          AQ_NIC_RATE_10M,

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c
index f5fb4b11f51a2bdb7c397034d17b02e2b5a8f4d3..e8f4aad8c1e547b4140d18f3e577ba44f59961c3 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c
@@ -129,7 +129,7 @@ static void a2_link_speed_mask2fw(u32 speed,
        link_options->rate_10G = !!(speed & AQ_NIC_RATE_10G);
        link_options->rate_5G = !!(speed & AQ_NIC_RATE_5G);
        link_options->rate_N5G = !!(speed & AQ_NIC_RATE_5GSR);
-       link_options->rate_2P5G = !!(speed & AQ_NIC_RATE_2GS);
+       link_options->rate_2P5G = !!(speed & AQ_NIC_RATE_2G5);
        link_options->rate_N2P5G = link_options->rate_2P5G;
        link_options->rate_1G = !!(speed & AQ_NIC_RATE_1G);
        link_options->rate_100M = !!(speed & AQ_NIC_RATE_100M);