Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f0db7a2 authored by Feng Tang's avatar Feng Tang Committed by Len Brown
Browse files

SFI: Hook PCI MMCONFIG 



First check ACPI, and if that fails, ask SFI to find the MCFG.

Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
parent efafc8b2

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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)



config PCI_OLPC

	def_bool y

arch/x86/pci/mmconfig-shared.c

+4 −2
Original line number Diff line number Diff line
@@ -13,10 +13,12 @@ 
#include <linux/pci.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <linux/sfi_acpi.h>

#include <linux/bitmap.h>

#include <linux/sort.h>

#include <asm/e820.h>

#include <asm/pci_x86.h>

#include <asm/acpi.h>



#define PREFIX "PCI: "
@@ -493,7 +495,7 @@ static void __init pci_mmcfg_reject_broken(int early) 
		       (unsigned int)cfg->start_bus_number,

		       (unsigned int)cfg->end_bus_number);



		if (!early)

		if (!early && !acpi_disabled)

			valid = is_mmconf_reserved(is_acpi_reserved, addr, size, i, cfg, 0);



		if (valid)
@@ -608,7 +610,7 @@ static void __init __pci_mmcfg_init(int early) 
	}



	if (!known_bridge)

		acpi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg);

		acpi_sfi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg);



	pci_mmcfg_reject_broken(early);

arch/x86/pci/mmconfig_32.c

+1 −1
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 


#include <linux/pci.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <asm/e820.h>

#include <asm/pci_x86.h>

#include <acpi/acpi.h>



/* Assume systems with more busses have correct MCFG */

#define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))