leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/PCI: simplify pci_mmcfg_late_insert_resources()

Browse Source 
Reduce redundant code to simplify pci_mmcfg_late_insert_resources().

Reviewed-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jiang Liu <liuj97@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Jiang Liu 2012-06-22 14:55:18 +08:00 committed by Bjorn Helgaas
parent c0fa40784c
commit 66e8850a2a
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/x86/pci/mmconfig-shared.c
View File

@ -26,7 +26,6 @@
#define PREFIX "PCI: " #define PREFIX "PCI: "
/* Indicate if the mmcfg resources have been placed into the resource table. */ /* Indicate if the mmcfg resources have been placed into the resource table. */
static int __initdata pci_mmcfg_resources_inserted;
static bool pci_mmcfg_running_state; static bool pci_mmcfg_running_state;
static bool pci_mmcfg_arch_init_failed; static bool pci_mmcfg_arch_init_failed;
static DEFINE_MUTEX(pci_mmcfg_lock); static DEFINE_MUTEX(pci_mmcfg_lock);
@ -373,18 +372,6 @@ static int __init pci_mmcfg_check_hostbridge(void)
return !list_empty(&pci_mmcfg_list); return !list_empty(&pci_mmcfg_list);
} }
static void __init pci_mmcfg_insert_resources(void)
{
struct pci_mmcfg_region *cfg;
list_for_each_entry(cfg, &pci_mmcfg_list, list)
if (!cfg->res.parent)
insert_resource(&iomem_resource, &cfg->res);
/* Mark that the resources have been inserted. */
pci_mmcfg_resources_inserted = 1;
}
static acpi_status __devinit check_mcfg_resource(struct acpi_resource *res, static acpi_status __devinit check_mcfg_resource(struct acpi_resource *res,
void *data) void *data)
{ {
@ -668,11 +655,7 @@ static void __init __pci_mmcfg_init(int early)
if (pci_mmcfg_arch_init()) if (pci_mmcfg_arch_init())
pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
else { else {
/* free_all_mmcfg();
* Signal not to attempt to insert mmcfg resources because
* the architecture mmcfg setup could not initialize.
*/
pci_mmcfg_resources_inserted = 1;
pci_mmcfg_arch_init_failed = true; pci_mmcfg_arch_init_failed = true;
} }
} }
@ -689,15 +672,12 @@ void __init pci_mmcfg_late_init(void)
static int __init pci_mmcfg_late_insert_resources(void) static int __init pci_mmcfg_late_insert_resources(void)
{ {
struct pci_mmcfg_region *cfg;
pci_mmcfg_running_state = true; pci_mmcfg_running_state = true;
/* /* If we are not using MMCONFIG, don't insert the resources. */
* If resources are already inserted or we are not using MMCONFIG, if ((pci_probe & PCI_PROBE_MMCONF) == 0)
* don't insert the resources.
*/
if ((pci_mmcfg_resources_inserted == 1) ||
(pci_probe & PCI_PROBE_MMCONF) == 0 ||
list_empty(&pci_mmcfg_list))
return 1; return 1;
/* /*
@ -705,7 +685,9 @@ static int __init pci_mmcfg_late_insert_resources(void)
* marked so it won't cause request errors when __request_region is * marked so it won't cause request errors when __request_region is
* called. * called.
*/ */
pci_mmcfg_insert_resources(); list_for_each_entry(cfg, &pci_mmcfg_list, list)
if (!cfg->res.parent)
insert_resource(&iomem_resource, &cfg->res);
return 0; return 0;
} }