Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 00:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net/igb/e1000/e1000e: more robust ethtool duplex/speed configuration

Browse Source 
This makes sure that one cannot request a 99Mbps full-duplex and get a
100Mbps half-duplex configuration in return due to the way the
speed/duplex parameters are handled internally.

Tested: e1000 works
Signed-off-by: David Decotigny <decot@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Decotigny 2011-04-27 18:32:43 +00:00 committed by David S. Miller
parent fbef7139a8
commit 14ad2513ed
7 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/e1000/e1000.h
View File

@ -349,7 +349,7 @@ extern int e1000_up(struct e1000_adapter *adapter);
extern void e1000_down(struct e1000_adapter *adapter); extern void e1000_down(struct e1000_adapter *adapter);
extern void e1000_reinit_locked(struct e1000_adapter *adapter); extern void e1000_reinit_locked(struct e1000_adapter *adapter);
extern void e1000_reset(struct e1000_adapter *adapter); extern void e1000_reset(struct e1000_adapter *adapter);
extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx); extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx);
extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter); extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter); extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter); extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);

2
drivers/net/e1000/e1000_ethtool.c
View File

@ -199,7 +199,7 @@ static int e1000_set_settings(struct net_device *netdev,
ecmd->advertising = hw->autoneg_advertised; ecmd->advertising = hw->autoneg_advertised;
} else { } else {
u32 speed = ethtool_cmd_speed(ecmd); u32 speed = ethtool_cmd_speed(ecmd);
if (e1000_set_spd_dplx(adapter, speed + ecmd->duplex)) { if (e1000_set_spd_dplx(adapter, speed, ecmd->duplex)) {
clear_bit(__E1000_RESETTING, &adapter->flags); clear_bit(__E1000_RESETTING, &adapter->flags);
return -EINVAL; return -EINVAL;
} }

42
drivers/net/e1000/e1000_main.c
View File

@ -96,7 +96,6 @@ int e1000_up(struct e1000_adapter *adapter);
void e1000_down(struct e1000_adapter *adapter); void e1000_down(struct e1000_adapter *adapter);
void e1000_reinit_locked(struct e1000_adapter *adapter); void e1000_reinit_locked(struct e1000_adapter *adapter);
void e1000_reset(struct e1000_adapter *adapter); void e1000_reset(struct e1000_adapter *adapter);
int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx);
int e1000_setup_all_tx_resources(struct e1000_adapter *adapter); int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
int e1000_setup_all_rx_resources(struct e1000_adapter *adapter); int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
void e1000_free_all_tx_resources(struct e1000_adapter *adapter); void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
@ -4385,7 +4384,6 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
struct mii_ioctl_data *data = if_mii(ifr); struct mii_ioctl_data *data = if_mii(ifr);
int retval; int retval;
u16 mii_reg; u16 mii_reg;
u16 spddplx;
unsigned long flags; unsigned long flags;
if (hw->media_type != e1000_media_type_copper) if (hw->media_type != e1000_media_type_copper)
@ -4424,17 +4422,18 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
hw->autoneg = 1; hw->autoneg = 1;
hw->autoneg_advertised = 0x2F; hw->autoneg_advertised = 0x2F;
} else { } else {
u32 speed;
if (mii_reg & 0x40) if (mii_reg & 0x40)
spddplx = SPEED_1000; speed = SPEED_1000;
else if (mii_reg & 0x2000) else if (mii_reg & 0x2000)
spddplx = SPEED_100; speed = SPEED_100;
else else
spddplx = SPEED_10; speed = SPEED_10;
spddplx += (mii_reg & 0x100) retval = e1000_set_spd_dplx(
? DUPLEX_FULL : adapter, speed,
DUPLEX_HALF; ((mii_reg & 0x100)
retval = e1000_set_spd_dplx(adapter, ? DUPLEX_FULL :
spddplx); DUPLEX_HALF));
if (retval) if (retval)
return retval; return retval;
} }
@ -4596,20 +4595,24 @@ static void e1000_restore_vlan(struct e1000_adapter *adapter)
} }
} }
int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx) int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx)
{ {
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
hw->autoneg = 0; hw->autoneg = 0;
/* Make sure dplx is at most 1 bit and lsb of speed is not set
* for the switch() below to work */
if ((spd & 1) || (dplx & ~1))
goto err_inval;
/* Fiber NICs only allow 1000 gbps Full duplex */ /* Fiber NICs only allow 1000 gbps Full duplex */
if ((hw->media_type == e1000_media_type_fiber) && if ((hw->media_type == e1000_media_type_fiber) &&
spddplx != (SPEED_1000 + DUPLEX_FULL)) { spd != SPEED_1000 &&
e_err(probe, "Unsupported Speed/Duplex configuration\n"); dplx != DUPLEX_FULL)
return -EINVAL; goto err_inval;
}
switch (spddplx) { switch (spd + dplx) {
case SPEED_10 + DUPLEX_HALF: case SPEED_10 + DUPLEX_HALF:
hw->forced_speed_duplex = e1000_10_half; hw->forced_speed_duplex = e1000_10_half;
break; break;
@ -4628,10 +4631,13 @@ int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
break; break;
case SPEED_1000 + DUPLEX_HALF: /* not supported */ case SPEED_1000 + DUPLEX_HALF: /* not supported */
default: default:
e_err(probe, "Unsupported Speed/Duplex configuration\n"); goto err_inval;
return -EINVAL;
} }
return 0; return 0;
err_inval:
e_err(probe, "Unsupported Speed/Duplex configuration\n");
return -EINVAL;
} }
static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake) static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)

