]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: phy: qcom: move more function to shared library
authorChristian Marangi <ansuelsmth@gmail.com>
Tue, 6 Feb 2024 17:31:07 +0000 (18:31 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sat, 10 Feb 2024 15:36:19 +0000 (15:36 +0000)
Move more function to shared library in preparation for introduction of
new PHY Family qca807x that will make use of both functions from at803x
and qca808x as it's a transition PHY with some implementation of at803x
and some from the new qca808x.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/qcom/at803x.c
drivers/net/phy/qcom/qca808x.c
drivers/net/phy/qcom/qcom-phy-lib.c
drivers/net/phy/qcom/qcom.h

index 36b70e88394e92984ef6397bb3809b878d3cfb56..3e3ee4c1d4bc6ba8befcad79feceab84feaaa04b 100644 (file)
@@ -504,41 +504,6 @@ static void at803x_link_change_notify(struct phy_device *phydev)
        }
 }
 
-static int at803x_read_status(struct phy_device *phydev)
-{
-       struct at803x_ss_mask ss_mask = { 0 };
-       int err, old_link = phydev->link;
-
-       /* Update the link, but return if there was an error */
-       err = genphy_update_link(phydev);
-       if (err)
-               return err;
-
-       /* why bother the PHY if nothing can have changed */
-       if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
-               return 0;
-
-       phydev->speed = SPEED_UNKNOWN;
-       phydev->duplex = DUPLEX_UNKNOWN;
-       phydev->pause = 0;
-       phydev->asym_pause = 0;
-
-       err = genphy_read_lpa(phydev);
-       if (err < 0)
-               return err;
-
-       ss_mask.speed_mask = AT803X_SS_SPEED_MASK;
-       ss_mask.speed_shift = __bf_shf(AT803X_SS_SPEED_MASK);
-       err = at803x_read_specific_status(phydev, ss_mask);
-       if (err < 0)
-               return err;
-
-       if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete)
-               phy_resolve_aneg_pause(phydev);
-
-       return 0;
-}
-
 static int at803x_config_aneg(struct phy_device *phydev)
 {
        struct at803x_priv *priv = phydev->priv;
index d88e04278fc4bfeb188c3f94f7393044a44b581d..8377325f157eee6f93d348fc87a9120f139a4ac4 100644 (file)
@@ -2,7 +2,6 @@
 
 #include <linux/phy.h>
 #include <linux/module.h>
-#include <linux/ethtool_netlink.h>
 
 #include "qcom.h"
 
 #define QCA808X_DBG_AN_TEST                    0xb
 #define QCA808X_HIBERNATION_EN                 BIT(15)
 
-#define QCA808X_CDT_ENABLE_TEST                        BIT(15)
-#define QCA808X_CDT_INTER_CHECK_DIS            BIT(13)
-#define QCA808X_CDT_STATUS                     BIT(11)
-#define QCA808X_CDT_LENGTH_UNIT                        BIT(10)
-
-#define QCA808X_MMD3_CDT_STATUS                        0x8064
-#define QCA808X_MMD3_CDT_DIAG_PAIR_A           0x8065
-#define QCA808X_MMD3_CDT_DIAG_PAIR_B           0x8066
-#define QCA808X_MMD3_CDT_DIAG_PAIR_C           0x8067
-#define QCA808X_MMD3_CDT_DIAG_PAIR_D           0x8068
-#define QCA808X_CDT_DIAG_LENGTH_SAME_SHORT     GENMASK(15, 8)
-#define QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT    GENMASK(7, 0)
-
-#define QCA808X_CDT_CODE_PAIR_A                        GENMASK(15, 12)
-#define QCA808X_CDT_CODE_PAIR_B                        GENMASK(11, 8)
-#define QCA808X_CDT_CODE_PAIR_C                        GENMASK(7, 4)
-#define QCA808X_CDT_CODE_PAIR_D                        GENMASK(3, 0)
-
-#define QCA808X_CDT_STATUS_STAT_TYPE           GENMASK(1, 0)
-#define QCA808X_CDT_STATUS_STAT_FAIL           FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 0)
-#define QCA808X_CDT_STATUS_STAT_NORMAL         FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 1)
-#define QCA808X_CDT_STATUS_STAT_SAME_OPEN      FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 2)
-#define QCA808X_CDT_STATUS_STAT_SAME_SHORT     FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 3)
-
-#define QCA808X_CDT_STATUS_STAT_MDI            GENMASK(3, 2)
-#define QCA808X_CDT_STATUS_STAT_MDI1           FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 1)
-#define QCA808X_CDT_STATUS_STAT_MDI2           FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 2)
-#define QCA808X_CDT_STATUS_STAT_MDI3           FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 3)
-
-/* NORMAL are MDI with type set to 0 */
-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL      QCA808X_CDT_STATUS_STAT_MDI1
-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN                (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
-                                                                        QCA808X_CDT_STATUS_STAT_MDI1)
-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT       (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
-                                                                        QCA808X_CDT_STATUS_STAT_MDI1)
-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL      QCA808X_CDT_STATUS_STAT_MDI2
-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN                (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
-                                                                        QCA808X_CDT_STATUS_STAT_MDI2)
-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT       (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
-                                                                        QCA808X_CDT_STATUS_STAT_MDI2)
-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL      QCA808X_CDT_STATUS_STAT_MDI3
-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN                (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
-                                                                        QCA808X_CDT_STATUS_STAT_MDI3)
-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT       (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
-                                                                        QCA808X_CDT_STATUS_STAT_MDI3)
-
-/* Added for reference of existence but should be handled by wait_for_completion already */
-#define QCA808X_CDT_STATUS_STAT_BUSY           (BIT(1) | BIT(3))
-
 #define QCA808X_MMD7_LED_GLOBAL                        0x8073
 #define QCA808X_LED_BLINK_1                    GENMASK(11, 6)
 #define QCA808X_LED_BLINK_2                    GENMASK(5, 0)
@@ -406,86 +356,6 @@ static int qca808x_soft_reset(struct phy_device *phydev)
        return ret;
 }
 
