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

Commit e6d13150 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI updates from Rafael Wysocki:
 "These update the ACPICA code in the kernel to the 20181213 upstream
  revision, make it possible to build the ACPI subsystem without PCI
  support, and a new OEM _OSI string, add a new device support to the
  ACPI driver for AMD SoCs and fix PM handling in the ACPI driver for
  Intel SoCs, fix the SPCR table handling and do some assorted fixes and
  cleanups.

  Specifics:

   - Update the ACPICA code in the kernel to the 20181213 upstream
     revision including:
      * New Windows _OSI strings (Bob Moore, Jung-uk Kim).
      * Buffers-to-string conversions update (Bob Moore).
      * Removal of support for expressions in package elements (Bob
        Moore).
      * New option to display method/object evaluation in debug output
        (Bob Moore).
      * Compiler improvements (Bob Moore, Erik Schmauss).
      * Minor debugger fix (Erik Schmauss).
      * Disassembler improvement (Erik Schmauss).
      * Assorted cleanups (Bob Moore, Colin Ian King, Erik Schmauss).

   - Add support for a new OEM _OSI string to indicate special handling
     of secondary graphics adapters on some systems (Alex Hung).

   - Make it possible to build the ACPI subystem without PCI support
     (Sinan Kaya).

   - Make the SPCR table handling regard baud rate 0 in accordance with
     the specification of it and make the DSDT override code support
     DSDT code names generated by recent ACPICA (Andy Shevchenko, Wang
     Dongsheng, Nathan Chancellor).

   - Add clock frequency for Hisilicon Hip08 SPI controller to the ACPI
     driver for AMD SoCs (APD) (Jay Fang).

   - Fix the PM handling during device init in the ACPI driver for Intel
     SoCs (LPSS) (Hans de Goede).

   - Avoid double panic()s by clearing the APEI GHES block_status before
     panic() (Lenny Szubowicz).

   - Clean up a function invocation in the ACPI core and get rid of some
     code duplication by using the DEFINE_SHOW_ATTRIBUTE macro in the
     APEI support code (Alexey Dobriyan, Yangtao Li)"

* tag 'acpi-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (31 commits)
  ACPI / tables: Add an ifdef around amlcode and dsdt_amlcode
  ACPI/APEI: Clear GHES block_status before panic()
  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
  ACPI / OSI: Add OEM _OSI string to enable dGPU direct output
  ACPI / tables: add DSDT AmlCode new declaration name support
  ACPICA: Update version to 20181213
  ACPICA: change coding style to match ACPICA, no functional change
  ACPICA: Debug output: Add option to display method/object evaluation
  ACPICA: disassembler: disassemble OEMx tables as AML
  ACPICA: Add "Windows 2018.2" string in the _OSI support
  ACPICA: Expressions in package elements are not supported
  ACPICA: Update buffer-to-string conversions
  ACPICA: add comments, no functional change
  ACPICA: Remove defines that use deprecated flag
  ...
parents 1e2af254 3eb85368

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

+2 −3
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
@@ -336,7 +335,7 @@ config ACPI_CUSTOM_DSDT_FILE 
	  See Documentation/acpi/dsdt-override.txt



	  Enter the full path name to the file which includes the AmlCode

	  declaration.

	  or dsdt_aml_code declaration.



	  If unsure, don't enter a file name.
@@ -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/acpi_apd.c

+6 −0
Original line number Diff line number Diff line
@@ -166,6 +166,11 @@ static const struct apd_device_desc thunderx2_i2c_desc = { 
	.setup = acpi_apd_setup,

	.fixed_clk_rate = 125000000,

};



static const struct apd_device_desc hip08_spi_desc = {

	.setup = acpi_apd_setup,

	.fixed_clk_rate = 250000000,

};

#endif



#else
@@ -234,6 +239,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { 
	{ "CAV9007",  APD_ADDR(thunderx2_i2c_desc) },

	{ "HISI02A1", APD_ADDR(hip07_i2c_desc) },

	{ "HISI02A2", APD_ADDR(hip08_i2c_desc) },

	{ "HISI0173", APD_ADDR(hip08_spi_desc) },

#endif

	{ }

};