From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga01-in.huawei.com ([58.251.152.64]:49884 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932848AbbHKBHL (ORCPT ); Mon, 10 Aug 2015 21:07:11 -0400 Subject: Re: [PATCH v2 0/2] Fix a deadlock for aer and pciehp driver To: Bjorn Helgaas References: <1437124592-2070-1-git-send-email-wangyijing@huawei.com> <20150810192906.GE32452@google.com> CC: , , , From: wangyijing Message-ID: <55C94AB4.4090206@huawei.com> Date: Tue, 11 Aug 2015 09:07:00 +0800 MIME-Version: 1.0 In-Reply-To: <20150810192906.GE32452@google.com> Content-Type: text/plain; charset="UTF-8" Sender: linux-pci-owner@vger.kernel.org List-ID: Thanks! 在 2015/8/11 3:29, Bjorn Helgaas 写道: > On Fri, Jul 17, 2015 at 05:16:30PM +0800, Yijing Wang wrote: >> Yijing Wang (2): >> PCI: Use a local mutex instead of pci_bus_sem to avoid deadlock >> PCI: Lock pci_slot_mutex when traverse bus->slots >> >> arch/powerpc/kernel/pci_of_scan.c | 6 +----- >> arch/sparc/kernel/pci.c | 6 +----- >> drivers/pci/probe.c | 6 +----- >> drivers/pci/slot.c | 26 +++++++++++++++++++++----- >> include/linux/pci.h | 4 +++- >> 5 files changed, 27 insertions(+), 21 deletions(-) >> > > I squashed the following fix from Yijing into the second patch to fix a > build issue: > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 214bf3f..b3ba7fe 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -798,7 +798,11 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr, > const char *name, > struct hotplug_slot *hotplug); > void pci_destroy_slot(struct pci_slot *slot); > +#ifdef CONFIG_SYSFS > void pci_dev_assign_slot(struct pci_dev *dev); > +#else > +static inline void pci_dev_assign_slot(struct pci_dev *dev) { } > +#endif > int pci_scan_slot(struct pci_bus *bus, int devfn); > struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn); > void pci_device_add(struct pci_dev *dev, struct pci_bus *bus); > >