From: Stephen Hemminger <shemminger@osdl.org>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: netdev@vger.kernel.org
Subject: [PATCH 3/5] sky2: more fixes for Yukon Ultra
Date: Wed, 17 May 2006 14:37:05 -0700 [thread overview]
Message-ID: <20060517213802.260158000@localhost.localdomain> (raw)
In-Reply-To: 20060517213702.322762000@localhost.localdomain
[-- Attachment #1: sky2-ec-u.patch --]
[-- Type: text/plain, Size: 1512 bytes --]
Logic error in the phy initialization code. Also, turn on wake on lan
bit in status control.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
--- sky2.orig/drivers/net/sky2.c 2006-05-17 08:55:51.000000000 -0700
+++ sky2/drivers/net/sky2.c 2006-05-17 08:55:54.000000000 -0700
@@ -236,6 +236,7 @@
}
if (hw->chip_id == CHIP_ID_YUKON_EC_U) {
+ sky2_write16(hw, B0_CTST, Y2_HW_WOL_ON);
sky2_pci_write32(hw, PCI_DEV_REG3, 0);
reg1 = sky2_pci_read32(hw, PCI_DEV_REG4);
reg1 &= P_ASPM_CONTROL_MSK;
@@ -307,7 +308,7 @@
u16 ctrl, ct1000, adv, pg, ledctrl, ledover;
if (sky2->autoneg == AUTONEG_ENABLE &&
- (hw->chip_id != CHIP_ID_YUKON_XL || hw->chip_id == CHIP_ID_YUKON_EC_U)) {
+ !(hw->chip_id == CHIP_ID_YUKON_XL || hw->chip_id == CHIP_ID_YUKON_EC_U)) {
u16 ectrl = gm_phy_read(hw, port, PHY_MARV_EXT_CTRL);
ectrl &= ~(PHY_M_EC_M_DSC_MSK | PHY_M_EC_S_DSC_MSK |
--- sky2.orig/drivers/net/sky2.h 2006-05-17 08:55:51.000000000 -0700
+++ sky2/drivers/net/sky2.h 2006-05-17 08:55:54.000000000 -0700
@@ -214,6 +214,8 @@
enum {
Y2_VMAIN_AVAIL = 1<<17,/* VMAIN available (YUKON-2 only) */
Y2_VAUX_AVAIL = 1<<16,/* VAUX available (YUKON-2 only) */
+ Y2_HW_WOL_ON = 1<<15,/* HW WOL On (Yukon-EC Ultra A1 only) */
+ Y2_HW_WOL_OFF = 1<<14,/* HW WOL On (Yukon-EC Ultra A1 only) */
Y2_ASF_ENABLE = 1<<13,/* ASF Unit Enable (YUKON-2 only) */
Y2_ASF_DISABLE = 1<<12,/* ASF Unit Disable (YUKON-2 only) */
Y2_CLK_RUN_ENA = 1<<11,/* CLK_RUN Enable (YUKON-2 only) */
--
next prev parent reply other threads:[~2006-05-17 21:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-17 21:37 [PATCH 0/5] sky2 bugfixes for 2.6.17 Stephen Hemminger
2006-05-17 21:37 ` [PATCH 1/5] sky2: allow dual port usage Stephen Hemminger
2006-05-18 18:16 ` [PATCH 1a/5] " Stephen Hemminger
2006-05-17 21:37 ` [PATCH 2/5] Subjec: sky2, skge: correct PCI id for DGE-560T Stephen Hemminger
2006-05-17 21:37 ` Stephen Hemminger [this message]
2006-05-17 21:37 ` [PATCH 4/5] sky2: force NAPI repoll if busy Stephen Hemminger
2006-05-17 21:37 ` [PATCH 5/5] sky2 version 1.4 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=20060517213802.260158000@localhost.localdomain \
--to=shemminger@osdl.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).