From 157e717c6810a326e6ac36a7224ab41b4cc6f49e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 26 Nov 2007 11:54:50 -0800 Subject: [PATCH] --- yaml --- r: 74471 b: refs/heads/master c: 799b21d2bddd43145130e509efb92339eabafef9 h: refs/heads/master i: 74469: 78414a860358b2e812751850479ac712db85557e 74467: d5994910b4935bc8cfeb3a7717adbab0b53599fb 74463: b56692d7bc2d485084e506db8106d6b900d4a9a3 v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index c1095d3f99f7..d4efa035e760 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d08b9bdf0264a8134677373f97641712062c603f +refs/heads/master: 799b21d2bddd43145130e509efb92339eabafef9 diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index 82edf44b9e2a..b680cb08e9ce 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/drivers/net/skge.c @@ -1713,7 +1713,7 @@ static void genesis_stop(struct skge_port *skge) { struct skge_hw *hw = skge->hw; int port = skge->port; - u32 reg; + unsigned retries = 1000; genesis_reset(hw, port); @@ -1721,20 +1721,17 @@ static void genesis_stop(struct skge_port *skge) skge_write16(hw, B3_PA_CTRL, port == 0 ? PA_CLR_TO_TX1 : PA_CLR_TO_TX2); - /* - * If the transfer sticks at the MAC the STOP command will not - * terminate if we don't flush the XMAC's transmit FIFO ! - */ - xm_write32(hw, port, XM_MODE, - xm_read32(hw, port, XM_MODE)|XM_MD_FTF); - - /* Reset the MAC */ - skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_SET_MAC_RST); + skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_CLR_MAC_RST); + do { + skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_SET_MAC_RST); + if (!(skge_read16(hw, SK_REG(port, TX_MFF_CTRL1)) & MFF_SET_MAC_RST)) + break; + } while (--retries > 0); /* For external PHYs there must be special handling */ if (hw->phy_type != SK_PHY_XMAC) { - reg = skge_read32(hw, B2_GP_IO); + u32 reg = skge_read32(hw, B2_GP_IO); if (port == 0) { reg |= GP_DIR_0; reg &= ~GP_IO_0;