Commit 3eb85368 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-pci' 

* acpi-pci:
  ACPI: Make PCI slot detection driver depend on PCI
  ACPI/IORT: Stub out ACS functions when CONFIG_PCI is not set
  arm64: select ACPI PCI code only when both features are enabled
  PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set
  ACPICA: Remove PCI bits from ACPICA when CONFIG_PCI is unset
  ACPI: Allow CONFIG_PCI to be unset for reboot
  ACPI: Move PCI reset to a separate function
parents 4cd9da8a 5c6a1177

arch/arm64/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ config ARM64 
	select ACPI_GTDT if ACPI

	select ACPI_IORT if ACPI

	select ACPI_REDUCED_HARDWARE_ONLY if ACPI

	select ACPI_MCFG if ACPI

	select ACPI_MCFG if (ACPI && PCI)

	select ACPI_SPCR_TABLE if ACPI

	select ACPI_PPTT if ACPI

	select ARCH_CLOCKSOURCE_DATA
@@ -163,7 +163,7 @@ config ARM64 
	select OF

	select OF_EARLY_FLATTREE

	select OF_RESERVED_MEM

	select PCI_ECAM if ACPI

	select PCI_ECAM if (ACPI && PCI)

	select POWER_RESET

	select POWER_SUPPLY

	select REFCOUNT_FULL

arch/x86/include/asm/pci_x86.h

+7 −0
Original line number Diff line number Diff line
@@ -121,7 +121,14 @@ extern void __init dmi_check_pciprobe(void); 
extern void __init dmi_check_skip_isa_align(void);



/* some common used subsys_initcalls */

#ifdef CONFIG_PCI

extern int __init pci_acpi_init(void);

#else

static inline int  __init pci_acpi_init(void)

{

	return -EINVAL;

}

#endif

extern void __init pcibios_irq_init(void);

extern int __init pcibios_init(void);

extern int pci_legacy_init(void);

drivers/acpi/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ config ARCH_SUPPORTS_ACPI 
menuconfig ACPI

	bool "ACPI (Advanced Configuration and Power Interface) Support"

	depends on ARCH_SUPPORTS_ACPI

	depends on PCI

	select PNP

	default y if X86

	help
@@ -370,7 +369,7 @@ config ACPI_DEBUG 


config ACPI_PCI_SLOT

	bool "PCI slot detection driver"

	depends on SYSFS

	depends on SYSFS && PCI

	help

	  This driver creates entries in /sys/bus/pci/slots/ for all PCI

	  slots in the system.  This can help correlate PCI bus addresses,

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ acpi-y += processor_core.o 
acpi-$(CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC) += processor_pdc.o

acpi-y				+= ec.o

acpi-$(CONFIG_ACPI_DOCK)	+= dock.o

acpi-y				+= pci_root.o pci_link.o pci_irq.o

acpi-$(CONFIG_PCI)		+= pci_root.o pci_link.o pci_irq.o

obj-$(CONFIG_ACPI_MCFG)		+= pci_mcfg.o

acpi-y				+= acpi_lpss.o acpi_apd.o

acpi-y				+= acpi_platform.o

drivers/acpi/acpica/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -77,13 +77,13 @@ acpi-y += \ 
	hwacpi.o	\

	hwesleep.o	\

	hwgpe.o		\

	hwpci.o		\

	hwregs.o	\

	hwsleep.o	\

	hwvalid.o	\

	hwxface.o	\

	hwxfsleep.o



acpi-$(CONFIG_PCI) += hwpci.o

acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o



acpi-y +=		\

CRA Git | Maintained and supported by SUSTech CRA and CCSE