From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754094AbYHQDbQ (ORCPT ); Sat, 16 Aug 2008 23:31:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751572AbYHQDa4 (ORCPT ); Sat, 16 Aug 2008 23:30:56 -0400 Received: from wa-out-1112.google.com ([209.85.146.181]:25625 "EHLO wa-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751445AbYHQDaz (ORCPT ); Sat, 16 Aug 2008 23:30:55 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=qfLPc0hwhVKr+KLS6Tz7Tqpj9pfKBdKeUoEmd+foilDtML2mgllERlxAMIpgNZRWXP 6oHlCvix5YCRoccP0ltnKFmOXILZT8PkKNdtb2Qtgor771a+BJBQ44Zz2EoKJDboZRR0 e/pBpBIwTQv9C5gEmvdRGS/ANrLdGk2DbzZVs= From: Yinghai Lu To: Jeff Garzik , Ingo Molnar , "Eric W. Biederman" , Andrew Morton Cc: linux-kernel@vger.kernel.org, netdev , Yinghai Lu Subject: [PATCH] net: forcedeth call restore mac addr in nv_shutdown patch Date: Sat, 16 Aug 2008 20:30:04 -0700 Message-Id: <1218943804-6198-1-git-send-email-yhlu.kernel@gmail.com> X-Mailer: git-send-email 1.5.4.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org after | commit f735a2a1a4f2a0f5cd823ce323e82675990469e2 | Author: Tobias Diedrich | Date: Sun May 18 15:02:37 2008 +0200 | | [netdrvr] forcedeth: setup wake-on-lan before shutting down | | When hibernating in 'shutdown' mode, after saving the image the suspend hook | is not called again. | However, if the device is in promiscous mode, wake-on-lan will not work. | This adds a shutdown hook to setup wake-on-lan before the final shutdown. | | Signed-off-by: Tobias Diedrich | Signed-off-by: Jeff Garzik my servers with nvidia ck804 and mcp55 will reverse mac address with kexec. it turns out need to restore mac addr in nv_shutdown. Signed-off-by: Yinghai Lu --- drivers/net/forcedeth.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) Index: linux-2.6/drivers/net/forcedeth.c =================================================================== --- linux-2.6.orig/drivers/net/forcedeth.c +++ linux-2.6/drivers/net/forcedeth.c @@ -5643,6 +5643,7 @@ static int __devinit nv_probe(struct pci dev->dev_addr[4] = (np->orig_mac[0] >> 8) & 0xff; dev->dev_addr[5] = (np->orig_mac[0] >> 0) & 0xff; writel(txreg|NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll); + printk(KERN_DEBUG "nv_probe: set workarund bit for reversed mac addr\n"); } memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); @@ -5890,14 +5891,12 @@ static void nv_restore_phy(struct net_de } } -static void __devexit nv_remove(struct pci_dev *pci_dev) +static void nv_restore_mac_addr(struct pci_dev *pci_dev) { struct net_device *dev = pci_get_drvdata(pci_dev); struct fe_priv *np = netdev_priv(dev); u8 __iomem *base = get_hwbase(dev); - unregister_netdev(dev); - /* special op: write back the misordered MAC address - otherwise * the next nv_probe would see a wrong address. */ @@ -5905,6 +5904,15 @@ static void __devexit nv_remove(struct p writel(np->orig_mac[1], base + NvRegMacAddrB); writel(readl(base + NvRegTransmitPoll) & ~NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll); +} + +static void __devexit nv_remove(struct pci_dev *pci_dev) +{ + struct net_device *dev = pci_get_drvdata(pci_dev); + + unregister_netdev(dev); + + nv_restore_mac_addr(pci_dev); /* restore any phy related changes */ nv_restore_phy(dev); @@ -5970,11 +5978,12 @@ static int nv_resume(struct pci_dev *pde static void nv_shutdown(struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); - struct fe_priv *np = netdev_priv(dev); if (netif_running(dev)) nv_close(dev); + nv_restore_mac_addr(pdev); + pci_enable_wake(pdev, PCI_D3hot, np->wolenabled); pci_enable_wake(pdev, PCI_D3cold, np->wolenabled); pci_disable_device(pdev);