From: Stephen Hemminger <shemminger@linux-foundation.org>
To: Jeff Garzik <jeff@garzik.org>
Cc: netdev@vger.kernel.org
Subject: [PATCH 3/6] sky2: disable ASF on all chip types
Date: Wed, 11 Apr 2007 14:48:00 -0700 [thread overview]
Message-ID: <20070411214859.922360015@linux-foundation.org> (raw)
In-Reply-To: 20070411214757.194710334@linux-foundation.org
[-- Attachment #1: sky2-disable-asf.patch --]
[-- Type: text/plain, Size: 1316 bytes --]
Need to make sure and disable ASF on all chip types. Otherwise, there may be
random reboots.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
---
drivers/net/sky2.c | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
--- sky2-2.6.21.orig/drivers/net/sky2.c 2007-04-11 14:10:13.000000000 -0700
+++ sky2-2.6.21/drivers/net/sky2.c 2007-04-11 14:11:48.000000000 -0700
@@ -2542,16 +2542,14 @@ static void sky2_reset(struct sky2_hw *h
int i;
/* disable ASF */
- if (hw->chip_id <= CHIP_ID_YUKON_EC) {
- if (hw->chip_id == CHIP_ID_YUKON_EX) {
- status = sky2_read16(hw, HCU_CCSR);
- status &= ~(HCU_CCSR_AHB_RST | HCU_CCSR_CPU_RST_MODE |
- HCU_CCSR_UC_STATE_MSK);
- sky2_write16(hw, HCU_CCSR, status);
- } else
- sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET);
- sky2_write16(hw, B0_CTST, Y2_ASF_DISABLE);
- }
+ if (hw->chip_id == CHIP_ID_YUKON_EX) {
+ status = sky2_read16(hw, HCU_CCSR);
+ status &= ~(HCU_CCSR_AHB_RST | HCU_CCSR_CPU_RST_MODE |
+ HCU_CCSR_UC_STATE_MSK);
+ sky2_write16(hw, HCU_CCSR, status);
+ } else
+ sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET);
+ sky2_write16(hw, B0_CTST, Y2_ASF_DISABLE);
/* do a SW reset */
sky2_write8(hw, B0_CTST, CS_RST_SET);
--
Stephen Hemminger <shemminger@linux-foundation.org>
next prev parent reply other threads:[~2007-04-11 22:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-11 21:47 [PATCH 0/6] More sky2 patches for 2.6.21 Stephen Hemminger
2007-04-11 21:47 ` [PATCH 1/6] sky2: disable support for 88E8056 Stephen Hemminger
2007-04-19 19:03 ` Jeff Garzik
2007-04-11 21:47 ` [PATCH 2/6] sky2: handle descriptor errors Stephen Hemminger
2007-04-11 21:48 ` Stephen Hemminger [this message]
2007-04-11 21:48 ` [PATCH 4/6] sky2: EC-U performance and jumbo support Stephen Hemminger
2007-04-11 21:48 ` [PATCH 5/6] sky2: no jumbo on Yukon FE Stephen Hemminger
2007-04-11 21:48 ` [PATCH 6/6] sky2: version 1.14 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=20070411214859.922360015@linux-foundation.org \
--to=shemminger@linux-foundation.org \
--cc=jeff@garzik.org \
--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).