From: Bjorn Helgaas <bhelgaas@google.com>
To: Jiang Liu <liuj97@gmail.com>
Cc: Don Dutile <ddutile@redhat.com>, Yinghai Lu <yinghai@kernel.org>,
Greg KH <gregkh@linuxfoundation.org>,
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
Jiang Liu <jiang.liu@huawei.com>,
Taku Izumi <izumi.taku@jp.fujitsu.com>,
"Rafael J . Wysocki" <rjw@sisk.pl>,
Yijing Wang <wangyijing@huawei.com>,
Xinwei Hu <huxinwei@huawei.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org
Subject: Re: [RFC PATCH v1 21/22] PCI: cleanups for PCI bus lock implementation
Date: Tue, 11 Sep 2012 17:21:43 -0600 [thread overview]
Message-ID: <CAErSpo4ubTSu5cSrLVfs5UHc44KgtzO_OxL_QganfhqYn2hUWQ@mail.gmail.com> (raw)
In-Reply-To: <1344355862-2726-22-git-send-email-jiang.liu@huawei.com>
On Tue, Aug 7, 2012 at 10:11 AM, Jiang Liu <liuj97@gmail.com> wrote:
> Now all Archs have been converted to the new PCI bus lock mechanism,
> so clean up unused code.
When you say "all arches," do you really mean "x86 and ia64"? I
assume all the other architectures have similar issues. Or is this
somehow ACPI-specific?
> Signed-off-by: Jiang Liu <liuj97@gmail.com>
> ---
> drivers/pci/Kconfig | 3 ---
> drivers/pci/bus.c | 1 -
> drivers/pci/pci-sysfs.c | 9 ---------
> drivers/pci/probe.c | 4 +---
> include/linux/pci.h | 10 ----------
> 5 files changed, 1 insertion(+), 26 deletions(-)
>
> diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
> index 5a796c0..848bfb8 100644
> --- a/drivers/pci/Kconfig
> +++ b/drivers/pci/Kconfig
> @@ -120,6 +120,3 @@ config PCI_IOAPIC
> config PCI_LABEL
> def_bool y if (DMI || ACPI)
> select NLS
> -
> -config PCI_BUS_LOCK
> - def_bool y if (X86 || IA64)
> diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
> index 371f20a..308c376 100644
> --- a/drivers/pci/bus.c
> +++ b/drivers/pci/bus.c
> @@ -196,7 +196,6 @@ int pci_bus_add_child(struct pci_bus *bus)
> pci_create_legacy_files(bus);
> pci_bus_change_state(bus, PCI_BUS_STATE_INITIALIZED,
> PCI_BUS_STATE_WORKING, false);
> - bus->is_added = 1;
> }
> }
>
> diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
> index 11043b4..a5a4195 100644
> --- a/drivers/pci/pci-sysfs.c
> +++ b/drivers/pci/pci-sysfs.c
> @@ -284,7 +284,6 @@ msi_bus_store(struct device *dev, struct device_attribute *attr,
> }
>
> #ifdef CONFIG_HOTPLUG
> -static DEFINE_MUTEX(pci_remove_rescan_mutex);
> static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf,
> size_t count)
> {
> @@ -296,13 +295,11 @@ static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf,
>
> if (val) {
> pci_host_bridge_hotplug_lock();
> - mutex_lock(&pci_remove_rescan_mutex);
> while ((b = pci_find_next_bus(b)) != NULL)
> if (pci_bus_lock_states(b, PCI_BUS_STATE_WORKING) > 0) {
> pci_rescan_bus(b);
> pci_bus_unlock(b);
> }
> - mutex_unlock(&pci_remove_rescan_mutex);
> pci_host_bridge_hotplug_unlock();
> }
> return count;
> @@ -326,13 +323,11 @@ dev_rescan_store(struct device *dev, struct device_attribute *attr,
> if (val) {
> struct pci_bus *bus = pdev->bus;
>
> - mutex_lock(&pci_remove_rescan_mutex);
> if (pci_bus_lock_states(bus, PCI_BUS_STATE_WORKING) > 0) {
> if (pdev->is_added)
> pci_rescan_bus(bus);
> pci_bus_unlock(bus);
> }
> - mutex_unlock(&pci_remove_rescan_mutex);
> }
> return count;
> }
> @@ -342,13 +337,11 @@ static void remove_callback(struct device *dev)
> struct pci_dev *pdev = to_pci_dev(dev);
> struct pci_bus *bus = pdev->bus;
>
> - mutex_lock(&pci_remove_rescan_mutex);
> if (pci_bus_lock_states(bus, PCI_BUS_STATE_WORKING) > 0) {
> pci_bus_get(bus);
> pci_stop_and_remove_bus_device(pdev);
> pci_unlock_and_put_bus(bus);
> }
> - mutex_unlock(&pci_remove_rescan_mutex);
> }
>
> static ssize_t
> @@ -382,14 +375,12 @@ dev_bus_rescan_store(struct device *dev, struct device_attribute *attr,
> return -EINVAL;
>
> if (val) {
> - mutex_lock(&pci_remove_rescan_mutex);
> if (!pci_is_root_bus(bus))
> pci_rescan_bus_bridge_resize(bus->self);
> else if (pci_bus_lock_states(bus, PCI_BUS_STATE_WORKING) > 0) {
> pci_rescan_bus(bus);
> pci_bus_unlock(bus);
> }
> - mutex_unlock(&pci_remove_rescan_mutex);
> }
> return count;
> }
> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
> index da6f04c..09517c3 100644
> --- a/drivers/pci/probe.c
> +++ b/drivers/pci/probe.c
> @@ -1626,11 +1626,9 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
> if (pci_bus_get_state(bus) < PCI_BUS_STATE_WORKING) {
> dev_dbg(&bus->dev, "fixups for bus\n");
> pcibios_fixup_bus(bus);
> - if (pci_is_root_bus(bus)) {
> + if (pci_is_root_bus(bus))
> pci_bus_change_state(bus, PCI_BUS_STATE_REGISTERED,
> PCI_BUS_STATE_WORKING, false);
> - bus->is_added = 1;
> - }
> }
>
> for (pass=0; pass < 2; pass++)
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 9e52e88..0e50ec8 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -442,7 +442,6 @@ struct pci_bus {
> struct device dev;
> struct bin_attribute *legacy_io; /* legacy I/O for this bus */
> struct bin_attribute *legacy_mem; /* legacy mem */
> - unsigned int is_added:1;
> atomic_t state;
> };
>
> @@ -463,21 +462,12 @@ struct pci_bus {
> #define PCI_BUS_STATE_DESTROYED 0x40 /* invalid state */
> #define PCI_BUS_STATE_MASK 0x7F
>
> -#ifdef CONFIG_PCI_BUS_LOCK
> #define PCI_BUS_STATE_LOCK 0x10000 /* for pci core only */
>
> static inline bool pci_bus_is_locked(struct pci_bus *bus)
> {
> return !!(atomic_read(&bus->state) & PCI_BUS_STATE_LOCK);
> }
> -#else /* CONFIG_PCI_BUS_LOCK */
> -#define PCI_BUS_STATE_LOCK 0x0000 /* for pci core only */
> -
> -static inline bool pci_bus_is_locked(struct pci_bus *bus)
> -{
> - return true;
> -}
> -#endif /* CONFIG_PCI_BUS_LOCK */
>
> static inline int pci_bus_get_state(struct pci_bus *bus)
> {
> --
> 1.7.9.5
>
next prev parent reply other threads:[~2012-09-11 23:22 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-07 16:10 [RFC PATCH v1 00/22] introduce PCI bus lock to serialize PCI hotplug operations Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 01/22] PCI: use pci_get_domain_bus_and_slot() to avoid race conditions Jiang Liu
2012-09-11 22:00 ` Bjorn Helgaas
2012-09-12 8:37 ` Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 02/22] PCI: trivial cleanups for drivers/pci/remove.c Jiang Liu
2012-09-11 22:03 ` Bjorn Helgaas
2012-09-12 8:50 ` Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 03/22] PCI: change PCI device management code to better follow device model Jiang Liu
2012-09-11 22:03 ` Bjorn Helgaas
2012-08-07 16:10 ` [RFC PATCH v1 04/22] PCI: split PCI bus device registration into two stages Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 05/22] PCI: introduce pci_bus_{get|put}() to manage PCI bus reference count Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 06/22] PCI: use a global lock to serialize PCI root bridge hotplug operations Jiang Liu
2012-09-11 22:57 ` Bjorn Helgaas
2012-09-12 15:42 ` Jiang Liu
2012-09-12 16:51 ` Bjorn Helgaas
2012-09-13 16:00 ` [PATCH 1/2] PCI: introduce root bridge hotplug safe interfaces to walk root buses Jiang Liu
2012-09-13 17:40 ` Bjorn Helgaas
2012-09-17 15:55 ` Jiang Liu
2012-09-17 16:24 ` Bjorn Helgaas
2012-09-18 21:39 ` Bjorn Helgaas
2012-09-21 16:07 ` [PATCH v4] PCI: introduce two interfaces to walk PCI buses Jiang Liu
2012-09-26 20:14 ` Bjorn Helgaas
2012-09-13 16:00 ` [PATCH 2/2] PCI: remove host bridge hotplug unsafe interface pci_get_next_bus() Jiang Liu
2012-09-17 15:51 ` [RFC PATCH v1 06/22] PCI: use a global lock to serialize PCI root bridge hotplug operations Jiang Liu
2012-09-20 18:49 ` Paul E. McKenney
2012-08-07 16:10 ` [RFC PATCH v1 07/22] PCI: introduce PCI bus lock to serialize PCI " Jiang Liu
2012-09-11 23:24 ` Bjorn Helgaas
2012-08-07 16:10 ` [RFC PATCH v1 08/22] PCI: introduce hotplug safe search interfaces for PCI bus/device Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 09/22] PCI: enhance PCI probe logic to support PCI bus lock mechanism Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 10/22] PCI: enhance PCI bus specific " Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 11/22] PCI: enhance PCI resource assignment " Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 12/22] PCI: enhance PCI remove " Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 13/22] PCI: make each PCI device hold a reference to its parent PCI bus Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 14/22] PCI/sysfs: use PCI bus lock to avoid race conditions Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 15/22] PCI/eeepc: " Jiang Liu
2012-09-11 23:18 ` Bjorn Helgaas
2012-09-12 14:24 ` [PATCH] eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug() Jiang Liu
2012-09-12 19:59 ` Bjorn Helgaas
2012-08-07 16:10 ` [RFC PATCH v1 16/22] PCI/asus-wmi: use PCI bus lock to avoid race conditions Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 17/22] PCI/pciehp: " Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 18/22] PCI/acpiphp: " Jiang Liu
2012-08-07 16:10 ` [RFC PATCH v1 19/22] PCI/x86: enable PCI bus lock mechanism for x86 platforms Jiang Liu
2012-09-11 23:22 ` Bjorn Helgaas
2012-09-12 9:56 ` Jiang Liu
2012-08-07 16:11 ` [RFC PATCH v1 20/22] PCI/IA64: enable PCI bus lock mechanism for IA64 platforms Jiang Liu
2012-08-07 16:11 ` [RFC PATCH v1 21/22] PCI: cleanups for PCI bus lock implementation Jiang Liu
2012-09-11 23:21 ` Bjorn Helgaas [this message]
2012-09-12 8:58 ` Jiang Liu
2012-08-07 16:11 ` [RFC PATCH v1 22/22] PCI: unexport pci_root_buses Jiang Liu
2012-08-07 18:11 ` [RFC PATCH v1 00/22] introduce PCI bus lock to serialize PCI hotplug operations Don Dutile
2012-08-08 15:49 ` 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=CAErSpo4ubTSu5cSrLVfs5UHc44KgtzO_OxL_QganfhqYn2hUWQ@mail.gmail.com \
--to=bhelgaas@google.com \
--cc=ddutile@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=huxinwei@huawei.com \
--cc=izumi.taku@jp.fujitsu.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=liuj97@gmail.com \
--cc=rjw@sisk.pl \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.