Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753758AbbGWPFT (ORCPT ); Thu, 23 Jul 2015 11:05:19 -0400 Received: from mail-ig0-f177.google.com ([209.85.213.177]:38643 "EHLO mail-ig0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753349AbbGWPFM (ORCPT ); Thu, 23 Jul 2015 11:05:12 -0400 Date: Thu, 23 Jul 2015 09:59:36 -0500 From: Bjorn Helgaas To: Murali Karicheri Cc: linux@arm.linux.org.uk, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM/PCI: set MPS before pci_bus_add_devices() Message-ID: <20150723145936.GX21967@google.com> References: <1437514519-18545-1-git-send-email-m-karicheri2@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437514519-18545-1-git-send-email-m-karicheri2@ti.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2285 Lines: 71 On Tue, Jul 21, 2015 at 05:35:19PM -0400, Murali Karicheri wrote: > The MPS configuration should be done *before* pci_bus_add_devices(). > After pci_bus_add_devices(), drivers may be bound to devices, and > the PCI core shouldn't touch device configuration while a driver > owns the device. > > Signed-off-by: Murali Karicheri > Reported-by: Bjorn Helgaas Applied to pci/enumeration for v4.3, thanks! I removed the "bus" test; let me know if you think that's incorrect. > --- > arch/arm/kernel/bios32.c | 19 +++++-------------- > 1 file changed, 5 insertions(+), 14 deletions(-) > > diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c > index fcbbbb1..17efde7 100644 > --- a/arch/arm/kernel/bios32.c > +++ b/arch/arm/kernel/bios32.c > @@ -520,7 +520,8 @@ void pci_common_init_dev(struct device *parent, struct hw_pci *hw) > list_for_each_entry(sys, &head, node) { > struct pci_bus *bus = sys->bus; > > - if (!pci_has_flag(PCI_PROBE_ONLY)) { > + if (bus && !pci_has_flag(PCI_PROBE_ONLY)) { I think the test for "bus" being non-NULL is superfluous here. If "bus" were NULL, we would already oops in pci_bus_add_devices(). > + struct pci_bus *child; > /* > * Size the bridge windows. > */ > @@ -530,25 +531,15 @@ void pci_common_init_dev(struct device *parent, struct hw_pci *hw) > * Assign resources. > */ > pci_bus_assign_resources(bus); > - } > > + list_for_each_entry(child, &bus->children, node) > + pcie_bus_configure_settings(child); > + } > /* > * Tell drivers about devices found. > */ > pci_bus_add_devices(bus); > } > - > - list_for_each_entry(sys, &head, node) { > - struct pci_bus *bus = sys->bus; > - > - /* Configure PCI Express settings */ > - if (bus && !pci_has_flag(PCI_PROBE_ONLY)) { > - struct pci_bus *child; > - > - list_for_each_entry(child, &bus->children, node) > - pcie_bus_configure_settings(child); > - } > - } > } > > #ifndef CONFIG_PCI_HOST_ITE8152 > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/