Re: [PATCH] x86: unify using pci_mmcfg_insert_resource

[Jesse Barnes <jbarnes@virtuousgeek.org>]

Ingo, is this stuff in the same branch with the BAR debugging fix?

Thanks,
Jesse

On Saturday, August 30, 2008 12:58 am Yinghai Lu wrote:
> even with known_bridge insert them late too.
>
> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
>
> Index: linux-2.6/arch/x86/pci/mmconfig-shared.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/pci/mmconfig-shared.c
> +++ linux-2.6/arch/x86/pci/mmconfig-shared.c
> @@ -209,7 +209,7 @@ static int __init pci_mmcfg_check_hostbr
>  	return name != NULL;
>  }
>
> -static void __init pci_mmcfg_insert_resources(unsigned long
> resource_flags) +static void __init pci_mmcfg_insert_resources(void)
>  {
>  #define PCI_MMCFG_RESOURCE_NAME_LEN 19
>  	int i;
> @@ -233,7 +233,7 @@ static void __init pci_mmcfg_insert_reso
>  			 cfg->pci_segment);
>  		res->start = cfg->address;
>  		res->end = res->start + (num_buses << 20) - 1;
> -		res->flags = IORESOURCE_MEM | resource_flags;
> +		res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
>  		insert_resource(&iomem_resource, res);
>  		names += PCI_MMCFG_RESOURCE_NAME_LEN;
>  	}
> @@ -434,11 +434,9 @@ static void __init __pci_mmcfg_init(int
>  	    (pci_mmcfg_config[0].address == 0))
>  		return;
>
> -	if (pci_mmcfg_arch_init()) {
> -		if (known_bridge)
> -			pci_mmcfg_insert_resources(IORESOURCE_BUSY);
> +	if (pci_mmcfg_arch_init())
>  		pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
> -	} else {
> +	else {
>  		/*
>  		 * Signal not to attempt to insert mmcfg resources because
>  		 * the architecture mmcfg setup could not initialize.
> @@ -475,7 +473,7 @@ static int __init pci_mmcfg_late_insert_
>  	 * marked so it won't cause request errors when __request_region is
>  	 * called.
>  	 */
> -	pci_mmcfg_insert_resources(0);
> +	pci_mmcfg_insert_resources();
>
>  	return 0;
>  }