Patchwork sky2: revert shutdown changes

login
register
mail settings
Submitter stephen hemminger
Date July 16, 2009, 11:20 p.m.
Message ID <20090716162057.20cd3ef1@nehalam>
Download mbox | patch
Permalink /patch/29890/
State Accepted
Delegated to: David Miller
Headers show

Comments

stephen hemminger - July 16, 2009, 11:20 p.m.
The commit changes to shutdown path broke startup on some systems.

revert commit c0bad0f2e4366d5bbfe0c4a7a80bca8f4b05272b

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

---
 drivers/net/sky2.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - July 17, 2009, 1:10 a.m.
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 16 Jul 2009 16:20:57 -0700

> The commit changes to shutdown path broke startup on some systems.
> 
> revert commit c0bad0f2e4366d5bbfe0c4a7a80bca8f4b05272b
> 
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/drivers/net/sky2.c	2009-07-07 18:06:44.485898870 -0700
+++ b/drivers/net/sky2.c	2009-07-07 18:14:10.587041228 -0700
@@ -1151,14 +1151,7 @@  stopped:
 
 	/* reset the Rx prefetch unit */
 	sky2_write32(hw, Y2_QADDR(rxq, PREF_UNIT_CTRL), PREF_UNIT_RST_SET);
-
-	/* 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);
+	mmiowb();
 }
 
 /* Clean out receive buffer area, assumes receiver hardware stopped */