Commit 330235e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI updates from Rafael Wysocki:
 "These include new ACPICA material, a rework of the ACPI thermal
  driver, a switch-over of the ACPI processor driver to using _OSC
  instead of (long deprecated) _PDC for CPU initialization, a rework of
  firmware notifications handling in several drivers, fixes and cleanups
  for suspend-to-idle handling on AMD systems, ACPI backlight driver
  updates and more.

  Specifics:

   - Update the ACPICA code in the kernel to upstream revision 20230628
     including the following changes:
      - Suppress a GCC 12 dangling-pointer warning (Philip Prindeville)
      - Reformat the ACPI_STATE_COMMON macro and its users (George Guo)
      - Replace the ternary operator with ACPI_MIN() (Jiangshan Yi)
      - Add support for _DSC as per ACPI 6.5 (Saket Dumbre)
      - Remove a duplicate macro from zephyr header (Najumon B.A)
      - Add data structures for GED and _EVT tracking (Jose Marinho)
      - Fix misspelled CDAT DSMAS define (Dave Jiang)
      - Simplify an error message in acpi_ds_result_push() (Christophe
        Jaillet)
      - Add a struct size macro related to SRAT (Dave Jiang)
      - Add AML_NO_OPERAND_RESOLVE flag to Timer (Abhishek Mainkar)
      - Add support for RISC-V external interrupt controllers in MADT
        (Sunil V L)
      - Add RHCT flags, CMO and MMU nodes (Sunil V L)
      - Change ACPICA version to 20230628 (Bob Moore)

   - Introduce new wrappers for ACPICA notify handler install/remove and
     convert multiple drivers to using their own Notify() handlers
     instead of the ACPI bus type .notify() slated for removal (Michal
     Wilczynski)

   - Add backlight=native DMI quirk for Apple iMac12,1 and iMac12,2
     (Hans de Goede)

   - Put ACPI video and its child devices explicitly into D0 on boot to
     avoid platform firmware confusion (Kai-Heng Feng)

   - Add backlight=native DMI quirk for Lenovo Ideapad Z470 (Jiri Slaby)

   - Support obtaining physical CPU ID from MADT on LoongArch (Bibo Mao)

   - Convert ACPI CPU initialization to using _OSC instead of _PDC that
     has been depreceted since 2018 and dropped from the specification
     in ACPI 6.5 (Michal Wilczynski, Rafael Wysocki)

   - Drop non-functional nocrt parameter from ACPI thermal (Mario
     Limonciello)

   - Clean up the ACPI thermal driver, rework the handling of firmware
     notifications in it and make it provide a table of generic trip
     point structures to the core during initialization (Rafael Wysocki)

   - Defer enumeration of devices with _DEP pointing to IVSC (Wentong
     Wu)

   - Install SystemCMOS address space handler for ACPI000E (TAD) to meet
     platform firmware expectations on some platforms (Zhang Rui)

   - Fix finding the generic error data in the ACPi extlog driver for
     compatibility with old and new firmware interface versions
     (Xiaochun Lee)

   - Remove assorted unused declarations of functions (Yue Haibing)

   - Move AMBA bus scan handling into arm64 specific directory (Sudeep
     Holla)

   - Fix and clean up suspend-to-idle interface for AMD systems (Mario
     Limonciello, Andy Shevchenko)

   - Fix string truncation warning in pnpacpi_add_device() (Sunil V L)"

* tag 'acpi-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (66 commits)
  ACPI: x86: s2idle: Add a function to get LPS0 constraint for a device
  ACPI: x86: s2idle: Add for_each_lpi_constraint() helper
  ACPI: x86: s2idle: Add more debugging for AMD constraints parsing
  ACPI: x86: s2idle: Fix a logic error parsing AMD constraints table
  ACPI: x86: s2idle: Catch multiple ACPI_TYPE_PACKAGE objects
  ACPI: x86: s2idle: Post-increment variables when getting constraints
  ACPI: Adjust #ifdef for *_lps0_dev use
  ACPI: TAD: Install SystemCMOS address space handler for ACPI000E
  ACPI: Remove assorted unused declarations of functions
  ACPI: extlog: Fix finding the generic error data for v3 structure
  PNP: ACPI: Fix string truncation warning
  ACPI: Remove unused extern declaration acpi_paddr_to_node()
  ACPI: video: Add backlight=native DMI quirk for Apple iMac12,1 and iMac12,2
  ACPI: video: Put ACPI video and its child devices into D0 on boot
  ACPI: processor: LoongArch: Get physical ID from MADT
  ACPI: scan: Defer enumeration of devices with a _DEP pointing to IVSC device
  ACPI: thermal: Eliminate code duplication from acpi_thermal_notify()
  ACPI: thermal: Drop unnecessary thermal zone callbacks
  ACPI: thermal: Rework thermal_get_trend()
  ACPI: thermal: Use trip point table to register thermal zones
  ...
parents 2927d226 b483d3b8

Documentation/admin-guide/kernel-parameters.txt

+0 −4
Original line number Diff line number Diff line
@@ -6333,10 +6333,6 @@ 
			-1: disable all critical trip points in all thermal zones

			<degrees C>: override all critical trip points



	thermal.nocrt=	[HW,ACPI]

			Set to disable actions on ACPI thermal zone

			critical and hot trip points.



	thermal.off=	[HW,ACPI]

			1: disable ACPI thermal control

