From: Stephen Hemminger <shemminger@linux-foundation.org>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: netdev@vger.kernel.org
Subject: [PATCH 3/6] skge: retry on MAC shutdown
Date: Mon, 26 Nov 2007 11:54:50 -0800 [thread overview]
Message-ID: <20071126195557.657291575@linux-foundation.org> (raw)
In-Reply-To: 20071126195447.846382144@linux-foundation.org
[-- Attachment #1: skge-stopping-retry.patch --]
[-- Type: text/plain, Size: 1469 bytes --]
Make sure and retry when shutting down the MAC. This code is copied
from sk98lin driver.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
--- a/drivers/net/skge.c 2007-11-21 14:40:58.000000000 -0800
+++ b/drivers/net/skge.c 2007-11-21 14:44:02.000000000 -0800
@@ -1713,7 +1713,7 @@ static void genesis_stop(struct skge_por
{
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_por
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;
--
Stephen Hemminger <shemminger@linux-foundation.org>
next prev parent reply other threads:[~2007-11-26 20:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-26 19:54 [PATCH 0/6] skge update (for 2.6.24) Stephen Hemminger
2007-11-26 19:54 ` [PATCH 1/6] skge: FIFO Ram calculation error Stephen Hemminger
2007-12-01 21:33 ` Jeff Garzik
2007-11-26 19:54 ` [PATCH 2/6] skge: receive flush logic Stephen Hemminger
2007-11-26 19:54 ` Stephen Hemminger [this message]
2007-11-26 19:54 ` [PATCH 4/6] skge: fiber link up/down fix Stephen Hemminger
2007-11-26 19:54 ` [PATCH 5/6] skge: increase TX threshold for Jumbo Stephen Hemminger
2007-11-26 19:54 ` [PATCH 6/6] skge version 1.13 Stephen Hemminger
2007-11-28 22:23 ` [PATCH 1/2] skge: serial mode register values Stephen Hemminger
2007-11-28 22:25 ` [PATCH 2/2] skge: MTU changing fix Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071126195557.657291575@linux-foundation.org \
--to=shemminger@linux-foundation.org \
--cc=jgarzik@pobox.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).