mirror of https://gitee.com/openkylin/linux.git
lan78xx: add ethtool set & get pause functions
Add ethtool operations of set_pauseram and get_pauseparm. Signed-off-by: Woojung Huh <woojung.huh@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e270b2dbd8
commit
349e0c5e22
|
@ -36,7 +36,7 @@
|
||||||
#define DRIVER_AUTHOR "WOOJUNG HUH <woojung.huh@microchip.com>"
|
#define DRIVER_AUTHOR "WOOJUNG HUH <woojung.huh@microchip.com>"
|
||||||
#define DRIVER_DESC "LAN78XX USB 3.0 Gigabit Ethernet Devices"
|
#define DRIVER_DESC "LAN78XX USB 3.0 Gigabit Ethernet Devices"
|
||||||
#define DRIVER_NAME "lan78xx"
|
#define DRIVER_NAME "lan78xx"
|
||||||
#define DRIVER_VERSION "1.0.2"
|
#define DRIVER_VERSION "1.0.3"
|
||||||
|
|
||||||
#define TX_TIMEOUT_JIFFIES (5 * HZ)
|
#define TX_TIMEOUT_JIFFIES (5 * HZ)
|
||||||
#define THROTTLE_JIFFIES (HZ / 8)
|
#define THROTTLE_JIFFIES (HZ / 8)
|
||||||
|
@ -281,6 +281,9 @@ struct lan78xx_net {
|
||||||
u32 chipid;
|
u32 chipid;
|
||||||
u32 chiprev;
|
u32 chiprev;
|
||||||
struct mii_bus *mdiobus;
|
struct mii_bus *mdiobus;
|
||||||
|
|
||||||
|
int fc_autoneg;
|
||||||
|
u8 fc_request_control;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* use ethtool to change the level for any given device */
|
/* use ethtool to change the level for any given device */
|
||||||
|
@ -902,11 +905,15 @@ static int lan78xx_update_flowcontrol(struct lan78xx_net *dev, u8 duplex,
|
||||||
{
|
{
|
||||||
u32 flow = 0, fct_flow = 0;
|
u32 flow = 0, fct_flow = 0;
|
||||||
int ret;
|
int ret;
|
||||||
|
u8 cap;
|
||||||
|
|
||||||
u8 cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv);
|
if (dev->fc_autoneg)
|
||||||
|
cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv);
|
||||||
|
else
|
||||||
|
cap = dev->fc_request_control;
|
||||||
|
|
||||||
if (cap & FLOW_CTRL_TX)
|
if (cap & FLOW_CTRL_TX)
|
||||||
flow = (FLOW_CR_TX_FCEN_ | 0xFFFF);
|
flow |= (FLOW_CR_TX_FCEN_ | 0xFFFF);
|
||||||
|
|
||||||
if (cap & FLOW_CTRL_RX)
|
if (cap & FLOW_CTRL_RX)
|
||||||
flow |= FLOW_CR_RX_FCEN_;
|
flow |= FLOW_CR_RX_FCEN_;
|
||||||
|
@ -1386,6 +1393,62 @@ static int lan78xx_set_settings(struct net_device *net, struct ethtool_cmd *cmd)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void lan78xx_get_pause(struct net_device *net,
|
||||||
|
struct ethtool_pauseparam *pause)
|
||||||
|
{
|
||||||
|
struct lan78xx_net *dev = netdev_priv(net);
|
||||||
|
struct phy_device *phydev = net->phydev;
|
||||||
|
struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
|
||||||
|
|
||||||
|
phy_ethtool_gset(phydev, &ecmd);
|
||||||
|
|
||||||
|
pause->autoneg = dev->fc_autoneg;
|
||||||
|
|
||||||
|
if (dev->fc_request_control & FLOW_CTRL_TX)
|
||||||
|
pause->tx_pause = 1;
|
||||||
|
|
||||||
|
if (dev->fc_request_control & FLOW_CTRL_RX)
|
||||||
|
pause->rx_pause = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int lan78xx_set_pause(struct net_device *net,
|
||||||
|
struct ethtool_pauseparam *pause)
|
||||||
|
{
|
||||||
|
struct lan78xx_net *dev = netdev_priv(net);
|
||||||
|
struct phy_device *phydev = net->phydev;
|
||||||
|
struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
phy_ethtool_gset(phydev, &ecmd);
|
||||||
|
|
||||||
|
if (pause->autoneg && !ecmd.autoneg) {
|
||||||
|
ret = -EINVAL;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
dev->fc_request_control = 0;
|
||||||
|
if (pause->rx_pause)
|
||||||
|
dev->fc_request_control |= FLOW_CTRL_RX;
|
||||||
|
|
||||||
|
if (pause->tx_pause)
|
||||||
|
dev->fc_request_control |= FLOW_CTRL_TX;
|
||||||
|
|
||||||
|
if (ecmd.autoneg) {
|
||||||
|
u32 mii_adv;
|
||||||
|
|
||||||
|
ecmd.advertising &= ~(ADVERTISED_Pause | ADVERTISED_Asym_Pause);
|
||||||
|
mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control);
|
||||||
|
ecmd.advertising |= mii_adv_to_ethtool_adv_t(mii_adv);
|
||||||
|
phy_ethtool_sset(phydev, &ecmd);
|
||||||
|
}
|
||||||
|
|
||||||
|
dev->fc_autoneg = pause->autoneg;
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
exit:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static const struct ethtool_ops lan78xx_ethtool_ops = {
|
static const struct ethtool_ops lan78xx_ethtool_ops = {
|
||||||
.get_link = lan78xx_get_link,
|
.get_link = lan78xx_get_link,
|
||||||
.nway_reset = lan78xx_nway_reset,
|
.nway_reset = lan78xx_nway_reset,
|
||||||
|
@ -1404,6 +1467,8 @@ static const struct ethtool_ops lan78xx_ethtool_ops = {
|
||||||
.set_wol = lan78xx_set_wol,
|
.set_wol = lan78xx_set_wol,
|
||||||
.get_eee = lan78xx_get_eee,
|
.get_eee = lan78xx_get_eee,
|
||||||
.set_eee = lan78xx_set_eee,
|
.set_eee = lan78xx_set_eee,
|
||||||
|
.get_pauseparam = lan78xx_get_pause,
|
||||||
|
.set_pauseparam = lan78xx_set_pause,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int lan78xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
|
static int lan78xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
|
||||||
|
@ -1591,6 +1656,7 @@ static void lan78xx_link_status_change(struct net_device *net)
|
||||||
static int lan78xx_phy_init(struct lan78xx_net *dev)
|
static int lan78xx_phy_init(struct lan78xx_net *dev)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
u32 mii_adv;
|
||||||
struct phy_device *phydev = dev->net->phydev;
|
struct phy_device *phydev = dev->net->phydev;
|
||||||
|
|
||||||
phydev = phy_find_first(dev->mdiobus);
|
phydev = phy_find_first(dev->mdiobus);
|
||||||
|
@ -1624,8 +1690,16 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
|
||||||
/* MAC doesn't support 1000T Half */
|
/* MAC doesn't support 1000T Half */
|
||||||
phydev->supported &= ~SUPPORTED_1000baseT_Half;
|
phydev->supported &= ~SUPPORTED_1000baseT_Half;
|
||||||
|
|
||||||
|
/* support both flow controls */
|
||||||
|
dev->fc_request_control = (FLOW_CTRL_RX | FLOW_CTRL_TX);
|
||||||
|
phydev->advertising &= ~(ADVERTISED_Pause | ADVERTISED_Asym_Pause);
|
||||||
|
mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control);
|
||||||
|
phydev->advertising |= mii_adv_to_ethtool_adv_t(mii_adv);
|
||||||
|
|
||||||
genphy_config_aneg(phydev);
|
genphy_config_aneg(phydev);
|
||||||
|
|
||||||
|
dev->fc_autoneg = phydev->autoneg;
|
||||||
|
|
||||||
phy_start(phydev);
|
phy_start(phydev);
|
||||||
|
|
||||||
netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
|
netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
|
||||||
|
|
Loading…
Reference in New Issue