Skip to content

Commit

Permalink
net: phy: at803x: move specific qca808x config_aneg to dedicated func…
Browse files Browse the repository at this point in the history
…tion

Move specific qca808x config_aneg to dedicated function to permit easier
split of qca808x portion from at803x driver.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Christian Marangi authored and David S. Miller committed Dec 15, 2023
1 parent 6da0bcb commit 8e732f1
Showing 1 changed file with 40 additions and 26 deletions.
66 changes: 40 additions & 26 deletions drivers/net/phy/at803x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1045,9 +1045,8 @@ static int at803x_config_mdix(struct phy_device *phydev, u8 ctrl)
FIELD_PREP(AT803X_SFC_MDI_CROSSOVER_MODE_M, val));
}

static int at803x_config_aneg(struct phy_device *phydev)
static int at803x_prepare_config_aneg(struct phy_device *phydev)
{
struct at803x_priv *priv = phydev->priv;
int ret;

ret = at803x_config_mdix(phydev, phydev->mdix_ctrl);
Expand All @@ -1064,33 +1063,22 @@ static int at803x_config_aneg(struct phy_device *phydev)
return ret;
}

if (priv->is_1000basex)
return genphy_c37_config_aneg(phydev);

/* Do not restart auto-negotiation by setting ret to 0 defautly,
* when calling __genphy_config_aneg later.
*/
ret = 0;

if (phydev->drv->phy_id == QCA8081_PHY_ID) {
int phy_ctrl = 0;
return 0;
}

/* The reg MII_BMCR also needs to be configured for force mode, the
* genphy_config_aneg is also needed.
*/
if (phydev->autoneg == AUTONEG_DISABLE)
genphy_c45_pma_setup_forced(phydev);
static int at803x_config_aneg(struct phy_device *phydev)
{
struct at803x_priv *priv = phydev->priv;
int ret;

if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->advertising))
phy_ctrl = MDIO_AN_10GBT_CTRL_ADV2_5G;
ret = at803x_prepare_config_aneg(phydev);
if (ret)
return ret;

ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
MDIO_AN_10GBT_CTRL_ADV2_5G, phy_ctrl);
if (ret < 0)
return ret;
}
if (priv->is_1000basex)
return genphy_c37_config_aneg(phydev);

return __genphy_config_aneg(phydev, ret);
return genphy_config_aneg(phydev);
}

static int at803x_get_downshift(struct phy_device *phydev, u8 *d)
Expand Down Expand Up @@ -2118,6 +2106,32 @@ static int qca808x_get_features(struct phy_device *phydev)
return 0;
}

static int qca808x_config_aneg(struct phy_device *phydev)
{
int phy_ctrl = 0;
int ret;

ret = at803x_prepare_config_aneg(phydev);
if (ret)
return ret;

/* The reg MII_BMCR also needs to be configured for force mode, the
* genphy_config_aneg is also needed.
*/
if (phydev->autoneg == AUTONEG_DISABLE)
genphy_c45_pma_setup_forced(phydev);

if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->advertising))
phy_ctrl = MDIO_AN_10GBT_CTRL_ADV2_5G;

ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
MDIO_AN_10GBT_CTRL_ADV2_5G, phy_ctrl);
if (ret < 0)
return ret;

return __genphy_config_aneg(phydev, ret);
}

static void qca808x_link_change_notify(struct phy_device *phydev)
{
/* Assert interface sgmii fifo on link down, deassert it on link up,
Expand Down Expand Up @@ -2295,7 +2309,7 @@ static struct phy_driver at803x_driver[] = {
.set_wol = at803x_set_wol,
.get_wol = at803x_get_wol,
.get_features = qca808x_get_features,
.config_aneg = at803x_config_aneg,
.config_aneg = qca808x_config_aneg,
.suspend = genphy_suspend,
.resume = genphy_resume,
.read_status = qca808x_read_status,
Expand Down

0 comments on commit 8e732f1

Please sign in to comment.