]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: phy: add qca8081 soft_reset and enable master/slave seed
authorLuo Jie <luoj@codeaurora.org>
Sun, 24 Oct 2021 08:27:36 +0000 (16:27 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Oct 2021 13:04:18 +0000 (14:04 +0100)
qca8081 phy is a single port phy, configure
phy the lower seed value to make it linked as slave
mode easier.

Signed-off-by: Luo Jie <luoj@codeaurora.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/at803x.c

index da710523b7c4192adcf19e8f995e4b82ae27ae73..1418db4f20917c39b77be99d715a8b153eda897c 100644 (file)
 #define QCA808X_PHY_MMD3_DEBUG_6               0xa011
 #define QCA808X_MMD3_DEBUG_6_VALUE             0x5f85
 
+/* master/slave seed config */
+#define QCA808X_PHY_DEBUG_LOCAL_SEED           9
+#define QCA808X_MASTER_SLAVE_SEED_ENABLE       BIT(1)
+#define QCA808X_MASTER_SLAVE_SEED_CFG          GENMASK(12, 2)
+#define QCA808X_MASTER_SLAVE_SEED_RANGE                0x32
+
 MODULE_DESCRIPTION("Qualcomm Atheros AR803x and QCA808X PHY driver");
 MODULE_AUTHOR("Matus Ujhelyi");
 MODULE_LICENSE("GPL");
@@ -1569,6 +1575,26 @@ static int qca808x_phy_fast_retrain_config(struct phy_device *phydev)
        return 0;
 }
 
+static int qca808x_phy_ms_random_seed_set(struct phy_device *phydev)
+{
+       u16 seed_value = (prandom_u32() % QCA808X_MASTER_SLAVE_SEED_RANGE);
+
+       return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED,
+                       QCA808X_MASTER_SLAVE_SEED_CFG,
+                       FIELD_PREP(QCA808X_MASTER_SLAVE_SEED_CFG, seed_value));
+}
+
+static int qca808x_phy_ms_seed_enable(struct phy_device *phydev, bool enable)
+{
+       u16 seed_enable = 0;
+
+       if (enable)
+               seed_enable = QCA808X_MASTER_SLAVE_SEED_ENABLE;
+
+       return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED,
+                       QCA808X_MASTER_SLAVE_SEED_ENABLE, seed_enable);
+}
+
 static int qca808x_config_init(struct phy_device *phydev)
 {
        int ret;
@@ -1590,6 +1616,16 @@ static int qca808x_config_init(struct phy_device *phydev)
        if (ret)
                return ret;
 
+       /* Configure lower ramdom seed to make phy linked as slave mode */
+       ret = qca808x_phy_ms_random_seed_set(phydev);
+       if (ret)
+               return ret;
+
+       /* Enable seed */
+       ret = qca808x_phy_ms_seed_enable(phydev, true);
+       if (ret)
+               return ret;
+
        /* Configure adc threshold as 100mv for the link 10M */
        return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_ADC_THRESHOLD,
                        QCA808X_ADC_THRESHOLD_MASK, QCA808X_ADC_THRESHOLD_100MV);
@@ -1622,6 +1658,17 @@ static int qca808x_read_status(struct phy_device *phydev)
        return 0;
 }
 
+static int qca808x_soft_reset(struct phy_device *phydev)
+{
+       int ret;
+
+       ret = genphy_soft_reset(phydev);
+       if (ret < 0)
+               return ret;
+
+       return qca808x_phy_ms_seed_enable(phydev, true);
+}
+
 static struct phy_driver at803x_driver[] = {
 {
        /* Qualcomm Atheros AR8035 */
@@ -1797,6 +1844,7 @@ static struct phy_driver at803x_driver[] = {
        .resume                 = genphy_resume,
        .read_status            = qca808x_read_status,
        .config_init            = qca808x_config_init,
+       .soft_reset             = qca808x_soft_reset,
 }, };
 
 module_phy_driver(at803x_driver);