From patchwork Tue Jan 11 20:28:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Francois Romieu X-Patchwork-Id: 78429 X-Patchwork-Delegate: davem@davemloft.net 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.180.67]) by ozlabs.org (Postfix) with ESMTP id D933FB6EF2 for ; Wed, 12 Jan 2011 07:29:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754009Ab1AKU26 (ORCPT ); Tue, 11 Jan 2011 15:28:58 -0500 Received: from violet.fr.zoreil.com ([92.243.8.30]:60268 "EHLO violet.fr.zoreil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753368Ab1AKU24 (ORCPT ); Tue, 11 Jan 2011 15:28:56 -0500 Received: from violet.fr.zoreil.com (localhost [127.0.0.1]) by violet.fr.zoreil.com (8.13.8/8.13.8) with ESMTP id p0BKSIaV002545; Tue, 11 Jan 2011 21:28:18 +0100 Received: (from romieu@localhost) by violet.fr.zoreil.com (8.13.8/8.13.8/Submit) id p0BKSHlv002544; Tue, 11 Jan 2011 21:28:17 +0100 Date: Tue, 11 Jan 2011 21:28:17 +0100 From: Francois Romieu To: Jarek =?utf-8?B?S2FtacWEc2tp?= Cc: Ben Hutchings , 609538@bugs.debian.org, Hayes Wang , netdev Subject: Re: Bug#609538: r8169: long delay during resume Message-ID: <20110111202817.GA2538@electric-eye.fr.zoreil.com> References: <20110110131439.GA663@rocket.almost.secure.la> <1294724952.3235.2.camel@localhost> <4D2C06CF.4090507@vilo.eu.org> <20110111132524.GA2479@electric-eye.fr.zoreil.com> <4D2C9FA8.7010401@vilo.eu.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <4D2C9FA8.7010401@vilo.eu.org> User-Agent: Mutt/1.4.2.2i X-Organisation: Land of Sunshine Inc. Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Jarek Kamiński : [failure] /me slaps head Please check that it works if you add the patch below and I'll merge both for a proper submission. r8169: I am a clown. Modifying rtl8169_reset_task() to tolerate firmware changes between close() and open() but this is not high-priority. Signed-off-by: Francois Romieu > "r8169: delay phy init until device opens." alone also doesn't do the trick. It was the expected behavior. diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 7e2f01c..57fa6bd 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -3119,6 +3119,8 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev) cancel_delayed_work_sync(&tp->task); + rtl_release_firmware(tp); + unregister_netdev(dev); if (pci_dev_run_wake(pdev)) @@ -4679,8 +4681,6 @@ static int rtl8169_close(struct net_device *dev) tp->TxDescArray = NULL; tp->RxDescArray = NULL; - rtl_release_firmware(tp); - pm_runtime_put_sync(&pdev->dev); return 0;