From patchwork Mon Feb 10 01:15:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Wu X-Patchwork-Id: 3614691 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B291B9F382 for ; Mon, 10 Feb 2014 01:15:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C26722017D for ; Mon, 10 Feb 2014 01:15:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2BF020171 for ; Mon, 10 Feb 2014 01:15:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752354AbaBJBP2 (ORCPT ); Sun, 9 Feb 2014 20:15:28 -0500 Received: from mail-ea0-f178.google.com ([209.85.215.178]:56910 "EHLO mail-ea0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752331AbaBJBP0 (ORCPT ); Sun, 9 Feb 2014 20:15:26 -0500 Received: by mail-ea0-f178.google.com with SMTP id a15so2732787eae.9 for ; Sun, 09 Feb 2014 17:15:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:user-agent:in-reply-to :references:mime-version:content-transfer-encoding:content-type; bh=pWWLYql/TJJuOS4MnbsxC9ffOqLLjISYKeo2jItd1WU=; b=dQfhQpeaL2jew72aLBo80og8W2Zn0HidScK2hpYLA01DQ2s1EkEwTzEmh0IFKQE9UO xeywTHekLy/tVWjnn8Fjpb5n0TMQXdQI2hqpAzJofV7Amo/XuHmbH3ni9KZvHsP3spfp 111Y/ZIInzoMWpUhgDV00IqNWG8SQZpd/nVtQaGrNvTFZU0bnsHDnVF3RL2XoWVwkp89 ZBMxAi2LccgAZcrkCNEHWyY3THdP9eUxQi/PtLSrJx5iua17fCjz9Z97t3TVI1ydDzem 12X+iQWLuVMC2OG0AqTwo4cJc0x00jpZqeaRAHnfmYf1pH70FSi6m6EP8xNR6gLaxCr0 ObwA== X-Received: by 10.14.94.3 with SMTP id m3mr6062711eef.54.1391994925368; Sun, 09 Feb 2014 17:15:25 -0800 (PST) Received: from al.localnet (al.lekensteyn.nl. [2001:470:1f15:b83::c0d1:f1ed]) by mx.google.com with ESMTPSA id m9sm48040742eeh.3.2014.02.09.17.15.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Feb 2014 17:15:24 -0800 (PST) From: Peter Wu To: "Rafael J. Wysocki" Cc: Bastien Traverse , linux-kernel@vger.kernel.org, francis.moro@gmail.com, linux-pm@vger.kernel.org, Mika Westerberg Subject: Re: 3.12: ethernet controller missing after resuming from suspend to RAM Date: Mon, 10 Feb 2014 02:15:22 +0100 Message-ID: <5195003.Lv4YMFRT0Y@al> User-Agent: KMail/4.12.2 (Linux/3.13.2-testing; KDE/4.12.2; x86_64; ; ) In-Reply-To: <1521445.Je1ql4ndX7@vostro.rjw.lan> References: <52F2CC7B.80406@gmail.com> <1395731.XHixqRiN3E@al> <1521445.Je1ql4ndX7@vostro.rjw.lan> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Monday 10 February 2014 01:52:14 Rafael J. Wysocki wrote: > > Could the following commit have something to do with it? > > > > > > > > commit 4ebe34503baa0644c9352bcd76d4cf573bffe206 > > Author: Rafael J. Wysocki > > Date: Tue Jul 16 22:10:35 2013 +0200 > > > > > > ACPI / hotplug / PCI: Check for new devices on enabled slots > > This one, or another one in that series. I rather suspect > > ab1225901da2 Revert "ACPI / hotplug / PCI: Avoid doing too much for spurious > notifies" > > from Mika, but it really doesn't matter. > > Can you please check the patch below (it is on top of 3.14-rc1, but I think > it'll still apply to 3.13) and report back? I applied the following patch: Unfortunately, the adapter still vanishes. dmesg is below this message. Peter [ 44.558995] CPU3 is up [ 44.561438] ACPI: Waking up from system sleep state S3 [ 45.254084] ehci-pci 0000:00:1a.0: System wakeup disabled by ACPI [ 45.280727] ehci-pci 0000:00:1d.0: System wakeup disabled by ACPI [ 45.307403] xhci_hcd 0000:02:00.0: System wakeup disabled by ACPI [ 45.361012] PM: noirq resume of devices complete after 133.354 msecs [ 45.361292] PM: early resume of devices complete after 0.233 msecs [ 45.361680] iwlwifi 0000:05:00.0: RF_KILL bit toggled to enable radio. [ 45.361731] pcieport 0000:00:1c.1: System wakeup disabled by ACPI [ 45.470912] snd_hda_intel 0000:00:1b.0: irq 48 for MSI/MSI-X [ 45.700502] ata1: SATA link up 3.0 Gbps (SStatus 123 SControl 300) [ 45.700533] ata5: SATA link down (SStatus 0 SControl 300) [ 45.701385] ata1.00: configured for UDMA/133 [ 45.701503] sd 0:0:0:0: [sda] Starting disk [ 45.707139] ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 300) [ 45.872011] ata2.00: configured for UDMA/100 [ 46.791141] PM: resume of devices complete after 1430.658 msecs [ 46.791560] PM: Finishing wakeup. [ 46.791565] acpiphp_glue: hotplug_event: Bus check notify on \_SB_.PCI0.RP03 [ 46.791568] acpiphp_glue: hotplug_event: re-enumerating slots under \_SB_.PCI0.RP03 [ 46.791642] acpiphp_glue: No more new devices on this bus. [ 46.791571] Restarting tasks ... done. [ 46.793204] video LNXVIDEO:00: Restoring backlight state [ 46.793211] video LNXVIDEO:01: Restoring backlight state [ 47.246425] ACPI: \_SB_.AC__: ACPI_NOTIFY_BUS_CHECK event: unsupported [ 47.251540] jme 0000:04:00.5: irq 50 for MSI/MSI-X [ 47.276949] jme 0000:04:00.5 eth0: Link is down [ 47.276974] IPv6: ADDRCONF(NETDEV_UP): eth0: link is not ready [ 47.278423] iwlwifi 0000:05:00.0: L1 Enabled; Disabling L0S [ 47.285758] iwlwifi 0000:05:00.0: Radio type=0x1-0x3-0x1 [ 47.393492] acpiphp_glue: hotplug_event: Bus check notify on \_SB_.PCI0.RP01 [ 47.393495] acpiphp_glue: hotplug_event: re-enumerating slots under \_SB_.PCI0.RP01 [ 47.393517] acpiphp_glue: No more new devices on this bus. [ 47.393525] acpiphp_glue: hotplug_event: Bus check notify on \_SB_.PCI0.RP02 [ 47.393527] acpiphp_glue: hotplug_event: re-enumerating slots under \_SB_.PCI0.RP02 [ 47.398977] IPv6: ADDRCONF(NETDEV_UP): wlan0: link is not ready [ 47.463615] acpiphp_glue: hotplug_event: Bus check notify on \_SB_.PCI0.RP03 [ 47.463620] acpiphp_glue: hotplug_event: re-enumerating slots under \_SB_.PCI0.RP03 [ 47.463685] acpiphp_glue: No more new devices on this bus. After the last message, NetworkManager loses the interface within a second. The next following messages follow two seconds later and are unrelated (those are about wireless connectivity). --- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- drivers/pci/hotplug/acpiphp_glue.c.orig 2014-02-10 01:46:59.678124018 +0100 +++ drivers/pci/hotplug/acpiphp_glue.c 2014-02-10 01:48:59.634124004 +0100 @@ -552,10 +552,10 @@ struct pci_dev *dev; struct pci_bus *bus = slot->bus; struct acpiphp_func *func; - int max, pass; + int nr_found, max, pass, bridges_scanned = 0; LIST_HEAD(add_list); - acpiphp_rescan_slot(slot); + nr_found = acpiphp_rescan_slot(slot); max = acpiphp_max_busnr(bus); for (pass = 0; pass < 2; pass++) { list_for_each_entry(dev, &bus->devices, bus_list) { @@ -571,9 +571,16 @@ __pci_bus_size_bridges(dev->subordinate, &add_list); } + bridges_scanned++; } } } + /* Nothing more to do here if there are no new devices on this bus. */ + if (!nr_found && !bridges_scanned && (slot->flags & SLOT_ENABLED)) { + pr_debug("No more new devices on this bus.\n"); + return; + } + __pci_bus_assign_resources(bus, &add_list, NULL); acpiphp_sanitize_bus(bus);