From: Jiang Liu <liuj97@gmail.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Tony Luck <tony.luck@intel.com>, Jiang Liu <jiang.liu@huawei.com>,
Yinghai Lu <yinghai@kernel.org>,
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
Yijing Wang <wangyijing@huawei.com>, Jiang Liu <liuj97@gmail.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org
Subject: [PATCH v2 8/9] PCI/acpiphp: serialize access to the bridge_list list
Date: Sat, 15 Sep 2012 11:05:11 +0800 [thread overview]
Message-ID: <1347678312-11124-9-git-send-email-jiang.liu@huawei.com> (raw)
In-Reply-To: <1347678312-11124-1-git-send-email-jiang.liu@huawei.com>
Serialize access to the bridge_list in the acpiphp driver.
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
drivers/pci/hotplug/acpiphp_glue.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 1fb0eb7..348afd7 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -53,6 +53,7 @@
#include "../pci.h"
#include "acpiphp.h"
+static DEFINE_MUTEX(bridge_mutex);
static LIST_HEAD(bridge_list);
#define MY_NAME "acpiphp_glue"
@@ -497,8 +498,10 @@ static int add_bridge(acpi_handle handle)
}
/* search P2P bridges under this host bridge */
+ mutex_lock(&bridge_mutex);
status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1,
find_p2p_bridge, NULL, NULL, NULL);
+ mutex_unlock(&bridge_mutex);
if (ACPI_FAILURE(status))
warn("find_p2p_bridge failed (error code = 0x%x)\n", status);
@@ -595,6 +598,8 @@ static void remove_bridge(acpi_handle handle)
{
struct acpiphp_bridge *bridge;
+ mutex_lock(&bridge_mutex);
+
/* cleanup p2p bridges under this host bridge
in a depth-first manner */
acpi_walk_namespace(ACPI_TYPE_DEVICE, handle,
@@ -613,6 +618,8 @@ static void remove_bridge(acpi_handle handle)
else
acpi_remove_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
handle_hotplug_event_bridge);
+
+ mutex_unlock(&bridge_mutex);
}
static int power_on_slot(struct acpiphp_slot *slot)
@@ -1415,11 +1422,13 @@ static void acpiphp_hp_notify_add(struct pci_dev *dev)
if (!dev->subordinate || !handle)
return;
+ mutex_lock(&bridge_mutex);
/* check if this bridge has ejectable slots */
if (detect_ejectable_slots(handle) > 0) {
dbg("found PCI-to-PCI bridge at PCI %s\n", pci_name(dev));
add_p2p_bridge(handle);
}
+ mutex_unlock(&bridge_mutex);
}
static void acpiphp_hp_notify_del(struct pci_dev *dev)
@@ -1430,11 +1439,13 @@ static void acpiphp_hp_notify_del(struct pci_dev *dev)
if (!bus)
return;
+ mutex_lock(&bridge_mutex);
list_for_each_entry_safe(bridge, tmp, &bridge_list, list)
if (bridge->pci_bus == bus) {
cleanup_bridge(bridge);
break;
}
+ mutex_unlock(&bridge_mutex);
}
static int acpi_pci_hp_notify_fn(struct notifier_block *nb,
--
1.7.9.5
next prev parent reply other threads:[~2012-09-15 3:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-15 3:05 [PATCH v2 0/9] enhance PCI related drivers to handle hotplug events Jiang Liu
2012-09-15 3:05 ` [PATCH v2 1/9] PCI: make PCI device create/destroy logic symmetric Jiang Liu
2012-09-15 3:05 ` [PATCH v2 2/9] PCI: split registration of PCI bus devices into two stages Jiang Liu
2012-09-15 8:03 ` Yinghai Lu
2012-09-15 18:47 ` Yinghai Lu
2012-09-16 13:16 ` [PATCH v3] " Jiang Liu
2012-09-15 3:05 ` [PATCH v2 3/9] PCI: preserve dev->subordinate until pci_stop_dev() has been called Jiang Liu
2012-09-15 5:09 ` Yinghai Lu
2012-09-15 7:02 ` Jiang Liu
2012-09-15 3:05 ` [PATCH v2 4/9] ACPI/pci_bind: correctly update binding relationship for PCI hotplug Jiang Liu
2012-09-15 3:05 ` [PATCH v2 5/9] ACPI/pci-bind: remove bind/unbind callbacks from acpi_device_ops Jiang Liu
2012-09-15 18:53 ` Yinghai Lu
2012-09-16 14:09 ` [PATCH v3] " Jiang Liu
2012-09-16 16:49 ` Yinghai Lu
2012-09-16 18:02 ` Yinghai Lu
2012-09-17 3:06 ` Yinghai Lu
2012-09-17 15:26 ` Jiang Liu
2012-09-15 23:27 ` [PATCH v2 5/9] " Yinghai Lu
2012-09-17 3:03 ` Yinghai Lu
2012-09-17 14:22 ` Jiang Liu
2012-09-17 14:31 ` Jiang Liu
2012-09-17 15:41 ` Yinghai Lu
2012-09-15 3:05 ` [PATCH v2 6/9] ACPI/pci_slot: update PCI slot information when PCI hotplug event happens Jiang Liu
2012-09-15 3:05 ` [PATCH v2 7/9] PCI/acpiphp: update ACPI hotplug slot information when PCI hotplug happens Jiang Liu
2012-09-15 3:05 ` Jiang Liu [this message]
2012-09-15 3:05 ` [PATCH v2 9/9] PCI/AER: update AER configuration when PCI hotplug event happens Jiang Liu
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=1347678312-11124-9-git-send-email-jiang.liu@huawei.com \
--to=liuj97@gmail.com \
--cc=bhelgaas@google.com \
--cc=jiang.liu@huawei.com \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=wangyijing@huawei.com \
--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).