[PATCH] e1000: Synchronize phy access between stats update and MII_IOCTL
Synchronize phy access between stats update and MII_IOCTL Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
This commit is contained in:
parent
0685c31b58
commit
97876fc66f
1 changed files with 26 additions and 10 deletions
|
@ -3376,6 +3376,7 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
|
||||||
int retval;
|
int retval;
|
||||||
uint16_t mii_reg;
|
uint16_t mii_reg;
|
||||||
uint16_t spddplx;
|
uint16_t spddplx;
|
||||||
|
unsigned long flags;
|
||||||
|
|
||||||
if(adapter->hw.media_type != e1000_media_type_copper)
|
if(adapter->hw.media_type != e1000_media_type_copper)
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
@ -3385,22 +3386,29 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
|
||||||
data->phy_id = adapter->hw.phy_addr;
|
data->phy_id = adapter->hw.phy_addr;
|
||||||
break;
|
break;
|
||||||
case SIOCGMIIREG:
|
case SIOCGMIIREG:
|
||||||
if (!capable(CAP_NET_ADMIN))
|
if(!capable(CAP_NET_ADMIN))
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
if (e1000_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,
|
spin_lock_irqsave(&adapter->stats_lock, flags);
|
||||||
&data->val_out))
|
if(e1000_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,
|
||||||
|
&data->val_out)) {
|
||||||
|
spin_unlock_irqrestore(&adapter->stats_lock, flags);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
}
|
||||||
|
spin_unlock_irqrestore(&adapter->stats_lock, flags);
|
||||||
break;
|
break;
|
||||||
case SIOCSMIIREG:
|
case SIOCSMIIREG:
|
||||||
if (!capable(CAP_NET_ADMIN))
|
if(!capable(CAP_NET_ADMIN))
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
if (data->reg_num & ~(0x1F))
|
if(data->reg_num & ~(0x1F))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
mii_reg = data->val_in;
|
mii_reg = data->val_in;
|
||||||
if (e1000_write_phy_reg(&adapter->hw, data->reg_num,
|
spin_lock_irqsave(&adapter->stats_lock, flags);
|
||||||
mii_reg))
|
if(e1000_write_phy_reg(&adapter->hw, data->reg_num,
|
||||||
|
mii_reg)) {
|
||||||
|
spin_unlock_irqrestore(&adapter->stats_lock, flags);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
if (adapter->hw.phy_type == e1000_phy_m88) {
|
}
|
||||||
|
if(adapter->hw.phy_type == e1000_phy_m88) {
|
||||||
switch (data->reg_num) {
|
switch (data->reg_num) {
|
||||||
case PHY_CTRL:
|
case PHY_CTRL:
|
||||||
if(mii_reg & MII_CR_POWER_DOWN)
|
if(mii_reg & MII_CR_POWER_DOWN)
|
||||||
|
@ -3420,8 +3428,12 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
|
||||||
HALF_DUPLEX;
|
HALF_DUPLEX;
|
||||||
retval = e1000_set_spd_dplx(adapter,
|
retval = e1000_set_spd_dplx(adapter,
|
||||||
spddplx);
|
spddplx);
|
||||||
if(retval)
|
if(retval) {
|
||||||
|
spin_unlock_irqrestore(
|
||||||
|
&adapter->stats_lock,
|
||||||
|
flags);
|
||||||
return retval;
|
return retval;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(netif_running(adapter->netdev)) {
|
if(netif_running(adapter->netdev)) {
|
||||||
e1000_down(adapter);
|
e1000_down(adapter);
|
||||||
|
@ -3431,8 +3443,11 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
|
||||||
break;
|
break;
|
||||||
case M88E1000_PHY_SPEC_CTRL:
|
case M88E1000_PHY_SPEC_CTRL:
|
||||||
case M88E1000_EXT_PHY_SPEC_CTRL:
|
case M88E1000_EXT_PHY_SPEC_CTRL:
|
||||||
if (e1000_phy_reset(&adapter->hw))
|
if(e1000_phy_reset(&adapter->hw)) {
|
||||||
|
spin_unlock_irqrestore(
|
||||||
|
&adapter->stats_lock, flags);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -3448,6 +3463,7 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
spin_unlock_irqrestore(&adapter->stats_lock, flags);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
Reference in a new issue