Commit 6149dffc authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-processor', 'acpi-cppc', 'acpi-apei' and 'acpi-sleep' 

* acpi-processor:
  ACPI: enable ACPI_PROCESSOR_IDLE on ARM64
  arm64: add support for ACPI Low Power Idle(LPI)
  drivers: firmware: psci: initialise idle states using ACPI LPI
  cpuidle: introduce CPU_PM_CPU_IDLE_ENTER macro for ARM{32, 64}
  arm64: cpuidle: drop __init section marker to arm_cpuidle_init
  ACPI / processor_idle: Add support for Low Power Idle(LPI) states
  ACPI / processor_idle: introduce ACPI_PROCESSOR_CSTATE

* acpi-cppc:
  mailbox: pcc: Add PCC request and free channel declarations
  ACPI / CPPC: Prevent cpc_desc_ptr points to the invalid data
  ACPI: CPPC: Return error if _CPC is invalid on a CPU

* acpi-apei:
  ACPI / APEI: Add Boot Error Record Table (BERT) support
  ACPI / einj: Make error paths more talkative
  ACPI / einj: Convert EINJ_PFX to proper pr_fmt

* acpi-sleep:
  ACPI: Execute _PTS before system reboot
parents f6bc0a16 8fc85c6a 866ae696 a3e2acc5 2c85025c

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -582,6 +582,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	bootmem_debug	[KNL] Enable bootmem allocator debug messages.



	bert_disable	[ACPI]

			Disable BERT OS support on buggy BIOSes.



	bttv.card=	[HW,V4L] bttv (bt848 + bt878 based grabber cards)

	bttv.radio=	Most important insmod options are available as

			kernel args too.

arch/arm64/kernel/cpuidle.c

+19 −1
Original line number Diff line number Diff line
@@ -9,13 +9,16 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/acpi.h>

#include <linux/cpuidle.h>

#include <linux/cpu_pm.h>

#include <linux/of.h>

#include <linux/of_device.h>



#include <asm/cpuidle.h>

#include <asm/cpu_ops.h>



int __init arm_cpuidle_init(unsigned int cpu)

int arm_cpuidle_init(unsigned int cpu)

{

	int ret = -EOPNOTSUPP;
@@ -39,3 +42,18 @@ int arm_cpuidle_suspend(int index) 


	return cpu_ops[cpu]->cpu_suspend(index);

}



#ifdef CONFIG_ACPI



#include <acpi/processor.h>



int acpi_processor_ffh_lpi_probe(unsigned int cpu)

{

	return arm_cpuidle_init(cpu);

}



int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi)

{

	return CPU_PM_CPU_IDLE_ENTER(arm_cpuidle_suspend, lpi->index);

}

#endif

drivers/acpi/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -213,6 +213,10 @@ config ACPI_CPU_FREQ_PSS 
	bool

	select THERMAL



config ACPI_PROCESSOR_CSTATE

	def_bool y

	depends on IA64 || X86



config ACPI_PROCESSOR_IDLE

	bool

	select CPU_IDLE
@@ -234,7 +238,7 @@ config ACPI_CPPC_LIB 
config ACPI_PROCESSOR

	tristate "Processor"

	depends on X86 || IA64 || ARM64

	select ACPI_PROCESSOR_IDLE if X86 || IA64

	select ACPI_PROCESSOR_IDLE

	select ACPI_CPU_FREQ_PSS if X86 || IA64

	default y

	help

drivers/acpi/apei/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ obj-$(CONFIG_ACPI_APEI_GHES) += ghes.o 
obj-$(CONFIG_ACPI_APEI_EINJ)	+= einj.o

obj-$(CONFIG_ACPI_APEI_ERST_DEBUG) += erst-dbg.o



apei-y := apei-base.o hest.o erst.o
 
apei-y := apei-base.o hest.o erst.o bert.o

drivers/acpi/apei/apei-internal.h

+1 −1
Original line number Diff line number Diff line 
/*

 * apei-internal.h - ACPI Platform Error Interface internal

 * definations.

 * definitions.

 */



#ifndef APEI_INTERNAL_H

CRA Git | Maintained and supported by SUSTech CRA and CCSE