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>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-pci@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH v3 3/4] ACPI / hotplug / PCI: Runtime resume bridge before rescan
Date: Thu, 14 Apr 2016 13:04:27 +0300 [thread overview]
Message-ID: <1460628268-16204-4-git-send-email-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <1460628268-16204-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 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index fa49f9143b80..d64ce8aa99b3 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -756,8 +756,10 @@ static void hotplug_event(u32 type, struct acpiphp_context *context)
acpi_lock_hp_context();
bridge = context->bridge;
- if (bridge)
+ if (bridge) {
get_bridge(bridge);
+ pm_runtime_get_sync(&bridge->pci_dev->dev);
+ }
acpi_unlock_hp_context();
@@ -797,8 +799,10 @@ static void hotplug_event(u32 type, struct acpiphp_context *context)
}
pci_unlock_rescan_remove();
- if (bridge)
+ if (bridge) {
+ pm_runtime_put(&bridge->pci_dev->dev);
put_bridge(bridge);
+ }
}
static int acpiphp_hotplug_notify(struct acpi_device *adev, u32 type)
--
2.8.0.rc3
next prev parent reply other threads:[~2016-04-14 10:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-14 10:04 [PATCH v3 0/4] PCI: Add support for suspending (including runtime) of PCIe ports Mika Westerberg
2016-04-14 10:04 ` [PATCH v3 1/4] PCI: No need to set d3cold_allowed to " Mika Westerberg
2016-04-14 10:04 ` [PATCH v3 2/4] PCI: Move PCIe ports to D3 during suspend Mika Westerberg
2016-04-14 10:04 ` Mika Westerberg [this message]
2016-04-14 10:04 ` [PATCH v3 4/4] PCI: Add runtime PM support for PCIe ports Mika Westerberg
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=1460628268-16204-4-git-send-email-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--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=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).