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

Commit 8364e1f8 authored by Jan Kiszka's avatar Jan Kiszka Committed by Thomas Gleixner
Browse files

x86/jailhouse: Allow to use PCI_MMCONFIG without ACPI 



Jailhouse does not use ACPI, but it does support MMCONFIG. Make sure the
latter can be built without having to enable ACPI as well. Primarily, its
required to make the AMD mmconf-fam10h_64 depend upon MMCONFIG and
ACPI, instead of just the former.

Saves some bytes in the Jailhouse non-root kernel.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: jailhouse-dev@googlegroups.com
Cc: linux-pci@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lkml.kernel.org/r/788bbd5325d1922235e9562c213057425fbc548c.1520408357.git.jan.kiszka@siemens.com
parent b45c9f36

arch/x86/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -2642,7 +2642,7 @@ config PCI_DIRECT 
config PCI_MMCONFIG

	bool "Support mmconfig PCI config space access" if X86_64

	default y

	depends on PCI && (ACPI || SFI)

	depends on PCI && (ACPI || SFI || JAILHOUSE_GUEST)

	depends on X86_64 || (PCI_GOANY || PCI_GOMMCONFIG)



config PCI_OLPC
@@ -2658,6 +2658,10 @@ config PCI_DOMAINS 
	def_bool y

	depends on PCI



config MMCONF_FAM10H

	def_bool y

	depends on X86_64 && PCI_MMCONFIG && ACPI



config PCI_CNB20LE_QUIRK

	bool "Read CNB20LE Host Bridge Windows" if EXPERT

	depends on PCI

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -146,6 +146,6 @@ ifeq ($(CONFIG_X86_64),y) 
	obj-$(CONFIG_GART_IOMMU)	+= amd_gart_64.o aperture_64.o

	obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary_64.o tce_64.o



	obj-$(CONFIG_PCI_MMCONFIG)	+= mmconf-fam10h_64.o

	obj-$(CONFIG_MMCONF_FAM10H)	+= mmconf-fam10h_64.o

	obj-y				+= vsmp_64.o

endif

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static void init_amd_k8(struct cpuinfo_x86 *c) 


static void init_amd_gh(struct cpuinfo_x86 *c)

{

#ifdef CONFIG_X86_64

#ifdef CONFIG_MMCONF_FAM10H

	/* do this for boot cpu */

	if (c == &boot_cpu_data)

		check_enable_amd_mmconf_dmi();