Commit 74145424 authored by Maxime Chevallier's avatar Maxime Chevallier Committed by David S. Miller

net: phy: marvell10g: Use get_features to get the PHY abilities

The Alaska family of 10G PHYs has more abilities than the ones listed in
PHY_10GBIT_FULL_FEATURES, the exact list depending on the model.

Make use of the newly introduced .get_features call to build this list,
using genphy_c45_pma_read_abilities to build the list of supported
linkmodes, and adding autoneg ability based on what's reported by the AN
MMD.

.config_init is still used to validate the interface_mode.
Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1164bb1
...@@ -233,8 +233,6 @@ static int mv3310_resume(struct phy_device *phydev) ...@@ -233,8 +233,6 @@ static int mv3310_resume(struct phy_device *phydev)
static int mv3310_config_init(struct phy_device *phydev) static int mv3310_config_init(struct phy_device *phydev)
{ {
int ret, val;
/* Check that the PHY interface type is compatible */ /* Check that the PHY interface type is compatible */
if (phydev->interface != PHY_INTERFACE_MODE_SGMII && if (phydev->interface != PHY_INTERFACE_MODE_SGMII &&
phydev->interface != PHY_INTERFACE_MODE_XAUI && phydev->interface != PHY_INTERFACE_MODE_XAUI &&
...@@ -242,6 +240,13 @@ static int mv3310_config_init(struct phy_device *phydev) ...@@ -242,6 +240,13 @@ static int mv3310_config_init(struct phy_device *phydev)
phydev->interface != PHY_INTERFACE_MODE_10GKR) phydev->interface != PHY_INTERFACE_MODE_10GKR)
return -ENODEV; return -ENODEV;
return 0;
}
static int mv3310_get_features(struct phy_device *phydev)
{
int ret, val;
if (phydev->c45_ids.devices_in_package & MDIO_DEVS_AN) { if (phydev->c45_ids.devices_in_package & MDIO_DEVS_AN) {
val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1); val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1);
if (val < 0) if (val < 0)
...@@ -416,7 +421,7 @@ static struct phy_driver mv3310_drivers[] = { ...@@ -416,7 +421,7 @@ static struct phy_driver mv3310_drivers[] = {
.phy_id = 0x002b09aa, .phy_id = 0x002b09aa,
.phy_id_mask = MARVELL_PHY_ID_MASK, .phy_id_mask = MARVELL_PHY_ID_MASK,
.name = "mv88x3310", .name = "mv88x3310",
.features = PHY_10GBIT_FEATURES, .get_features = mv3310_get_features,
.soft_reset = gen10g_no_soft_reset, .soft_reset = gen10g_no_soft_reset,
.config_init = mv3310_config_init, .config_init = mv3310_config_init,
.probe = mv3310_probe, .probe = mv3310_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment