x86/PCI: split out pci_mmcfg_check_reserved() for code reuse (2a76c450) · Commits · 戴 / test

arch/x86/pci/mmconfig-shared.c

+25 −26

Original line number	Diff line number	Diff line
		@@ -474,18 +474,12 @@ static int __init is_mmconf_reserved(check_reserved_t is_reserved,
		return valid;
		}

		static void __init pci_mmcfg_reject_broken(int early)
		static int __devinit pci_mmcfg_check_reserved(struct pci_mmcfg_region *cfg,
		int early)
		{
		struct pci_mmcfg_region *cfg;

		list_for_each_entry(cfg, &pci_mmcfg_list, list) {
		int valid = 0;

		if (!early && !acpi_disabled) {
		valid = is_mmconf_reserved(is_acpi_reserved, cfg, 0);

		if (valid)
		continue;
		if (is_mmconf_reserved(is_acpi_reserved, cfg, 0))
		return 1;
		else
		printk(KERN_ERR FW_BUG PREFIX
		"MMCONFIG at %pR not reserved in "
		@@ -496,17 +490,22 @@ static void __init pci_mmcfg_reject_broken(int early)
		/* Don't try to do this check unless configuration
		type 1 is available. how about type 2 ?*/
		if (raw_pci_ops)
		valid = is_mmconf_reserved(e820_all_mapped, cfg, 1);
		return is_mmconf_reserved(e820_all_mapped, cfg, 1);

		if (!valid)
		goto reject;
		return 0;
		}

		return;
		static void __init pci_mmcfg_reject_broken(int early)
		{
		struct pci_mmcfg_region *cfg;

		reject:
		list_for_each_entry(cfg, &pci_mmcfg_list, list) {
		if (pci_mmcfg_check_reserved(cfg, early) == 0) {
		printk(KERN_INFO PREFIX "not using MMCONFIG\n");
		free_all_mmcfg();
		return;
		}
		}
		}

		static int __initdata known_bridge;