From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Qipeng Zha <qipeng.zha@intel.com>, Qi Zheng <qi.zheng@intel.com>,
Dave Airlie <airlied@gmail.com>,
Mathias Nyman <mathias.nyman@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Lukas Wunner <lukas@wunner.de>,
Andreas Noever <andreas.noever@gmail.com>,
Peter Wu <peter@lekensteyn.nl>,
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-pci@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH v6 4/5] ACPI / hotplug / PCI: Runtime resume bridge before rescan
Date: Thu, 2 Jun 2016 11:17:14 +0300 [thread overview]
Message-ID: <1464855435-32960-5-git-send-email-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <1464855435-32960-1-git-send-email-mika.westerberg@linux.intel.com>
If a PCI bridge (or PCIe port) that is runtime suspended gets an ACPI
hotplug event, such as BUS_CHECK we need to make sure it is resumed before
devices below the bridge are re-scanned. Otherwise the devices behind the
port are not accessible and will be treated as hot-unplugged.
To fix this, resume PCI bridges from runtime suspend while rescanning.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/pci/hotplug/acpiphp_glue.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index fa49f9143b80..6a33ddcfa20b 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -675,6 +675,8 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge)
if (bridge->is_going_away)
return;
+ pm_runtime_get_sync(&bridge->pci_dev->dev);
+
list_for_each_entry(slot, &bridge->slots, node) {
struct pci_bus *bus = slot->bus;
struct pci_dev *dev, *tmp;
@@ -694,6 +696,8 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge)
disable_slot(slot);
}
}
+
+ pm_runtime_put(&bridge->pci_dev->dev);
}
/*
--
2.8.1
next prev parent reply other threads:[~2016-06-02 8:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-02 8:17 [PATCH v6 0/5] PCI: Add support for suspending (including runtime) of PCIe ports Mika Westerberg
2016-06-02 8:17 ` [PATCH v6 1/5] PCI: Don't clear d3cold_allowed for " Mika Westerberg
2016-06-02 8:17 ` [PATCH v6 2/5] PCI: Put PCIe ports into D3 during suspend Mika Westerberg
2016-06-02 8:17 ` [PATCH v6 3/5] PCI: Power on bridges before scanning new devices Mika Westerberg
2016-06-02 12:26 ` Rafael J. Wysocki
2016-06-02 8:17 ` Mika Westerberg [this message]
2016-06-02 12:27 ` [PATCH v6 4/5] ACPI / hotplug / PCI: Runtime resume bridge before rescan Rafael J. Wysocki
2016-06-02 8:17 ` [PATCH v6 5/5] PCI: Add runtime PM support for PCIe ports Mika Westerberg
2016-06-04 23:27 ` [PATCH v6 0/5] PCI: Add support for suspending (including runtime) of " Lukas Wunner
2016-06-06 9:43 ` Mika Westerberg
2016-06-13 20:05 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464855435-32960-5-git-send-email-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=Valdis.Kletnieks@vt.edu \
--cc=airlied@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=mathias.nyman@intel.com \
--cc=peter@lekensteyn.nl \
--cc=qi.zheng@intel.com \
--cc=qipeng.zha@intel.com \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).