From: Yijing Wang <wangyijing@huawei.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: <linux-kernel@vger.kernel.org>, <linux-pci@vger.kernel.org>,
Rafael <rjw@sisk.pl>, Hanjun Guo <guohanjun@huawei.com>,
<jiang.liu@huawei.com>, Yijing Wang <wangyijing@huawei.com>,
Paul Bolle <pebolle@tiscali.nl>, Oliver Neukum <oneukum@suse.de>,
Gu Zheng <guz.fnst@cn.fujitsu.com>
Subject: [PATCH -v2 2/3] PCI,pciehp: avoid add a device already exist before suspend during resume
Date: Thu, 11 Jul 2013 17:43:44 +0800 [thread overview]
Message-ID: <1373535825-49972-3-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1373535825-49972-1-git-send-email-wangyijing@huawei.com>
Currently, pciehp_resume() try to hot add device if the slot adapter
status return true. But if there are already some devices exist,
namely list_empty(bus->devices) return false. We should not add the device
again, because the device add action will fail. Also print some uncomfortable
messages like this:
pciehp 0000:00:1c.1:pcie04: Device 0000:03:00.0 already exists at 0000:03:00, cannot hot-add
pciehp 0000:00:1c.1:pcie04: Cannot add device at 0000:03:00
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Oliver Neukum <oneukum@suse.de>
Cc: Gu Zheng <guz.fnst@cn.fujitsu.com>
Cc: linux-pci@vger.kernel.org
---
drivers/pci/hotplug/pciehp_core.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 7d72c5e..1542735 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -300,6 +300,7 @@ static int pciehp_resume (struct pcie_device *dev)
{
struct controller *ctrl;
struct slot *slot;
+ struct pci_bus *pbus = dev->port->subordinate;
u8 status;
ctrl = get_service_data(dev);
@@ -311,10 +312,12 @@ static int pciehp_resume (struct pcie_device *dev)
/* Check if slot is occupied */
pciehp_get_adapter_status(slot, &status);
- if (status)
- pciehp_enable_slot(slot);
- else
+ if (status) {
+ if (list_empty(&pbus->devices))
+ pciehp_enable_slot(slot);
+ } else if (!list_empty(&pbus->devices))
pciehp_disable_slot(slot);
+
return 0;
}
#endif /* PM */
--
1.7.1
next prev parent reply other threads:[~2013-07-11 9:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-11 9:43 [PATCH -v2 0/3] Use PCIe DSN to improve pciehp_resume Yijing Wang
2013-07-11 9:43 ` [PATCH -v2 1/3] PCI: introduce PCIe Device Serial Number Capability support Yijing Wang
2013-07-11 9:51 ` Don Dutile
2013-07-11 20:09 ` Bjorn Helgaas
2013-07-11 18:18 ` Don Dutile
2013-07-12 2:39 ` Yijing Wang
2013-07-12 3:37 ` Bjorn Helgaas
2013-07-12 2:30 ` Yijing Wang
2013-07-12 1:38 ` Yijing Wang
2013-07-12 2:43 ` Don Dutile
2013-07-11 14:22 ` Paul Bolle
2013-07-12 1:55 ` Yijing Wang
2013-07-11 9:43 ` Yijing Wang [this message]
2013-07-11 14:27 ` [PATCH -v2 2/3] PCI,pciehp: avoid add a device already exist before suspend during resume Paul Bolle
2013-07-12 2:19 ` Yijing Wang
2013-07-11 9:43 ` [PATCH -v2 3/3] PCI,pciehp: use PCIe DSN to identify device change during suspend Yijing Wang
2013-07-11 10:04 ` Don Dutile
2013-07-11 14:33 ` Paul Bolle
2013-07-12 2:19 ` Yijing Wang
2013-07-11 14:19 ` [PATCH -v2 0/3] Use PCIe DSN to improve pciehp_resume Paul Bolle
2013-07-12 1:52 ` Yijing Wang
2013-07-13 10:20 ` Paul Bolle
2013-07-15 0:51 ` Yijing Wang
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=1373535825-49972-3-git-send-email-wangyijing@huawei.com \
--to=wangyijing@huawei.com \
--cc=bhelgaas@google.com \
--cc=guohanjun@huawei.com \
--cc=guz.fnst@cn.fujitsu.com \
--cc=jiang.liu@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=oneukum@suse.de \
--cc=pebolle@tiscali.nl \
--cc=rjw@sisk.pl \
/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).