blob: 9cd0e24718c4e8362cedcb709a4b1d24e25ecf58 [file] [log] [blame]
From shemminger@linux-foundation.org Mon Feb 26 17:36:04 2007
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Mon, 26 Feb 2007 17:18:34 -0800
Subject: sky2: pci config blocks phy power control
To: Greg KH <greg@kroah.com>
Cc: stable@kernel.org
Message-ID: <20070227012021.255367846@linux-foundation.org>
Content-Disposition: inline; filename=sky2-pci-write.patch
From: Stephen Hemminger <shemminger@linux-foundation.org>
PHY power control won't work because writes to PCI config space
are not re-enabled.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/net/sky2.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- linux-2.6.19.5.orig/drivers/net/sky2.c
+++ linux-2.6.19.5/drivers/net/sky2.c
@@ -569,8 +569,8 @@ static void sky2_phy_power(struct sky2_h
if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
onoff = !onoff;
+ sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
-
if (onoff)
/* Turn off phy power saving */
reg1 &= ~phy_power[port];
@@ -579,6 +579,7 @@ static void sky2_phy_power(struct sky2_h
sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
sky2_pci_read32(hw, PCI_DEV_REG1);
+ sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
udelay(100);
}