rpms/kernel/F-7 linux-2.6-net-sky2-dont-clear-phy-power-bits.patch, NONE, 1.1 kernel-2.6.spec, 1.3324, 1.3325

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30349

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-net-sky2-dont-clear-phy-power-bits.patch 
Log Message:
* Tue Aug 21 2007 Chuck Ebbert <cebbert at redhat.com>
- sky2: don't clear PHY power bits


linux-2.6-net-sky2-dont-clear-phy-power-bits.patch:

--- NEW FILE linux-2.6-net-sky2-dont-clear-phy-power-bits.patch ---
There are special PHY settings available on Yukon EC-U chip that
should not get cleared. This should solve mysterious errors on some
motherboards (like Gigabyte DS-3).

Signed-off-by: Stephen Hemminger <shemminger at linux-foundation.org>


--- a/drivers/net/sky2.c	2007-08-21 11:08:27.000000000 -0700
+++ b/drivers/net/sky2.c	2007-08-21 11:09:03.000000000 -0700
@@ -657,8 +657,8 @@ static void sky2_mac_init(struct sky2_hw
 	int i;
 	const u8 *addr = hw->dev[port]->dev_addr;
 
-	sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_SET);
-	sky2_write32(hw, SK_REG(port, GPHY_CTRL), GPC_RST_CLR);
+	sky2_write8(hw, SK_REG(port, GPHY_CTRL), GPC_RST_SET);
+	sky2_write8(hw, SK_REG(port, GPHY_CTRL), GPC_RST_CLR);
 
 	sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_RST_CLR);
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3324
retrieving revision 1.3325
diff -u -r1.3324 -r1.3325
--- kernel-2.6.spec	21 Aug 2007 20:20:52 -0000	1.3324
+++ kernel-2.6.spec	21 Aug 2007 21:29:04 -0000	1.3325
@@ -610,6 +610,7 @@
 Patch718: linux-2.6-sky2-2-carrier-management.patch
 Patch719: linux-2.6-sky2-3-check-for-more-work.patch
 Patch720: linux-2.6-sky2-4-drop-truncated-packets.patch
+Patch721: linux-2.6-net-sky2-dont-clear-phy-power-bits.patch
 Patch740: linux-2.6-sdhci-ene-controller-quirk.patch
 Patch741: linux-2.6-sdhci-fix-interrupt-mask.patch
 Patch742: linux-2.6-sdhci-clear-error-interrupt.patch
@@ -1329,6 +1330,9 @@
 ApplyPatch linux-2.6-sky2-2-carrier-management.patch
 ApplyPatch linux-2.6-sky2-3-check-for-more-work.patch
 ApplyPatch linux-2.6-sky2-4-drop-truncated-packets.patch
+# sky2: 1 more
+ApplyPatch linux-2.6-net-sky2-dont-clear-phy-power-bits.patch
+
 # atl1 DMA bugs
 ApplyPatch linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
 ApplyPatch linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
@@ -2303,6 +2307,9 @@
 
 %changelog
 * Tue Aug 21 2007 Chuck Ebbert <cebbert at redhat.com>
+- sky2: don't clear PHY power bits
+
+* Tue Aug 21 2007 Chuck Ebbert <cebbert at redhat.com>
 - Hibernation: do not try to mark invalid PFNs as nosave
 
 * Tue Aug 21 2007 Dave Jones <davej at redhat.com>