Commit 574a5941 authored by Jiang Liu's avatar Jiang Liu Committed by Bjorn Helgaas
Browse files

x86/PCI: refine __pci_mmcfg_init() for better code readability 



Refine __pci_mmcfg_init() for better code readability.

Reviewed-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarJiang Liu <liuj97@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 8503562f

arch/x86/pci/mmconfig-shared.c

+21 −25
Original line number Diff line number Diff line
@@ -544,8 +544,6 @@ static void __init pci_mmcfg_reject_broken(int early) 
	}

}



static int __initdata known_bridge;



static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,

					struct acpi_mcfg_allocation *cfg)

{
@@ -617,28 +615,7 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header) 


static void __init __pci_mmcfg_init(int early)

{

	/* MMCONFIG disabled */

	if ((pci_probe & PCI_PROBE_MMCONF) == 0)

		return;



	/* MMCONFIG already enabled */

	if (!early && !(pci_probe & PCI_PROBE_MASK & ~PCI_PROBE_MMCONF))

		return;



	/* for late to exit */

	if (known_bridge)

		return;



	if (early) {

		if (pci_mmcfg_check_hostbridge())

			known_bridge = 1;

	}



	if (!known_bridge)

		acpi_sfi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg);



	pci_mmcfg_reject_broken(early);



	if (list_empty(&pci_mmcfg_list))

		return;
@@ -660,15 +637,34 @@ static void __init __pci_mmcfg_init(int early) 
	}

}



static int __initdata known_bridge;



void __init pci_mmcfg_early_init(void)

{

	if (pci_probe & PCI_PROBE_MMCONF) {

		if (pci_mmcfg_check_hostbridge())

			known_bridge = 1;

		else

			acpi_sfi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg);

		__pci_mmcfg_init(1);

	}

}



void __init pci_mmcfg_late_init(void)

{

	/* MMCONFIG disabled */

	if ((pci_probe & PCI_PROBE_MMCONF) == 0)

		return;



	if (known_bridge)

		return;



	/* MMCONFIG hasn't been enabled yet, try again */

	if (pci_probe & PCI_PROBE_MASK & ~PCI_PROBE_MMCONF) {

		acpi_sfi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg);

		__pci_mmcfg_init(0);

	}

}



static int __init pci_mmcfg_late_insert_resources(void)

{