24
drivers/net/e1000e/ethtool.c
View File

@ -200,20 +200,25 @@ static int e1000_get_settings(struct net_device *netdev,
return 0; return 0;
} }
static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx) static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx)
{ {
struct e1000_mac_info *mac = &adapter->hw.mac; struct e1000_mac_info *mac = &adapter->hw.mac;
mac->autoneg = 0; mac->autoneg = 0;
/* Make sure dplx is at most 1 bit and lsb of speed is not set
* for the switch() below to work */
if ((spd & 1) || (dplx & ~1))
goto err_inval;
/* Fiber NICs only allow 1000 gbps Full duplex */ /* Fiber NICs only allow 1000 gbps Full duplex */
if ((adapter->hw.phy.media_type == e1000_media_type_fiber) && if ((adapter->hw.phy.media_type == e1000_media_type_fiber) &&
spddplx != (SPEED_1000 + DUPLEX_FULL)) { spd != SPEED_1000 &&
e_err("Unsupported Speed/Duplex configuration\n"); dplx != DUPLEX_FULL) {
return -EINVAL; goto err_inval;
} }
switch (spddplx) { switch (spd + dplx) {
case SPEED_10 + DUPLEX_HALF: case SPEED_10 + DUPLEX_HALF:
mac->forced_speed_duplex = ADVERTISE_10_HALF; mac->forced_speed_duplex = ADVERTISE_10_HALF;
break; break;
@ -232,10 +237,13 @@ static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
break; break;
case SPEED_1000 + DUPLEX_HALF: /* not supported */ case SPEED_1000 + DUPLEX_HALF: /* not supported */
default: default:
e_err("Unsupported Speed/Duplex configuration\n"); goto err_inval;
return -EINVAL;
} }
return 0; return 0;
err_inval:
e_err("Unsupported Speed/Duplex configuration\n");
return -EINVAL;
} }
static int e1000_set_settings(struct net_device *netdev, static int e1000_set_settings(struct net_device *netdev,
@ -272,7 +280,7 @@ static int e1000_set_settings(struct net_device *netdev,
hw->fc.requested_mode = e1000_fc_default; hw->fc.requested_mode = e1000_fc_default;
} else { } else {
u32 speed = ethtool_cmd_speed(ecmd); u32 speed = ethtool_cmd_speed(ecmd);
if (e1000_set_spd_dplx(adapter, speed + ecmd->duplex)) { if (e1000_set_spd_dplx(adapter, speed, ecmd->duplex)) {
clear_bit(__E1000_RESETTING, &adapter->state); clear_bit(__E1000_RESETTING, &adapter->state);
return -EINVAL; return -EINVAL;
} }

2
drivers/net/igb/igb.h
View File

@ -360,7 +360,7 @@ extern int igb_up(struct igb_adapter *);
extern void igb_down(struct igb_adapter *); extern void igb_down(struct igb_adapter *);
extern void igb_reinit_locked(struct igb_adapter *); extern void igb_reinit_locked(struct igb_adapter *);
extern void igb_reset(struct igb_adapter *); extern void igb_reset(struct igb_adapter *);
extern int igb_set_spd_dplx(struct igb_adapter *, u16); extern int igb_set_spd_dplx(struct igb_adapter *, u32, u8);
extern int igb_setup_tx_resources(struct igb_ring *); extern int igb_setup_tx_resources(struct igb_ring *);
extern int igb_setup_rx_resources(struct igb_ring *); extern int igb_setup_rx_resources(struct igb_ring *);
extern void igb_free_tx_resources(struct igb_ring *); extern void igb_free_tx_resources(struct igb_ring *);

2
drivers/net/igb/igb_ethtool.c
View File

@ -224,7 +224,7 @@ static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
hw->fc.requested_mode = e1000_fc_default; hw->fc.requested_mode = e1000_fc_default;
} else { } else {
u32 speed = ethtool_cmd_speed(ecmd); u32 speed = ethtool_cmd_speed(ecmd);
if (igb_set_spd_dplx(adapter, speed + ecmd->duplex)) { if (igb_set_spd_dplx(adapter, speed, ecmd->duplex)) {
clear_bit(__IGB_RESETTING, &adapter->state); clear_bit(__IGB_RESETTING, &adapter->state);
return -EINVAL; return -EINVAL;
} }

23
drivers/net/igb/igb_main.c
View File

@ -6349,21 +6349,25 @@ static void igb_restore_vlan(struct igb_adapter *adapter)
} }
} }
int igb_set_spd_dplx(struct igb_adapter *adapter, u16 spddplx) int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx)
{ {
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
struct e1000_mac_info *mac = &adapter->hw.mac; struct e1000_mac_info *mac = &adapter->hw.mac;
mac->autoneg = 0; mac->autoneg = 0;
/* Make sure dplx is at most 1 bit and lsb of speed is not set
* for the switch() below to work */
if ((spd & 1) || (dplx & ~1))
goto err_inval;
/* Fiber NIC's only allow 1000 Gbps Full duplex */ /* Fiber NIC's only allow 1000 Gbps Full duplex */
if ((adapter->hw.phy.media_type == e1000_media_type_internal_serdes) && if ((adapter->hw.phy.media_type == e1000_media_type_internal_serdes) &&
spddplx != (SPEED_1000 + DUPLEX_FULL)) { spd != SPEED_1000 &&
dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration\n"); dplx != DUPLEX_FULL)
return -EINVAL; goto err_inval;
}
switch (spddplx) { switch (spd + dplx) {
case SPEED_10 + DUPLEX_HALF: case SPEED_10 + DUPLEX_HALF:
mac->forced_speed_duplex = ADVERTISE_10_HALF; mac->forced_speed_duplex = ADVERTISE_10_HALF;
break; break;
@ -6382,10 +6386,13 @@ int igb_set_spd_dplx(struct igb_adapter *adapter, u16 spddplx)
break; break;
case SPEED_1000 + DUPLEX_HALF: /* not supported */ case SPEED_1000 + DUPLEX_HALF: /* not supported */
default: default:
dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration\n"); goto err_inval;
return -EINVAL;
} }
return 0; return 0;
err_inval:
dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration\n");
return -EINVAL;
} }
static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake) static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake)