OSDN Git Service

net: aquantia: unify styling of bit enums
authorDmitry Bezrukov <dmitry.bezrukov@aquantia.com>
Tue, 22 Oct 2019 09:53:25 +0000 (09:53 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Oct 2019 16:51:22 +0000 (09:51 -0700)
Make some other bit-enums more clear about positioning,
this helps on debugging and development

Signed-off-by: Dmitry Bezrukov <dmitry.bezrukov@aquantia.com>
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h

index 5264685..3251253 100644 (file)
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * aQuantia Corporation Network Driver
- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved
+ * Copyright (C) 2014-2019 aQuantia Corporation. All rights reserved
  */
 
 /* File hw_atl_utils.c: Definition of common functions for Atlantic hardware
index 7121248..766e02c 100644 (file)
@@ -386,38 +386,44 @@ enum hw_atl_fw2x_rate {
        FW2X_RATE_10G     = 0x800,
 };
 
+/* 0x370
+ * Link capabilities resolution register
+ */
 enum hw_atl_fw2x_caps_lo {
-       CAPS_LO_10BASET_HD = 0x00,
+       CAPS_LO_10BASET_HD        = 0,
        CAPS_LO_10BASET_FD,
        CAPS_LO_100BASETX_HD,
        CAPS_LO_100BASET4_HD,
        CAPS_LO_100BASET2_HD,
-       CAPS_LO_100BASETX_FD,
+       CAPS_LO_100BASETX_FD      = 5,
        CAPS_LO_100BASET2_FD,
        CAPS_LO_1000BASET_HD,
        CAPS_LO_1000BASET_FD,
        CAPS_LO_2P5GBASET_FD,
-       CAPS_LO_5GBASET_FD,
+       CAPS_LO_5GBASET_FD        = 10,
        CAPS_LO_10GBASET_FD,
 };
 
+/* 0x374
+ * Status register
+ */
 enum hw_atl_fw2x_caps_hi {
-       CAPS_HI_RESERVED1 = 0x00,
+       CAPS_HI_RESERVED1         = 0,
        CAPS_HI_10BASET_EEE,
        CAPS_HI_RESERVED2,
        CAPS_HI_PAUSE,
        CAPS_HI_ASYMMETRIC_PAUSE,
-       CAPS_HI_100BASETX_EEE,
+       CAPS_HI_100BASETX_EEE     = 5,
        CAPS_HI_RESERVED3,
        CAPS_HI_RESERVED4,
        CAPS_HI_1000BASET_FD_EEE,
        CAPS_HI_2P5GBASET_FD_EEE,
-       CAPS_HI_5GBASET_FD_EEE,
+       CAPS_HI_5GBASET_FD_EEE    = 10,
        CAPS_HI_10GBASET_FD_EEE,
        CAPS_HI_FW_REQUEST,
        CAPS_HI_RESERVED6,
        CAPS_HI_RESERVED7,
-       CAPS_HI_RESERVED8,
+       CAPS_HI_RESERVED8         = 15,
        CAPS_HI_RESERVED9,
        CAPS_HI_CABLE_DIAG,
        CAPS_HI_TEMPERATURE,
@@ -427,47 +433,50 @@ enum hw_atl_fw2x_caps_hi {
        CAPS_HI_LINK_DROP,
        CAPS_HI_SLEEP_PROXY,
        CAPS_HI_WOL,
-       CAPS_HI_MAC_STOP,
+       CAPS_HI_MAC_STOP          = 25,
        CAPS_HI_EXT_LOOPBACK,
        CAPS_HI_INT_LOOPBACK,
        CAPS_HI_EFUSE_AGENT,
        CAPS_HI_WOL_TIMER,
-       CAPS_HI_STATISTICS,
+       CAPS_HI_STATISTICS        = 30,
        CAPS_HI_TRANSACTION_ID,
 };
 
+/* 0x36C
+ * Control register
+ */
 enum hw_atl_fw2x_ctrl {
-       CTRL_RESERVED1 = 0x00,
+       CTRL_RESERVED1            = 0,
        CTRL_RESERVED2,
        CTRL_RESERVED3,
        CTRL_PAUSE,
        CTRL_ASYMMETRIC_PAUSE,
-       CTRL_RESERVED4,
+       CTRL_RESERVED4            = 5,
        CTRL_RESERVED5,
        CTRL_RESERVED6,
        CTRL_1GBASET_FD_EEE,
        CTRL_2P5GBASET_FD_EEE,
-       CTRL_5GBASET_FD_EEE,
+       CTRL_5GBASET_FD_EEE       = 10,
        CTRL_10GBASET_FD_EEE,
        CTRL_THERMAL_SHUTDOWN,
        CTRL_PHY_LOGS,
        CTRL_EEE_AUTO_DISABLE,
-       CTRL_PFC,
+       CTRL_PFC                  = 15,
        CTRL_WAKE_ON_LINK,
        CTRL_CABLE_DIAG,
        CTRL_TEMPERATURE,
        CTRL_DOWNSHIFT,
-       CTRL_PTP_AVB,
+       CTRL_PTP_AVB              = 20,
        CTRL_RESERVED7,
        CTRL_LINK_DROP,
        CTRL_SLEEP_PROXY,
        CTRL_WOL,
-       CTRL_MAC_STOP,
+       CTRL_MAC_STOP             = 25,
        CTRL_EXT_LOOPBACK,
        CTRL_INT_LOOPBACK,
        CTRL_RESERVED8,
        CTRL_WOL_TIMER,
-       CTRL_STATISTICS,
+       CTRL_STATISTICS           = 30,
        CTRL_FORCE_RECONNECT,
 };