driver/net/skge.c: restart the interface when it's options or pauseparam is set
Subsystems (2)
PATCH 10/21 driver/net/skge.c: restart the interface when it's options or pauseparam is set
From: "Xiaoming.Zhang" <[email protected]>
We have an issue of the skge driver: The card won't work when it's options are changed. Here's the hardware info:
# lspci -v
05:04.0 Ethernet controller: Marvell Technology Group Ltd. 88E8001 Gigabit Ethernet Controller (rev 13)
Subsystem: Marvell Technology Group Ltd. Marvell RDK-8001
Flags: bus master, 66MHz, medium devsel, latency 32, IRQ 16
Memory at d042c000 (32-bit, non-prefetchable) [size=16K]
I/O ports at d000 [size=256]
[virtual] Expansion ROM at 20400000 [disabled] [size=128K]
Capabilities: [48] Power Management version 2
Capabilities: [50] Vital Product DataThe happens in both Linux-2.6.26(skge version 1.23) and RHEL5.2(skge version 1.6).
For example, at first it is set to "speed 1000 duplex full auto-neg on" and it works, then run
ethtool -s <ethx> autoneg off
or ethtool -s <ethx> speed 100 duplex full autoneg off
Then it will stop working. After that if we restart the interface:
ifconifg <ethx> down
ifconfig <ethx> up
It will work again. And `ethtool -A' has the same issue.
So we think after setting the options, the interface should be restarted.
---
drivers/net/skge.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/skge.c renamed from drivers/net/skge.c~driver-net-skgec-restart-the-interface-when-its-options-or-pauseparam-is-set +8 -4
@@ -353,8 +353,10 @@ static int skge_set_settings(struct net_ skge->autoneg = ecmd->autoneg; skge->advertising = ecmd->advertising; -if (netif_running (dev)) -skge_phy_reset (skge); +if (netif_running (dev)) { +skge_down (dev); +skge_up (dev); + }return (0 ); }
@@ -595,8 +597,10 @@ static int skge_set_pauseparam(struct ne skge->flow_control =FLOW_MODE_NONE ; } -if (netif_running (dev)) -skge_phy_reset (skge); +if (netif_running (dev)) { +skge_down (dev); +skge_up (dev); + }return 0 ; }
_
Quoted 29 lines · On Mon, 22 Sep 2008 14:52:17 -0700 [email protected] wrote:
From: "Xiaoming.Zhang" <[email protected]>
We have an issue of the skge driver: The card won't work when it's options are changed. Here's the hardware info:
# lspci -v 05:04.0 Ethernet controller: Marvell Technology Group Ltd. 88E8001 Gigabit Ethernet Controller (rev 13) Subsystem: Marvell Technology Group Ltd. Marvell RDK-8001 Flags: bus master, 66MHz, medium devsel, latency 32, IRQ 16 Memory at d042c000 (32-bit, non-prefetchable) [size=16K] I/O ports at d000 [size=256] [virtual] Expansion ROM at 20400000 [disabled] [size=128K] Capabilities: [48] Power Management version 2 Capabilities: [50] Vital Product DataThe happens in both Linux-2.6.26(skge version 1.23) and RHEL5.2(skge version 1.6).
For example, at first it is set to "speed 1000 duplex full auto-neg on" and it works, then run
ethtool -s <ethx> autoneg off
or ethtool -s <ethx> speed 100 duplex full autoneg offThen it will stop working. After that if we restart the interface:
ifconifg <ethx> down
ifconfig <ethx> up
Quoted 8 lines
It will work again. And `ethtool -A' has the same issue.
So we think after setting the options, the interface should be restarted.
Signed-off-by Zhang Xiaoming <[email protected]>Cc Stephen Hemminger <[email protected]>Cc Jeff Garzik <[email protected]>Signed-off-by Andrew Morton <[email protected]>
Looks correct, don't have time or hardware setup right now to verify further.
Quoted 61 lines · On Mon, 22 Sep 2008 14:52:17 -0700 [email protected] wrote:
From: "Xiaoming.Zhang" <[email protected]>
We have an issue of the skge driver: The card won't work when it's options are changed. Here's the hardware info:
# lspci -v 05:04.0 Ethernet controller: Marvell Technology Group Ltd. 88E8001 Gigabit Ethernet Controller (rev 13) Subsystem: Marvell Technology Group Ltd. Marvell RDK-8001 Flags: bus master, 66MHz, medium devsel, latency 32, IRQ 16 Memory at d042c000 (32-bit, non-prefetchable) [size=16K] I/O ports at d000 [size=256] [virtual] Expansion ROM at 20400000 [disabled] [size=128K] Capabilities: [48] Power Management version 2 Capabilities: [50] Vital Product DataThe happens in both Linux-2.6.26(skge version 1.23) and RHEL5.2(skge version 1.6).
For example, at first it is set to "speed 1000 duplex full auto-neg on" and it works, then run
ethtool -s <ethx> autoneg off
or ethtool -s <ethx> speed 100 duplex full autoneg offThen it will stop working. After that if we restart the interface:
ifconifg <ethx> down
ifconfig <ethx> upIt will work again. And `ethtool -A' has the same issue.
So we think after setting the options, the interface should be restarted.
Signed-off-by Zhang Xiaoming <[email protected]>Cc Stephen Hemminger <[email protected]>Cc Jeff Garzik <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/net/skge.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)diff -puN
drivers/net/skge.c~driver-net-skgec-restart-the-interface-when-its-options-or-pauseparam-is-setdrivers/net/skge.cdrivers/net/skge.c renamed from drivers/net/skge.c~driver-net-skgec-restart-the-interface-when-its-options-or-pauseparam-is-set +4
-2@@ -353,8 +353,10 @@ static int skge_set_settings(struct net_ skge->autoneg = ecmd->autoneg; skge->advertising = ecmd->advertising; -if (netif_running (dev)) -skge_phy_reset (skge); +if (netif_running (dev)) { +skge_down (dev); +skge_up (dev); + }return (0 ); }@@ -595,8 +597,10 @@ static int skge_set_pauseparam(struct ne skge->flow_control =FLOW_MODE_NONE ; }
drivers/net/skge.c static int skge_set_pauseparam(struct ne · line 606
Quoted 10 lines
drivers/net/skge.c renamed from drivers/net/skge.c~driver-net-skgec-restart-the-interface-when-its-options-or-pauseparam-is-set +4
-2-if (netif_running (dev)) -skge_phy_reset (skge); +if (netif_running (dev)) { +skge_down (dev); +skge_up (dev); + }return 0 ; }
Since skge_up can fail because of out of memory, this code needs to check the return value. And then if it fails the "limbo state" needs to be handled in skge_down.
Quoted 74 lines · Stephen Hemminger
On Mon, 22 Sep 2008 14:52:17 -0700
Quoted 71 lines · [email protected] wrote:
From: "Xiaoming.Zhang" <[email protected]>
We have an issue of the skge driver: The card won't work when it's options are changed. Here's the hardware info:
# lspci -v 05:04.0 Ethernet controller: Marvell Technology Group Ltd. 88E8001 Gigabit Ethernet Controller (rev 13) Subsystem: Marvell Technology Group Ltd. Marvell RDK-8001 Flags: bus master, 66MHz, medium devsel, latency 32, IRQ 16 Memory at d042c000 (32-bit, non-prefetchable) [size=16K] I/O ports at d000 [size=256] [virtual] Expansion ROM at 20400000 [disabled] [size=128K] Capabilities: [48] Power Management version 2 Capabilities: [50] Vital Product DataThe happens in both Linux-2.6.26(skge version 1.23) and RHEL5.2(skge version 1.6).
For example, at first it is set to "speed 1000 duplex full auto-neg on" and it works, then run
ethtool -s <ethx> autoneg off
or ethtool -s <ethx> speed 100 duplex full autoneg offThen it will stop working. After that if we restart the interface:
ifconifg <ethx> down
ifconfig <ethx> upIt will work again. And `ethtool -A' has the same issue.
So we think after setting the options, the interface should be restarted.
Signed-off-by Zhang Xiaoming <[email protected]>Cc Stephen Hemminger <[email protected]>Cc Jeff Garzik <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/net/skge.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)diff -puN
drivers/net/skge.c~driver-net-skgec-restart-the-interface-when-its-options-or-pauseparam-is-setdrivers/net/skge.c--- a/drivers/net/skge.c~driver-net-skgec-restart-the-interface-when-its-opti ons-or-pauseparam-is-set +++a/drivers/net/skge.c(quoted diff) +8
-4@@ -353,8 +353,10 @@ static int skge_set_settings(struct net_ skge->autoneg = ecmd->autoneg; skge->advertising = ecmd->advertising; - if (netif_running(dev)) - skge_phy_reset(skge); + if (netif_running(dev)) { + skge_down(dev); + skge_up(dev); + } return (0); }@@ -595,8 +597,10 @@ static int skge_set_pauseparam(struct ne skge->flow_control = FLOW_MODE_NONE; } - if (netif_running(dev)) - skge_phy_reset(skge); + if (netif_running(dev)) { + skge_down(dev); + skge_up(dev); + }
Quoted 6 lines
Review static int skge_set_pauseparam(struct ne · line 606
Quoted 2 lines
(quoted diff) +0
-0return 0; }Since
skge_upcan fail because of out of memory, this code needs to check the return value. And then if it fails the "limbo state" needs to be handled inskge_down.
How about like this? It is tested.
Thank you.
net/skge.c renamed from net/skge.c.orig +18 -4
@@ -319,6 +319,7 @@ static int skge_set_settings(struct net_struct skge_port *skge =netdev_priv (dev);const struct skge_hw *hw = skge->hw;u32 supported =skge_supported_modes (hw); +int err =0 ;if (ecmd->autoneg ==AUTONEG_ENABLE ) { ecmd->advertising = supported;
@@ -367,8 +368,14 @@ static int skge_set_settings(struct net_ skge->autoneg = ecmd->autoneg; skge->advertising = ecmd->advertising; -if (netif_running (dev)) -skge_phy_reset (skge); +if (netif_running (dev)) { +skge_down (dev); + err =skge_up (dev); +if (err) { +dev_close (dev); +return err; + } + }return (0 ); }
@@ -593,6 +600,7 @@ static int skge_set_pauseparam(struct ne {struct skge_port *skge =netdev_priv (dev);struct ethtool_pauseparam old; +int err =0 ;skge_get_pauseparam (dev, &old);
@@ -609,8 +617,14 @@ static int skge_set_pauseparam(struct ne skge->flow_control =FLOW_MODE_NONE ; } -if (netif_running (dev)) -skge_phy_reset (skge); +if (netif_running (dev)) { +skge_down (dev); + err =skge_up (dev); +if (err) { +dev_close (dev); +return err; + } + }return 0 ; }
Signature · 2 lines
Have fun, Xiaoming (Mark) Zhang
net/skge.c renamed from net/skge.c.orig +18 -4
@@ -319,6 +319,7 @@ static int skge_set_settings(struct net_struct skge_port *skge =netdev_priv (dev);const struct skge_hw *hw = skge->hw;u32 supported =skge_supported_modes (hw); +int err =0 ;if (ecmd->autoneg ==AUTONEG_ENABLE ) { ecmd->advertising = supported;
@@ -367,8 +368,14 @@ static int skge_set_settings(struct net_ skge->autoneg = ecmd->autoneg; skge->advertising = ecmd->advertising; -if (netif_running (dev)) -skge_phy_reset (skge); +if (netif_running (dev)) { +skge_down (dev); + err =skge_up (dev); +if (err) { +dev_close (dev); +return err; + } + }return (0 ); }
@@ -593,6 +600,7 @@ static int skge_set_pauseparam(struct ne {struct skge_port *skge =netdev_priv (dev);struct ethtool_pauseparam old; +int err =0 ;skge_get_pauseparam (dev, &old);
@@ -609,8 +617,14 @@ static int skge_set_pauseparam(struct ne skge->flow_control =FLOW_MODE_NONE ; } -if (netif_running (dev)) -skge_phy_reset (skge); +if (netif_running (dev)) { +skge_down (dev); + err =skge_up (dev); +if (err) { +dev_close (dev); +return err; + } + }return 0 ; }