-static bool qca808x_cdt_fault_length_valid(int cdt_code)
-{
-       switch (cdt_code) {
-       case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
-       case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static int qca808x_cable_test_result_trans(int cdt_code)
-{
-       switch (cdt_code) {
-       case QCA808X_CDT_STATUS_STAT_NORMAL:
-               return ETHTOOL_A_CABLE_RESULT_CODE_OK;
-       case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
-               return ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT;
-       case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
-               return ETHTOOL_A_CABLE_RESULT_CODE_OPEN;
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
-       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
-               return ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT;
-       case QCA808X_CDT_STATUS_STAT_FAIL:
-       default:
-               return ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC;
-       }
-}
-
-static int qca808x_cdt_fault_length(struct phy_device *phydev, int pair,
-                                   int result)
-{
-       int val;
-       u32 cdt_length_reg = 0;
-
-       switch (pair) {
-       case ETHTOOL_A_CABLE_PAIR_A:
-               cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_A;
-               break;
-       case ETHTOOL_A_CABLE_PAIR_B:
-               cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_B;
-               break;
-       case ETHTOOL_A_CABLE_PAIR_C:
-               cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_C;
-               break;
-       case ETHTOOL_A_CABLE_PAIR_D:
-               cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_D;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       val = phy_read_mmd(phydev, MDIO_MMD_PCS, cdt_length_reg);
-       if (val < 0)
-               return val;
-
-       if (result == ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT)
-               val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_SAME_SHORT, val);
-       else
-               val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT, val);
-
-       return at803x_cdt_fault_length(val);
-}
-
 static int qca808x_cable_test_start(struct phy_device *phydev)
 {
        int ret;
@@ -527,81 +397,6 @@ static int qca808x_cable_test_start(struct phy_device *phydev)
        return 0;
 }
 
-static int qca808x_cable_test_get_pair_status(struct phy_device *phydev, u8 pair,
-                                             u16 status)
-{
-       int length, result;
-       u16 pair_code;
-
-       switch (pair) {
-       case ETHTOOL_A_CABLE_PAIR_A:
-               pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_A, status);
-               break;
-       case ETHTOOL_A_CABLE_PAIR_B:
-               pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_B, status);
-               break;
-       case ETHTOOL_A_CABLE_PAIR_C:
-               pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_C, status);
-               break;
-       case ETHTOOL_A_CABLE_PAIR_D:
-               pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_D, status);
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       result = qca808x_cable_test_result_trans(pair_code);
-       ethnl_cable_test_result(phydev, pair, result);
-
-       if (qca808x_cdt_fault_length_valid(pair_code)) {
-               length = qca808x_cdt_fault_length(phydev, pair, result);
-               ethnl_cable_test_fault_length(phydev, pair, length);
-       }
-
-       return 0;
-}
-
-static int qca808x_cable_test_get_status(struct phy_device *phydev, bool *finished)
-{
-       int ret, val;
-
-       *finished = false;
-
-       val = QCA808X_CDT_ENABLE_TEST |
-             QCA808X_CDT_LENGTH_UNIT;
-       ret = at803x_cdt_start(phydev, val);
-       if (ret)
-               return ret;
-
-       ret = at803x_cdt_wait_for_completion(phydev, QCA808X_CDT_ENABLE_TEST);
-       if (ret)
-               return ret;
-
-       val = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA808X_MMD3_CDT_STATUS);
-       if (val < 0)
-               return val;
-
-       ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_A, val);
-       if (ret)
-               return ret;
-
-       ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_B, val);
-       if (ret)
-               return ret;
-
-       ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_C, val);
-       if (ret)
-               return ret;
-
-       ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_D, val);
-       if (ret)
-               return ret;
-
-       *finished = true;
-
-       return 0;
-}
-
 static int qca808x_get_features(struct phy_device *phydev)
 {
        int ret;
index e0295d4b4a51fa7432c735e154ad32561e2aac00..786bfc39912c8e9d4c73505169d456f94886e0c3 100644 (file)
@@ -5,6 +5,7 @@
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/ethtool_netlink.h>
 
 #include "qcom.h"
 
@@ -311,6 +312,42 @@ int at803x_prepare_config_aneg(struct phy_device *phydev)
 }
 EXPORT_SYMBOL_GPL(at803x_prepare_config_aneg);
 
+int at803x_read_status(struct phy_device *phydev)
+{
+       struct at803x_ss_mask ss_mask = { 0 };
+       int err, old_link = phydev->link;
+
+       /* Update the link, but return if there was an error */
+       err = genphy_update_link(phydev);
+       if (err)
+               return err;
+
+       /* why bother the PHY if nothing can have changed */
+       if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
+               return 0;
+
+       phydev->speed = SPEED_UNKNOWN;
+       phydev->duplex = DUPLEX_UNKNOWN;
+       phydev->pause = 0;
+       phydev->asym_pause = 0;
+
+       err = genphy_read_lpa(phydev);
+       if (err < 0)
+               return err;
+
+       ss_mask.speed_mask = AT803X_SS_SPEED_MASK;
+       ss_mask.speed_shift = __bf_shf(AT803X_SS_SPEED_MASK);
+       err = at803x_read_specific_status(phydev, ss_mask);
+       if (err < 0)
+               return err;
+
+       if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete)
+               phy_resolve_aneg_pause(phydev);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(at803x_read_status);
+
 static int at803x_get_downshift(struct phy_device *phydev, u8 *d)
 {
        int val;
@@ -427,3 +464,159 @@ int at803x_cdt_wait_for_completion(struct phy_device *phydev,
        return ret < 0 ? ret : 0;
 }
 EXPORT_SYMBOL_GPL(at803x_cdt_wait_for_completion);
+
+static bool qca808x_cdt_fault_length_valid(int cdt_code)
+{
+       switch (cdt_code) {
+       case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
+       case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
+               return true;
+       default:
+               return false;
+       }
+}
+
+static int qca808x_cable_test_result_trans(int cdt_code)
+{
+       switch (cdt_code) {
+       case QCA808X_CDT_STATUS_STAT_NORMAL:
+               return ETHTOOL_A_CABLE_RESULT_CODE_OK;
+       case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
+               return ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT;
+       case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
+               return ETHTOOL_A_CABLE_RESULT_CODE_OPEN;
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
+       case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
+               return ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT;
+       case QCA808X_CDT_STATUS_STAT_FAIL:
+       default:
+               return ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC;
+       }
+}
+
+static int qca808x_cdt_fault_length(struct phy_device *phydev, int pair,
+                                   int result)
+{
+       int val;
+       u32 cdt_length_reg = 0;
+
+       switch (pair) {
+       case ETHTOOL_A_CABLE_PAIR_A:
+               cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_A;
+               break;
+       case ETHTOOL_A_CABLE_PAIR_B:
+               cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_B;
+               break;
+       case ETHTOOL_A_CABLE_PAIR_C:
+               cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_C;
+               break;
+       case ETHTOOL_A_CABLE_PAIR_D:
+               cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_D;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       val = phy_read_mmd(phydev, MDIO_MMD_PCS, cdt_length_reg);
+       if (val < 0)
+               return val;
+
+       if (result == ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT)
+               val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_SAME_SHORT, val);
+       else
+               val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT, val);
+
+       return at803x_cdt_fault_length(val);
+}
+
+static int qca808x_cable_test_get_pair_status(struct phy_device *phydev, u8 pair,
+                                             u16 status)
+{
+       int length, result;
+       u16 pair_code;
+
+       switch (pair) {
+       case ETHTOOL_A_CABLE_PAIR_A:
+               pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_A, status);
+               break;
+       case ETHTOOL_A_CABLE_PAIR_B:
+               pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_B, status);
+               break;
+       case ETHTOOL_A_CABLE_PAIR_C:
+               pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_C, status);
+               break;
+       case ETHTOOL_A_CABLE_PAIR_D:
+               pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_D, status);
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       result = qca808x_cable_test_result_trans(pair_code);
+       ethnl_cable_test_result(phydev, pair, result);
+
+       if (qca808x_cdt_fault_length_valid(pair_code)) {
+               length = qca808x_cdt_fault_length(phydev, pair, result);
+               ethnl_cable_test_fault_length(phydev, pair, length);
+       }
+
+       return 0;
+}
+
+int qca808x_cable_test_get_status(struct phy_device *phydev, bool *finished)
+{
+       int ret, val;
+
+       *finished = false;
+
+       val = QCA808X_CDT_ENABLE_TEST |
+             QCA808X_CDT_LENGTH_UNIT;
+       ret = at803x_cdt_start(phydev, val);
+       if (ret)
+               return ret;
+
+       ret = at803x_cdt_wait_for_completion(phydev, QCA808X_CDT_ENABLE_TEST);
+       if (ret)
+               return ret;
+
+       val = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA808X_MMD3_CDT_STATUS);
+       if (val < 0)
+               return val;
+
+       ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_A, val);
+       if (ret)
+               return ret;
+
+       ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_B, val);
+       if (ret)
+               return ret;
+
+       ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_C, val);
+       if (ret)
+               return ret;
+
+       ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_D, val);
+       if (ret)
+               return ret;
+
+       *finished = true;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(qca808x_cable_test_get_status);
index c127d8f50f0f4053250b3b0c68ef48ecef20d1a9..dc259bbf0678331711b5c70b24cb7823491f9d83 100644 (file)
 #define AT803X_CDT_STATUS_STAT_MASK            GENMASK(9, 8)
 #define AT803X_CDT_STATUS_DELTA_TIME_MASK      GENMASK(7, 0)
 
