lkml.org 
[lkml]   [2015]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] ARM/PCI: set MPS before pci_bus_add_devices()
On 07/23/2015 10:59 AM, Bjorn Helgaas wrote:
> 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 <m-karicheri2@ti.com>
>> Reported-by: Bjorn Helgaas <bhelgaas@google.com>
>
> Applied to pci/enumeration for v4.3, thanks! I removed the "bus" test; let
> me know if you think that's incorrect.
Ok. Will do. Thanks.

Murali

>
>> ---
>> 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
>>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>


--
Murali Karicheri
Linux Kernel, Keystone


\
 
 \ /
  Last update: 2015-08-03 20:41    [W:0.087 / U:1.560 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site