The patch titled sky2: fix suspend/hibernation/shutdown regression with WOL enabled has been added to the -mm tree. Its filename is sky2-fix-suspend-hibernation-shutdown-regression-with-wol-enabled-rev-2.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: sky2: fix suspend/hibernation/shutdown regression with WOL enabled From: "Rafael J. Wysocki" <rjw@xxxxxxx> On my test box with the Asus M3A32-MVP main board there is a regression from 2.6.26 related to suspend, hibernation and shutdown. Namely, if Wake-on-LAN is enabled with 'ethtool -s eth0 wol g', the box hangs solid during all of these operations, while executing either sky2_suspend(), or sky2_shutdown(). This patch fixes it for me. Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> Cc: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/sky2.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff -puN drivers/net/sky2.c~sky2-fix-suspend-hibernation-shutdown-regression-with-wol-enabled-rev-2 drivers/net/sky2.c --- a/drivers/net/sky2.c~sky2-fix-suspend-hibernation-shutdown-regression-with-wol-enabled-rev-2 +++ a/drivers/net/sky2.c @@ -666,11 +666,16 @@ static void sky2_phy_power_down(struct s if (hw->chip_id != CHIP_ID_YUKON_EC) { if (hw->chip_id == CHIP_ID_YUKON_EC_U) { - ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL); + /* select page 2 to access MAC control register */ + gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 2); + ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL); /* enable Power Down */ ctrl |= PHY_M_PC_POW_D_ENA; gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl); + + /* set page register back to 0 */ + gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 0); } /* set IEEE compatible Power Down Mode (dev. #4.99) */ _ Patches currently in -mm which might be from rjw@xxxxxxx are linux-next.patch skge-adapt-skge-to-use-reworked-pci-pm.patch sky2-fix-suspend-hibernation-shutdown-regression-with-wol-enabled-rev-2.patch pm-rework-disabling-of-user-mode-helpers-during-suspend-hibernation.patch shrink_slab-handle-bad-shrinkers.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html