+#define QCA808X_CDT_ENABLE_TEST                        BIT(15)
+#define QCA808X_CDT_INTER_CHECK_DIS            BIT(13)
+#define QCA808X_CDT_STATUS                     BIT(11)
+#define QCA808X_CDT_LENGTH_UNIT                        BIT(10)
+
+#define QCA808X_MMD3_CDT_STATUS                        0x8064
+#define QCA808X_MMD3_CDT_DIAG_PAIR_A           0x8065
+#define QCA808X_MMD3_CDT_DIAG_PAIR_B           0x8066
+#define QCA808X_MMD3_CDT_DIAG_PAIR_C           0x8067
+#define QCA808X_MMD3_CDT_DIAG_PAIR_D           0x8068
+#define QCA808X_CDT_DIAG_LENGTH_SAME_SHORT     GENMASK(15, 8)
+#define QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT    GENMASK(7, 0)
+
+#define QCA808X_CDT_CODE_PAIR_A                        GENMASK(15, 12)
+#define QCA808X_CDT_CODE_PAIR_B                        GENMASK(11, 8)
+#define QCA808X_CDT_CODE_PAIR_C                        GENMASK(7, 4)
+#define QCA808X_CDT_CODE_PAIR_D                        GENMASK(3, 0)
+
+#define QCA808X_CDT_STATUS_STAT_TYPE           GENMASK(1, 0)
+#define QCA808X_CDT_STATUS_STAT_FAIL           FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 0)
+#define QCA808X_CDT_STATUS_STAT_NORMAL         FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 1)
+#define QCA808X_CDT_STATUS_STAT_SAME_OPEN      FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 2)
+#define QCA808X_CDT_STATUS_STAT_SAME_SHORT     FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 3)
+
+#define QCA808X_CDT_STATUS_STAT_MDI            GENMASK(3, 2)
+#define QCA808X_CDT_STATUS_STAT_MDI1           FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 1)
+#define QCA808X_CDT_STATUS_STAT_MDI2           FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 2)
+#define QCA808X_CDT_STATUS_STAT_MDI3           FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 3)
+
+/* NORMAL are MDI with type set to 0 */
+#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL      QCA808X_CDT_STATUS_STAT_MDI1
+#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN                (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
+                                                                        QCA808X_CDT_STATUS_STAT_MDI1)
+#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT       (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
+                                                                        QCA808X_CDT_STATUS_STAT_MDI1)
+#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL      QCA808X_CDT_STATUS_STAT_MDI2
+#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN                (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
+                                                                        QCA808X_CDT_STATUS_STAT_MDI2)
+#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT       (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
+                                                                        QCA808X_CDT_STATUS_STAT_MDI2)
+#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL      QCA808X_CDT_STATUS_STAT_MDI3
+#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN                (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
+                                                                        QCA808X_CDT_STATUS_STAT_MDI3)
+#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT       (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
+                                                                        QCA808X_CDT_STATUS_STAT_MDI3)
+
+/* Added for reference of existence but should be handled by wait_for_completion already */
+#define QCA808X_CDT_STATUS_STAT_BUSY           (BIT(1) | BIT(3))
+
 #define AT803X_LOC_MAC_ADDR_0_15_OFFSET                0x804C
 #define AT803X_LOC_MAC_ADDR_16_31_OFFSET       0x804B
 #define AT803X_LOC_MAC_ADDR_32_47_OFFSET       0x804A
@@ -110,6 +159,7 @@ int at803x_read_specific_status(struct phy_device *phydev,
                                struct at803x_ss_mask ss_mask);
 int at803x_config_mdix(struct phy_device *phydev, u8 ctrl);
 int at803x_prepare_config_aneg(struct phy_device *phydev);
+int at803x_read_status(struct phy_device *phydev);
 int at803x_get_tunable(struct phy_device *phydev,
                       struct ethtool_tunable *tuna, void *data);
 int at803x_set_tunable(struct phy_device *phydev,
@@ -118,3 +168,4 @@ int at803x_cdt_fault_length(int dt);
 int at803x_cdt_start(struct phy_device *phydev, u32 cdt_start);
 int at803x_cdt_wait_for_completion(struct phy_device *phydev,
                                   u32 cdt_en);
+int qca808x_cable_test_get_status(struct phy_device *phydev, bool *finished);