arch/ia64/include/asm/acpi.h

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


#ifdef __KERNEL__



#include <acpi/pdc_intel.h>

#include <acpi/proc_cap_intel.h>



#include <linux/init.h>

#include <linux/numa.h>
@@ -69,9 +69,9 @@ extern int __initdata nid_to_pxm_map[MAX_NUMNODES]; 
#endif



static inline bool arch_has_acpi_pdc(void) { return true; }

static inline void arch_acpi_set_pdc_bits(u32 *buf)

static inline void arch_acpi_set_proc_cap_bits(u32 *cap)

{

	buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP;

	*cap |= ACPI_PROC_CAP_EST_CAPABILITY_SMP;

}



#ifdef CONFIG_ACPI_NUMA

arch/x86/include/asm/acpi.h

+16 −8
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *  Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 *  Copyright (C) 2001 Patrick Mochel <mochel@osdl.org>

 */

#include <acpi/pdc_intel.h>

#include <acpi/proc_cap_intel.h>



#include <asm/numa.h>

#include <asm/fixmap.h>
@@ -102,23 +102,31 @@ static inline bool arch_has_acpi_pdc(void) 
		c->x86_vendor == X86_VENDOR_CENTAUR);

}



static inline void arch_acpi_set_pdc_bits(u32 *buf)

static inline void arch_acpi_set_proc_cap_bits(u32 *cap)

{

	struct cpuinfo_x86 *c = &cpu_data(0);



	buf[2] |= ACPI_PDC_C_CAPABILITY_SMP;

	*cap |= ACPI_PROC_CAP_C_CAPABILITY_SMP;



	/* Enable coordination with firmware's _TSD info */

	*cap |= ACPI_PROC_CAP_SMP_T_SWCOORD;



	if (cpu_has(c, X86_FEATURE_EST))

		buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP;

		*cap |= ACPI_PROC_CAP_EST_CAPABILITY_SWSMP;



	if (cpu_has(c, X86_FEATURE_ACPI))

		buf[2] |= ACPI_PDC_T_FFH;

		*cap |= ACPI_PROC_CAP_T_FFH;



	if (cpu_has(c, X86_FEATURE_HWP))

		*cap |= ACPI_PROC_CAP_COLLAB_PROC_PERF;



	/*

	 * If mwait/monitor is unsupported, C2/C3_FFH will be disabled

	 * If mwait/monitor is unsupported, C_C1_FFH and

	 * C2/C3_FFH will be disabled.

	 */

	if (!cpu_has(c, X86_FEATURE_MWAIT))

		buf[2] &= ~(ACPI_PDC_C_C2C3_FFH);

	if (!cpu_has(c, X86_FEATURE_MWAIT) ||

	    boot_option_idle_override == IDLE_NOMWAIT)

		*cap &= ~(ACPI_PROC_CAP_C_C1_FFH | ACPI_PROC_CAP_C_C2C3_FFH);

}



static inline bool acpi_has_cpu_in_madt(void)

arch/x86/xen/enlighten_pv.c

+4 −4
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
#ifdef CONFIG_ACPI

#include <linux/acpi.h>

#include <asm/acpi.h>

#include <acpi/pdc_intel.h>

#include <acpi/proc_cap_intel.h>

#include <acpi/processor.h>

#include <xen/interface/platform.h>

#endif
@@ -288,17 +288,17 @@ static bool __init xen_check_mwait(void) 


	native_cpuid(&ax, &bx, &cx, &dx);



	/* Ask the Hypervisor whether to clear ACPI_PDC_C_C2C3_FFH. If so,

	/* Ask the Hypervisor whether to clear ACPI_PROC_CAP_C_C2C3_FFH. If so,

	 * don't expose MWAIT_LEAF and let ACPI pick the IOPORT version of C3.

	 */

	buf[0] = ACPI_PDC_REVISION_ID;

	buf[1] = 1;

	buf[2] = (ACPI_PDC_C_CAPABILITY_SMP | ACPI_PDC_EST_CAPABILITY_SWSMP);

	buf[2] = (ACPI_PROC_CAP_C_CAPABILITY_SMP | ACPI_PROC_CAP_EST_CAPABILITY_SWSMP);



	set_xen_guest_handle(op.u.set_pminfo.pdc, buf);



	if ((HYPERVISOR_platform_op(&op) == 0) &&

	    (buf[2] & (ACPI_PDC_C_C1_FFH | ACPI_PDC_C_C2C3_FFH))) {

	    (buf[2] & (ACPI_PROC_CAP_C_C1_FFH | ACPI_PROC_CAP_C_C2C3_FFH))) {

		cpuid_leaf5_ecx_val = cx;

		cpuid_leaf5_edx_val = dx;

	}

drivers/acpi/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ acpi-$(CONFIG_PCI) += acpi_lpss.o 
acpi-y				+= acpi_apd.o

acpi-y				+= acpi_platform.o

acpi-y				+= acpi_pnp.o

acpi-$(CONFIG_ARM_AMBA)	+= acpi_amba.o

acpi-y				+= power.o

acpi-y				+= event.o

acpi-y				+= evged.o