Commit 21e0ff5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI updates from Rafael Wysocki:
 "From the functional perspective, the most significant changes here are
  the ACPI fan driver update allowing it to handle fans with
  fine-grained state checking supported, but without fine-grained
  control, and the ACPI button driver update making it subscribe to
  system event notifications (in addition to device notifications) which
  on some systems is requisite for waking up the system from sleep.

  The rest is fixes and cleanups including removal of some dead code.

  Specifics:

   - Use the str_on_off() helper function instead of hard-coded strings
     in the ACPI power resources handling code (Thorsten Blum)

   - Add fan speed reporting for ACPI fans that have _FST, but otherwise
     do not support the entire ACPI 4 fan interface (Joshua Grisham)

   - Fix a stale comment regarding trip points in acpi_thermal_add()
     that diverged from the commented code after removing _CRT
     evaluation from acpi_thermal_get_trip_points() (xueqin Luo)

   - Make ACPI button driver also subscribe to system events (Mario
     Limonciello)

   - Use the str_yes_no() helper function instead of hard-coded strings
     in the ACPI backlight (video) driver (Thorsten Blum)

   - Add a missing header file include to the x86 arch CPPC code (Mario
     Limonciello)

   - Rework the sysfs attributes implementation in the ACPI
     platform-profile driver and improve the unregistration code in it
     (Nathan Chancellor, Kurt Borja)

   - Prevent the ACPI HED driver from being built as a module and change
     its initcall level to subsys_initcall to avoid initialization
     ordering issues related to it (Xiaofei Tan)

   - Update a maintainer email address in the ACPI PMIC entry in
     MAINTAINERS (Mika Westerberg)

   - Address a GCC 15's -Wunterminated-string-initialization warning in
     the core PNP subsystem code and remove some dead code from it (Kees
     Cook, David Alan Gilbert)"

* tag 'acpi-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: Expand length of fixup id string
  PNP: Remove prehistoric deadcode
  ACPI: button: Install notifier for system events as well
  ACPI: fan: Add fan speed reporting for fans with only _FST
  ACPI: HED: Always initialize before evged
  x86/ACPI: CPPC: Add missing include
  ACPI: video: Use str_yes_no() helper in acpi_video_bus_add()
  ACPI: platform_profile: Improve platform_profile_unregister()
  ACPI: platform-profile: Fix CFI violation when accessing sysfs files
  ACPI: power: Use str_on_off() helper function
  ACPI: thermal: Fix stale comment regarding trip points
  MAINTAINERS: Use my kernel.org address for ACPI PMIC work
parents a5b3d866 8b30d2a3

Documentation/admin-guide/pnp.rst

+0 −3
Original line number Diff line number Diff line
@@ -129,9 +129,6 @@ pnp_put_protocol 
pnp_register_protocol

  use this to register a new PnP protocol



pnp_unregister_protocol

  use this function to remove a PnP protocol from the Plug and Play Layer



pnp_register_driver

  adds a PnP driver to the Plug and Play Layer

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ ACPI PMIC DRIVERS 
M:	"Rafael J. Wysocki" <rafael@kernel.org>

M:	Len Brown <lenb@kernel.org>

R:	Andy Shevchenko <andy@kernel.org>

R:	Mika Westerberg <mika.westerberg@linux.intel.com>

R:	Mika Westerberg <westeri@kernel.org>

L:	linux-acpi@vger.kernel.org

S:	Supported

Q:	https://patchwork.kernel.org/project/linux-acpi/list/

arch/x86/kernel/acpi/cppc.c

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
 * Copyright (c) 2016, Intel Corporation.

 */



#include <linux/bitfield.h>



#include <acpi/cppc_acpi.h>

#include <asm/msr.h>

#include <asm/processor.h>

drivers/acpi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ config ACPI_SBS 
	  the modules will be called sbs and sbshc.



config ACPI_HED

	tristate "Hardware Error Device"

	bool "Hardware Error Device"

	help

	  This driver supports the Hardware Error Device (PNP0C33),

	  which is used to report some hardware errors notified via

drivers/acpi/acpi_video.c

+4 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/acpi.h>

#include <acpi/video.h>

#include <linux/uaccess.h>

#include <linux/string_choices.h>



#define ACPI_VIDEO_BUS_NAME		"Video Bus"

#define ACPI_VIDEO_DEVICE_NAME		"Video Device"
@@ -2039,9 +2040,9 @@ static int acpi_video_bus_add(struct acpi_device *device) 


	pr_info("%s [%s] (multi-head: %s  rom: %s  post: %s)\n",

	       ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),

	       video->flags.multihead ? "yes" : "no",

	       video->flags.rom ? "yes" : "no",

	       video->flags.post ? "yes" : "no");

	       str_yes_no(video->flags.multihead),

	       str_yes_no(video->flags.rom),

	       str_yes_no(video->flags.post));

	mutex_lock(&video_list_lock);

	list_add_tail(&video->entry, &video_bus_head);

	mutex_unlock(&video_list_lock);