* Len Brown <lenb@xxxxxxxxxx> wrote: > From: Feng Tang <feng.tang@xxxxxxxxx> > > First check ACPI, and if that fails, ask SFI to find the MCFG. > > Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx> > Signed-off-by: Len Brown <len.brown@xxxxxxxxx> > --- > arch/x86/Kconfig | 2 +- > arch/x86/pci/mmconfig-shared.c | 5 ++++- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 8e864c0..8e20a0e 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -1880,7 +1880,7 @@ config PCI_DIRECT > > config PCI_MMCONFIG > def_bool y > - depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) > + depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY) Please also update the 64-bit side (there's no reason to do this on 32-bit only - even though your sample hw is probably 32-bit only) - and while at it, also unify the currently separate 32-bit and 64-bit PCI_MMCONFIG definitions. > @@ -606,7 +607,9 @@ static void __init __pci_mmcfg_init(int early) > } > > if (!known_bridge) > - acpi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg); > + if (acpi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg)) > + sfi_acpi_table_parse(ACPI_SIG_MCFG, NULL, NULL, 0, > + pci_parse_mcfg); Please introduce one common/generic helper: x86_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg); and do the fallback in that helper. We generally want to try ACPI first, SFI second. That helper makes it easier to add such fallback in other places as well, and will de-uglify the above code as well. Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
