Skip to content

Commit

Permalink
lan78xx: Create lan78xx_get_mdix_status() and lan78xx_set_mdix_status…
Browse files Browse the repository at this point in the history 
…() for MDIX control.

Create lan78xx_get_mdix_status() and lan78xx_set_mdix_status() for MDIX control.

Signed-off-by: Woojung Huh <woojung.huh@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Woojung.Huh@microchip.com authored and David S. Miller committed Sep 18, 2015
1 parent bdfba55 commit 758c5c1
Showing 1 changed file with 52 additions and 38 deletions.
90 changes: 52 additions & 38 deletions drivers/net/usb/lan78xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,55 @@ static void lan78xx_set_msglevel(struct net_device *net, u32 level)
dev->msg_enable = level;
}

static int lan78xx_get_mdix_status(struct net_device *net)
{
struct phy_device *phydev = net->phydev;
int buf;

phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS, LAN88XX_EXT_PAGE_SPACE_1);
buf = phy_read(phydev, LAN88XX_EXT_MODE_CTRL);
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS, LAN88XX_EXT_PAGE_SPACE_0);

return buf;
}

static void lan78xx_set_mdix_status(struct net_device *net, __u8 mdix_ctrl)
{
struct lan78xx_net *dev = netdev_priv(net);
struct phy_device *phydev = net->phydev;
int buf;

if (mdix_ctrl == ETH_TP_MDI) {
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_1);
buf = phy_read(phydev, LAN88XX_EXT_MODE_CTRL);
buf &= ~LAN88XX_EXT_MODE_CTRL_MDIX_MASK_;
phy_write(phydev, LAN88XX_EXT_MODE_CTRL,
buf | LAN88XX_EXT_MODE_CTRL_MDI_);
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_0);
} else if (mdix_ctrl == ETH_TP_MDI_X) {
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_1);
buf = phy_read(phydev, LAN88XX_EXT_MODE_CTRL);
buf &= ~LAN88XX_EXT_MODE_CTRL_MDIX_MASK_;
phy_write(phydev, LAN88XX_EXT_MODE_CTRL,
buf | LAN88XX_EXT_MODE_CTRL_MDI_X_);
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_0);
} else if (mdix_ctrl == ETH_TP_MDI_AUTO) {
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_1);
buf = phy_read(phydev, LAN88XX_EXT_MODE_CTRL);
buf &= ~LAN88XX_EXT_MODE_CTRL_MDIX_MASK_;
phy_write(phydev, LAN88XX_EXT_MODE_CTRL,
buf | LAN88XX_EXT_MODE_CTRL_AUTO_MDIX_);
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_0);
}
dev->mdix_ctrl = mdix_ctrl;
}

static int lan78xx_get_settings(struct net_device *net, struct ethtool_cmd *cmd)
{
struct lan78xx_net *dev = netdev_priv(net);
Expand All @@ -1188,9 +1237,7 @@ static int lan78xx_get_settings(struct net_device *net, struct ethtool_cmd *cmd)

ret = phy_ethtool_gset(phydev, cmd);

phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS, LAN88XX_EXT_PAGE_SPACE_1);
buf = phy_read(phydev, LAN88XX_EXT_MODE_CTRL);
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS, LAN88XX_EXT_PAGE_SPACE_0);
buf = lan78xx_get_mdix_status(net);

buf &= LAN88XX_EXT_MODE_CTRL_MDIX_MASK_;
if (buf == LAN88XX_EXT_MODE_CTRL_AUTO_MDIX_) {
Expand Down Expand Up @@ -1221,34 +1268,7 @@ static int lan78xx_set_settings(struct net_device *net, struct ethtool_cmd *cmd)
return ret;

if (dev->mdix_ctrl != cmd->eth_tp_mdix_ctrl) {
if (cmd->eth_tp_mdix_ctrl == ETH_TP_MDI) {
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_1);
temp = phy_read(phydev, LAN88XX_EXT_MODE_CTRL);
temp &= ~LAN88XX_EXT_MODE_CTRL_MDIX_MASK_;
phy_write(phydev, LAN88XX_EXT_MODE_CTRL,
temp | LAN88XX_EXT_MODE_CTRL_MDI_);
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_0);
} else if (cmd->eth_tp_mdix_ctrl == ETH_TP_MDI_X) {
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_1);
temp = phy_read(phydev, LAN88XX_EXT_MODE_CTRL);
temp &= ~LAN88XX_EXT_MODE_CTRL_MDIX_MASK_;
phy_write(phydev, LAN88XX_EXT_MODE_CTRL,
temp | LAN88XX_EXT_MODE_CTRL_MDI_X_);
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_0);
} else if (cmd->eth_tp_mdix_ctrl == ETH_TP_MDI_AUTO) {
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_1);
temp = phy_read(phydev, LAN88XX_EXT_MODE_CTRL);
temp &= ~LAN88XX_EXT_MODE_CTRL_MDIX_MASK_;
phy_write(phydev, LAN88XX_EXT_MODE_CTRL,
temp | LAN88XX_EXT_MODE_CTRL_AUTO_MDIX_);
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS,
LAN88XX_EXT_PAGE_SPACE_0);
}
lan78xx_set_mdix_status(net, cmd->eth_tp_mdix_ctrl);
}

/* change speed & duplex */
Expand Down Expand Up @@ -1504,13 +1524,7 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
}

/* set to AUTOMDIX */
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS, LAN88XX_EXT_PAGE_SPACE_1);
ret = phy_read(phydev, LAN88XX_EXT_MODE_CTRL);
ret &= ~LAN88XX_EXT_MODE_CTRL_MDIX_MASK_;
phy_write(phydev, LAN88XX_EXT_MODE_CTRL,
ret | LAN88XX_EXT_MODE_CTRL_AUTO_MDIX_);
phy_write(phydev, LAN88XX_EXT_PAGE_ACCESS, LAN88XX_EXT_PAGE_SPACE_0);
dev->mdix_ctrl = ETH_TP_MDI_AUTO;
lan78xx_set_mdix_status(dev->net, ETH_TP_MDI_AUTO);

/* MAC doesn't support 1000T Half */
phydev->supported &= ~SUPPORTED_1000baseT_Half;
Expand Down

0 comments on commit 758c5c1

Please sign in to comment.