--- v4
+++ v3
@@ -1,99 +1,43 @@
-qca8081 phy is a single port phy, configure
-phy the lower seed value to make it linked as slave
-mode easier.
+1. The master/slave seed needs to be updated when the link can't
+be created.
+
+2. The case where two qca8081 PHYs are connected each other and
+master/slave seed is generated as the same value also needs
+to be considered, so adding this code change into read_status
+instead of link_change_notify.
Signed-off-by: Luo Jie <luoj@codeaurora.org>
---
- drivers/net/phy/at803x.c | 48 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 48 insertions(+)
+ drivers/net/phy/at803x.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
-index 3096ed51dbae..f372f6ab78f6 100644
+index 5d007f89e9d3..77aaf9e72781 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
-@@ -215,6 +215,12 @@
- #define QCA808X_PHY_MMD3_DEBUG_6 0xa011
- #define QCA808X_MMD3_DEBUG_6_VALUE 0x5f85
+@@ -1556,6 +1556,22 @@ static int qca808x_read_status(struct phy_device *phydev)
+ else
+ phydev->interface = PHY_INTERFACE_MODE_SMII;
-+/* 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
++ /* generate seed as a lower random value to make PHY linked as SLAVE easily,
++ * except for master/slave configuration fault detected.
++ * the reason for not putting this code into the function link_change_notify is
++ * the corner case where the link partner is also the qca8081 PHY and the seed
++ * value is configured as the same value, the link can't be up and no link change
++ * occurs.
++ */
++ if (!phydev->link) {
++ if (phydev->master_slave_state == MASTER_SLAVE_STATE_ERR) {
++ qca808x_phy_ms_seed_enable(phydev, false);
++ } else {
++ qca808x_phy_ms_random_seed_set(phydev);
++ qca808x_phy_ms_seed_enable(phydev, true);
++ }
++ }
+
- MODULE_DESCRIPTION("Qualcomm Atheros AR803x and QCA808X PHY driver");
- MODULE_AUTHOR("Matus Ujhelyi");
- MODULE_LICENSE("GPL");
-@@ -1476,6 +1482,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;
-@@ -1497,6 +1523,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);
-@@ -1529,6 +1565,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 */
-@@ -1686,6 +1733,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);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project