{"id":983,"url":"http://patchwork.ozlabs.org/api/1.0/patches/983/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<200809222152.m8MLqGSx031961@imap1.linux-foundation.org>","date":"2008-09-22T21:52:15","name":"[09/21] forcedeth: add pci_enable_device() to nv_resume()","commit_ref":null,"pull_url":null,"state":"rejected","archived":true,"hash":"990582d8d66b3e4ea52f0cdd50e5c3a284ddb7d6","submitter":{"id":107,"url":"http://patchwork.ozlabs.org/api/1.0/people/107/?format=json","name":"Andrew Morton","email":"akpm@linux-foundation.org"},"delegate":{"id":36,"url":"http://patchwork.ozlabs.org/api/1.0/users/36/?format=json","username":"jgarzik","first_name":"Jeff","last_name":"Garzik","email":"jgarzik@pobox.com"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/200809222152.m8MLqGSx031961@imap1.linux-foundation.org/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/983/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Received":["from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id C5390DDF5F\n\tfor ;\n\tTue, 23 Sep 2008 08:00:14 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754662AbYIVV76 (ORCPT );\n\tMon, 22 Sep 2008 17:59:58 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1754650AbYIVV7z\n\t(ORCPT ); Mon, 22 Sep 2008 17:59:55 -0400","from smtp1.linux-foundation.org ([140.211.169.13]:56311 \"EHLO\n\tsmtp1.linux-foundation.org\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1754277AbYIVV7w (ORCPT\n\t); Mon, 22 Sep 2008 17:59:52 -0400","from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLrDOL018507\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:57:39 -0700","from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLqGSx031961; Mon, 22 Sep 2008 14:52:16 -0700"],"Message-Id":"<200809222152.m8MLqGSx031961@imap1.linux-foundation.org>","Subject":"[patch 09/21] forcedeth: add pci_enable_device() to nv_resume()","To":"jeff@garzik.org","Cc":"netdev@vger.kernel.org, akpm@linux-foundation.org,\n\tsimon@fire.lp0.eu, aabdulla@nvidia.com, jgarzik@redhat.com,\n\tranma+kernel@tdiedrich.de","From":"akpm@linux-foundation.org","Date":"Mon, 22 Sep 2008 14:52:15 -0700","X-Spam-Status":"No, hits=-3.359 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED","X-Spam-Checker-Version":"SpamAssassin 3.2.4-osdl_revision__1.47__","X-MIMEDefang-Filter":"lf$Revision: 1.188 $","X-Scanned-By":"MIMEDefang 2.63 on 140.211.169.13","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Simon Arlott \n\nMy NIC stops working after resuming from standby, it's not receiving any\ninterrupts.\n\nCommit 25d90810ff49d2a63475776f24c74c6bb49b045f ([netdrvr] forcedeth:\nreorder suspend/resume code) introduces pci_disable_device to nv_suspend,\nbut there's no corresponding pci_enable_device in nv_resume - so I added\none (copied from e1000). This results in interrupts being re-enabled\nafter suspend.\n\nHowever, the NIC (10de:0373) still doesn't work after resume.\n\nCc: Tobias Diedrich \nCc: Jeff Garzik \nCc: Ayaz Abdulla \nSigned-off-by: Andrew Morton \n---\n\n drivers/net/forcedeth.c | 7 +++++++\n 1 file changed, 7 insertions(+)","diff":"diff -puN drivers/net/forcedeth.c~forcedeth-add-pci_enable_device-to-nv_resume drivers/net/forcedeth.c\n--- a/drivers/net/forcedeth.c~forcedeth-add-pci_enable_device-to-nv_resume\n+++ a/drivers/net/forcedeth.c\n@@ -5968,6 +5968,13 @@ static int nv_resume(struct pci_dev *pde\n \n \tpci_set_power_state(pdev, PCI_D0);\n \tpci_restore_state(pdev);\n+\trc = pci_enable_device(pdev);\n+\tif (rc) {\n+\t\tprintk(KERN_ERR \"forcedeth: Cannot enable PCI device from suspend\\n\");\n+\t\treturn rc;\n+\t}\n+\tpci_set_master(pdev);\n+\n \t/* ack any pending wake events, disable PME */\n \tpci_enable_wake(pdev, PCI_D0, 0);\n \n","prefixes":["09/21"]}