From: Jiang Liu <liuj97@gmail.com>
To: Yinghai Lu <yinghai@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Tony Luck <tony.luck@intel.com>,
Yijing Wang <wangyijing@huawei.com>,
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
Jiang Liu <jiang.liu@huawei.com>
Subject: Re: [PATCH v2 3/9] PCI: preserve dev->subordinate until pci_stop_dev() has been called
Date: Sat, 15 Sep 2012 15:02:10 +0800 [thread overview]
Message-ID: <505427F2.7080709@gmail.com> (raw)
In-Reply-To: <CAE9FiQU66sW4HsDuqh69evvcT0cfx61=6JtgrU7FTJjMo-_Njw@mail.gmail.com>
On 09/15/2012 01:09 PM, Yinghai Lu wrote:
> On Fri, Sep 14, 2012 at 8:05 PM, Jiang Liu <liuj97@gmail.com> wrote:
>> From: Yijing Wang <wangyijing@huawei.com>
>>
>> Changeset 2ed168eeb3edec029aa0eca5cb981d6376f931f9 "PCI: Fold stop and
>> remove helpers into their callers" has changed the behavior when
>> removing a PCI device.
>>
>> Previously, for a PCI bridge device with secondary bus, dev->subordinate
>> is valid when calling PCI bus notification callbacks for
>> BUS_NOTIFY_ADD_DEVICE/BUS_NOTIFY_DEL_DEVICE events. Now dev->subordinate
>> has been reset to NULL when calling callbacks for BUS_NOTIFY_DEL_DEVICE
>> events, which may break some PCI bus notification callbacks.
>>
>> So revert to the original behavior to keep dev->subordinate valid for
>> both BUS_NOTIFY_ADD_DEVICE events and BUS_NOTIFY_DEL_DEVICE events.
>>
>> Signed-off-by: Yijing Wang <wangyijing@huawei.com>
>> Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
>> ---
>> drivers/pci/remove.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
>> index 86a4636..6244956 100644
>> --- a/drivers/pci/remove.c
>> +++ b/drivers/pci/remove.c
>> @@ -79,16 +79,16 @@ void pci_stop_and_remove_bus_device(struct pci_dev *dev)
>> * iterator. Therefore, iterate in reverse so we remove the VFs
>> * first, then the PF.
>> */
>> - if (bus) {
>> + if (bus)
>> list_for_each_entry_safe_reverse(child, tmp,
>> &bus->devices, bus_list)
>> pci_stop_and_remove_bus_device(child);
>> + pci_stop_dev(dev);
>>
>> + if (bus) {
>> pci_remove_bus(bus);
>> dev->subordinate = NULL;
>> }
>> -
>> - pci_stop_dev(dev);
>> pci_destroy_dev(dev);
>> }
>> EXPORT_SYMBOL(pci_stop_and_remove_bus_device);
>
> for support root bus support with acpi_pci_root (ioapic/iommu) will
> need pci_stop_bus_devices()
>
> so I just put those function back...
>
> http://git.kernel.org/?p=linux/kernel/git/yinghai/linux-yinghai.git;a=commitdiff;h=247a40206cf44488f21bc6074cf0ba2805d4d840
Hi Yinghai,
I will just drop this patch when merging with your pci root bus hotplug work.
--Gerry
next prev parent reply other threads:[~2012-09-15 7:02 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 [this message]
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 ` [PATCH v2 8/9] PCI/acpiphp: serialize access to the bridge_list list Jiang Liu
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=505427F2.7080709@gmail.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).