From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Bjorn Helgaas <bhelgaas@google.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>,
Yinghai Lu <yinghai@kernel.org>,
john.ronciak@intel.com, miles.j.penner@intel.com,
bruce.w.allan@intel.com,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
x86@kernel.org
Subject: [PATCH 2/6] PCI: acpiphp: enable_device(): rescan even if no new devices on slot
Date: Tue, 25 Jun 2013 19:22:06 +0300 [thread overview]
Message-ID: <1372177330-28013-3-git-send-email-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <1372177330-28013-1-git-send-email-mika.westerberg@linux.intel.com>
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
pci_scan_slot() returns number of new devices connected *directly*
connected to the slot. Current enable_device() checks the return value
and stops if it doesn't see a new device.
In Thunderbolt chaining case the new device can be deeper in hierarchy, so
do the rescan anyway.
Because of that we must make sure that pcibios_resource_survey_bus() and
check_hotplug_bridge() get called only for a just found bus and not the
ones already added to the system. Failure to do so will lead to resource
conflicts.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/pci/hotplug/acpiphp_glue.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index b983e29..80a6ea1 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -685,18 +685,13 @@ static int __ref enable_device(struct acpiphp_slot *slot)
struct pci_dev *dev;
struct pci_bus *bus = slot->bridge->pci_bus;
struct acpiphp_func *func;
- int num, max, pass;
+ int max, pass;
LIST_HEAD(add_list);
list_for_each_entry(func, &slot->funcs, sibling)
acpiphp_bus_add(func);
- num = pci_scan_slot(bus, PCI_DEVFN(slot->device, 0));
- if (num == 0) {
- /* Maybe only part of funcs are added. */
- dbg("No new device found\n");
- goto err_exit;
- }
+ pci_scan_slot(bus, PCI_DEVFN(slot->device, 0));
max = acpiphp_max_busnr(bus);
for (pass = 0; pass < 2; pass++) {
@@ -707,8 +702,11 @@ static int __ref enable_device(struct acpiphp_slot *slot)
dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
max = pci_scan_bridge(bus, dev, max, pass);
if (pass && dev->subordinate) {
- check_hotplug_bridge(slot, dev);
- pcibios_resource_survey_bus(dev->subordinate);
+ if (!dev->subordinate->is_added) {
+ check_hotplug_bridge(slot, dev);
+ pcibios_resource_survey_bus(
+ dev->subordinate);
+ }
__pci_bus_size_bridges(dev->subordinate,
&add_list);
}
@@ -742,8 +740,6 @@ static int __ref enable_device(struct acpiphp_slot *slot)
}
}
-
- err_exit:
return 0;
}
--
1.8.3.1
next prev parent reply other threads:[~2013-06-25 16:21 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-25 16:22 [PATCH 0/6] Thunderbolt workarounds take 2 Mika Westerberg
2013-06-25 16:22 ` [PATCH 1/6] PCI: acpiphp: do not check for SLOT_ENABLED in enable_device() Mika Westerberg
2013-06-26 23:28 ` Bjorn Helgaas
2013-06-27 13:25 ` Kirill A. Shutemov
2013-06-28 9:51 ` Kirill A. Shutemov
2013-06-28 17:00 ` Bjorn Helgaas
2013-06-28 18:54 ` Rafael J. Wysocki
2013-07-01 9:32 ` Mika Westerberg
2013-07-01 14:01 ` Rafael J. Wysocki
2013-07-01 18:36 ` Mika Westerberg
2013-07-02 1:29 ` Rafael J. Wysocki
2013-07-02 16:40 ` Bjorn Helgaas
2013-07-02 20:29 ` Rafael J. Wysocki
2013-07-02 20:31 ` Mika Westerberg
2013-07-02 20:49 ` Rafael J. Wysocki
2013-06-25 16:22 ` Mika Westerberg [this message]
2013-06-26 23:37 ` [PATCH 2/6] PCI: acpiphp: enable_device(): rescan even if no new devices on slot Bjorn Helgaas
2013-06-27 13:02 ` Mika Westerberg
2013-06-27 16:32 ` Mika Westerberg
2013-06-27 16:50 ` Bjorn Helgaas
2013-06-27 16:54 ` Bjorn Helgaas
2013-06-27 1:20 ` Yinghai Lu
2013-06-27 13:04 ` Mika Westerberg
2013-06-25 16:22 ` [PATCH 3/6] PCI: introduce pci_trim_stale_devices() Mika Westerberg
2013-06-25 17:47 ` Andy Shevchenko
2013-06-25 17:56 ` Kirill A. Shutemov
2013-06-28 19:59 ` Rafael J. Wysocki
2013-06-25 16:22 ` [PATCH 4/6] PCI: acpiphp: check for new devices on enabled host Mika Westerberg
2013-06-25 18:04 ` Andy Shevchenko
2013-06-26 9:39 ` Kirill A. Shutemov
2013-06-27 19:05 ` Yinghai Lu
2013-06-28 9:33 ` Kirill A. Shutemov
2013-06-28 16:22 ` Yinghai Lu
2013-06-28 20:04 ` Rafael J. Wysocki
2013-06-25 16:22 ` [PATCH 5/6] PCI: acpiphp: look _RMV method a bit deeper in the hierarhcy Mika Westerberg
2013-06-25 18:15 ` Andy Shevchenko
2013-06-25 18:31 ` Mika Westerberg
2013-06-25 18:31 ` Andy Shevchenko
2013-06-25 18:51 ` Mika Westerberg
2013-06-25 19:30 ` Andy Shevchenko
2013-07-02 10:44 ` Kirill A. Shutemov
2013-07-02 17:09 ` Bjorn Helgaas
2013-07-02 17:45 ` Kirill A. Shutemov
2013-07-02 20:48 ` Rafael J. Wysocki
2013-07-02 20:40 ` Rafael J. Wysocki
2013-06-25 16:22 ` [PATCH 6/6] x86/PCI: quirk Thunderbolt PCI-to-PCI bridges Mika Westerberg
2013-06-25 21:15 ` Jesse Barnes
2013-06-26 12:17 ` Mika Westerberg
2013-06-26 15:04 ` Greg Kroah-Hartman
2013-06-26 20:59 ` Bjorn Helgaas
2013-06-26 22:15 ` Alex Williamson
2013-06-27 13:09 ` Mika Westerberg
2013-06-26 22:18 ` Bjorn Helgaas
2013-06-26 22:26 ` Yinghai Lu
2013-06-26 22:31 ` Yinghai Lu
2013-06-26 22:44 ` Rafael J. Wysocki
2013-06-26 22:38 ` Yinghai Lu
2013-06-26 22:55 ` Bjorn Helgaas
2013-06-26 23:56 ` Yinghai Lu
2013-06-27 16:00 ` Bjorn Helgaas
2013-06-27 17:27 ` Yinghai Lu
2013-06-27 13:58 ` Mika Westerberg
2013-06-27 13:54 ` Mika Westerberg
2013-06-27 16:27 ` Mika Westerberg
2013-06-27 17:18 ` Yinghai Lu
2013-06-25 23:24 ` [PATCH 0/6] Thunderbolt workarounds take 2 Rafael J. Wysocki
2013-06-26 7:25 ` Mika Westerberg
2013-06-26 12:45 ` Rafael J. Wysocki
2013-06-26 19:48 ` Bjorn Helgaas
2013-06-26 20:01 ` Rafael J. Wysocki
2013-06-26 19:55 ` 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=1372177330-28013-3-git-send-email-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=bruce.w.allan@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=jbarnes@virtuousgeek.org \
--cc=john.ronciak@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=miles.j.penner@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/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).