aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-06-17 07:30:33 +0000
committerDavid S. Miller <davem@davemloft.net>2009-06-17 18:46:49 -0700
commitc0bad0f2e4366d5bbfe0c4a7a80bca8f4b05272b (patch)
tree183e29403c3e89d08524ee911c735fb3c40777e3
parentd104acaf0540aee527d22eafd14b0a3d30be7f81 (diff)
downloadlinux-2.6.34-ux500-c0bad0f2e4366d5bbfe0c4a7a80bca8f4b05272b.tar.gz
sky2: more receive shutdown
Reset more parts of the receive path when device is take offline. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/sky2.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 5de2a9063b2..e4e24ee00fb 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1151,7 +1151,14 @@ stopped:
/* reset the Rx prefetch unit */
sky2_write32(hw, Y2_QADDR(rxq, PREF_UNIT_CTRL), PREF_UNIT_RST_SET);
- mmiowb();
+
+ /* Reset the RAM Buffer receive queue */
+ sky2_write8(hw, RB_ADDR(rxq, RB_CTRL), RB_RST_SET);
+
+ /* Reset Rx MAC FIFO */
+ sky2_write8(hw, SK_REG(sky2->port, RX_GMF_CTRL_T), GMF_RST_SET);
+
+ sky2_read8(hw, B0_CTST);
}
/* Clean out receive buffer area, assumes receiver hardware stopped */