[PATCH] ARM/PCI: set MPS before pci_bus_add_devices()

[Murali Karicheri]

On 07/21/2015 05:35 PM, 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 at ti.com>
> Reported-by: Bjorn Helgaas <bhelgaas at google.com>
> ---
>   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)) {
> +			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
>
Bjorn,

When you get a chance, please review this. We discussed this change in a 
separate thread and agreed for a patch from me.

Thanks and regards

-- 
Murali Karicheri
Linux Kernel, Keystone