netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Hemminger <shemminger@osdl.org>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: netdev@vger.kernel.org
Subject: [PATCH 6/7] sky2: PHY power on delays
Date: Wed, 12 Jul 2006 15:23:47 -0700	[thread overview]
Message-ID: <20060712222646.660842048@localhost.localdomain> (raw)
In-Reply-To: 20060712222341.686007133@localhost.localdomain

[-- Attachment #1: sky2-phy-read-timeout.patch --]
[-- Type: text/plain, Size: 876 bytes --]

The documentation says we need to wait after turning on the PHY.
Also, don't enable WOL by default.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

--- sky2.orig/drivers/net/sky2.c	2006-07-11 15:25:40.000000000 -0700
+++ sky2/drivers/net/sky2.c	2006-07-11 15:35:31.000000000 -0700
@@ -234,7 +234,6 @@
 		}
 
 		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;
@@ -243,6 +242,7 @@
 		}
 
 		sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
+		udelay(100);
 
 		break;
 
@@ -255,6 +255,7 @@
 		else
 			reg1 |= (PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD);
 		sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
+		udelay(100);
 
 		if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
 			sky2_write8(hw, B2_Y2_CLK_GATE, 0);

--


  parent reply	other threads:[~2006-07-12 22:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-12 22:23 [PATCH 0/7] Marvell SysKonnect related driver fixes Stephen Hemminger
2006-07-12 22:23 ` [PATCH 1/7] sky2: fix truncated collision threshold mask Stephen Hemminger
2006-07-12 22:23 ` [PATCH 2/7] skge: " Stephen Hemminger
2006-07-12 22:23 ` [PATCH 3/7] sk98lin: " Stephen Hemminger
2006-07-12 22:23 ` [PATCH 4/7] sky2: sky2_reset section mismatch Stephen Hemminger
2006-07-12 22:23 ` [PATCH 5/7] sky2: NAPI suspend/resume of dual port cards Stephen Hemminger
2006-07-12 22:23 ` Stephen Hemminger [this message]
2006-07-12 22:23 ` [PATCH 7/7] sky2: optimize receive restart 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=20060712222646.660842048@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).