Commit acb8c5ae authored by Oleksij Rempel's avatar Oleksij Rempel Committed by David S. Miller
Browse files

net: phy: genphy_c45_pma_baset1_read_master_slave: read actual configuration 



Since MDIO_PMA_PMD_BT1_CTRL register shows actual configuration (and
forced state configuration is equal to the state), we should show
this configuration for ethtool.

Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b9a366f3

drivers/net/phy/phy-c45.c

+6 −2
Original line number Diff line number Diff line
@@ -560,15 +560,19 @@ int genphy_c45_pma_baset1_read_master_slave(struct phy_device *phydev) 
	int val;



	phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN;

	phydev->master_slave_get = MASTER_SLAVE_CFG_UNKNOWN;



	val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_PMD_BT1_CTRL);

	if (val < 0)

		return val;



	if (val & MDIO_PMA_PMD_BT1_CTRL_CFG_MST)

	if (val & MDIO_PMA_PMD_BT1_CTRL_CFG_MST) {

		phydev->master_slave_get = MASTER_SLAVE_CFG_MASTER_FORCE;

		phydev->master_slave_state = MASTER_SLAVE_STATE_MASTER;

	else

	} else {

		phydev->master_slave_get = MASTER_SLAVE_CFG_SLAVE_FORCE;

		phydev->master_slave_state = MASTER_SLAVE_STATE_SLAVE;

	}



	return 0;

}