From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ondrej Zary Subject: de2104x: fix power management Date: Sat, 25 Sep 2010 11:57:02 +0200 Message-ID: <201009251157.07197.linux@rainbow-software.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, Kernel development list To: jgarzik@pobox.com Return-path: Received: from mail1-out1.atlantis.sk ([80.94.52.55]:36664 "EHLO mail.atlantis.sk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754768Ab0IYJ52 (ORCPT ); Sat, 25 Sep 2010 05:57:28 -0400 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: At least my 21041 cards come out of suspend with bus mastering disabled so they did not work after resume(no data transferred). After adding pci_set_master(), the driver oopsed immediately on resume - because de_clean_rings() is called on suspend but de_init_rings() call was missing in resume. Also disable link (reset SIA) before sleep (de4x5 does this too). Signed-off-by: Ondrej Zary --- linux-2.6.36-rc3-/drivers/net/tulip/de2104x.c 2010-09-25 11:27:26.000000000 +0200 +++ linux-2.6.36-rc3/drivers/net/tulip/de2104x.c 2010-09-25 11:29:22.000000000 +0200 @@ -1231,6 +1231,7 @@ static void de_adapter_sleep (struct de_ if (de->de21040) return; + dw32(CSR13, 0); /* Reset phy */ pci_read_config_dword(de->pdev, PCIPM, &pmctl); pmctl |= PM_Sleep; pci_write_config_dword(de->pdev, PCIPM, pmctl); @@ -2166,6 +2167,8 @@ static int de_resume (struct pci_dev *pd dev_err(&dev->dev, "pci_enable_device failed in resume\n"); goto out; } + pci_set_master(pdev); + de_init_rings(de); de_init_hw(de); out_attach: netif_device_attach(dev); -- Ondrej Zary