diff options
author | David S. Miller <davem@davemloft.net> | 2020-05-06 17:45:45 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-05-06 17:45:45 -0700 |
commit | 9e330bf469e02e64d46cb150a2ec65310b9412ea (patch) | |
tree | fc04060f03d67fca8157b07d648bd7113e6d914b /drivers/net/phy/phy.c | |
parent | Merge branch 'chcr-next' (diff) | |
parent | net: phy: tja11xx: add support for master-slave configuration (diff) | |
download | wireguard-linux-9e330bf469e02e64d46cb150a2ec65310b9412ea.tar.xz wireguard-linux-9e330bf469e02e64d46cb150a2ec65310b9412ea.zip |
Merge branch 'ethtool-master-slave'
Oleksij Rempel says:
====================
provide support for PHY master/slave configuration
changes v6:
- use NL_SET_ERR_MSG_ATTR in ethnl_update_linkmodes
- add sanity checks in the ioctl interface
- use bool for ethnl_validate_master_slave_cfg()
changes v5:
- set MASTER_SLAVE_CFG_UNSUPPORTED as default value
- send a netlink error message on validation error
- more code fixes
changes v4:
- rename port_mode to master_slave
- move validation code to net/ethtool/linkmodes.c
- add UNSUPPORTED state and avoid sending unsupported fields
- more formatting and naming fixes
- tja11xx: support only force mode
- tja11xx: mark state as unsupported
changes v3:
- provide separate field for config and state.
- make state rejected on set
- add validation
changes v2:
- change names. Use MASTER_PREFERRED instead of MULTIPORT
- configure master/slave only on request. Default configuration can be
provided by PHY or eeprom
- status and configuration to the user space.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy.c')
-rw-r--r-- | drivers/net/phy/phy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 72c69a9c8a98..8c22d02b4218 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -295,7 +295,7 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev, phydev->advertising, autoneg == AUTONEG_ENABLE); phydev->duplex = duplex; - + phydev->master_slave_set = cmd->base.master_slave_cfg; phydev->mdix_ctrl = cmd->base.eth_tp_mdix_ctrl; /* Restart the PHY */ @@ -314,6 +314,8 @@ void phy_ethtool_ksettings_get(struct phy_device *phydev, cmd->base.speed = phydev->speed; cmd->base.duplex = phydev->duplex; + cmd->base.master_slave_cfg = phydev->master_slave_get; + cmd->base.master_slave_state = phydev->master_slave_state; if (phydev->interface == PHY_INTERFACE_MODE_MOCA) cmd->base.port = PORT_BNC; else |