Re: [PATCH 3/5 v2] PCI: make SRIOV resources optional

[Oliver Hartkopp <socketcan@hartkopp.net>]

On 01.07.2011 01:47, Ram Pai wrote:
> From: Yinghai Lu <yinghai@kernel.org>
> 
> From: Yinghai Lu <yinghai@kernel.org>
> 
> Allocate resources to SRIOV BARs only after all other required
> resource-requests are satisfied. Dont retry if resource allocation for SRIOV
> BARs fail.
> 
> Signed-off-by: Ram Pai <linuxram@us.ibm.com>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>

Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>

I applied the whole patchset and it looks very similar to the dmsg output
before the problematic commit that caused the regression.

Tnx!

Oliver


> ---
>  drivers/pci/setup-bus.c |   10 ++++++++++
>  1 files changed, 10 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
> index 9f2f15f..a0555cb 100644
> --- a/drivers/pci/setup-bus.c
> +++ b/drivers/pci/setup-bus.c
> @@ -669,6 +669,16 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
>  			if (r->parent || (r->flags & mask) != type)
>  				continue;
>  			r_size = resource_size(r);
> +#ifdef CONFIG_PCI_IOV
> +			/* put SRIOV requested res to the optional list */
> +			if (add_head && i >= PCI_IOV_RESOURCES &&
> +					i <= PCI_IOV_RESOURCE_END) {
> +				r->end = r->start - 1;
> +				add_to_list(add_head, dev, r, r_size, 1);
> +				children_add_size += r_size;
> +				continue;
> +			}
> +#endif
>  			/* For bridges size != alignment */
>  			align = pci_resource_alignment(dev, r);
>  			order = __ffs(align) - 20;