From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: [patch 06/31] sky2: turn on clocks when doing resume Date: Wed, 11 Apr 2007 15:51:32 -0700 Message-ID: <20070411225132.GG24814@kroah.com> References: <20070411224329.866978349@mini.kroah.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Justin Forbes , Zwane Mwaikambo , Theodore Ts'o , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, netdev@vger.kernel.org, Stephen Hemminger To: linux-kernel@vger.kernel.org, stable@kernel.org Return-path: Content-Disposition: inline; filename="sky2-ec-clocks-resume.patch" In-Reply-To: <20070411225100.GA24814@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org -stable review patch. If anyone has any objections, please let us know. ------------------ From: Stephen Hemminger Some of these chips are disabled until clock is enabled. This fixes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=404107 Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman --- drivers/net/sky2.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -2421,6 +2421,10 @@ static int sky2_reset(struct sky2_hw *hw return -EOPNOTSUPP; } + /* Make sure and enable all clocks */ + if (hw->chip_id == CHIP_ID_YUKON_EC_U) + sky2_pci_write32(hw, PCI_DEV_REG3, 0); + hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4; /* This rev is really old, and requires untested workarounds */ @@ -3639,6 +3643,9 @@ static int sky2_resume(struct pci_dev *p pci_restore_state(pdev); pci_enable_wake(pdev, PCI_D0, 0); + + if (hw->chip_id == CHIP_ID_YUKON_EC_U) + sky2_pci_write32(hw, PCI_DEV_REG3, 0); sky2_set_power_state(hw, PCI_D0); err = sky2_reset(hw); --