Commit 4e9ad033 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI updates from Rafael Wysocki:
 "These include a couple of fixes, a new ACPI backlight quirk for Apple
  MacbookPro11,2 and Air7,2 and a bunch of cleanups:

   - Fix _CPC register setting issue for registers located in memory in
     the ACPI CPPC library code (Lifeng Zheng)

   - Use DEFINE_SIMPLE_DEV_PM_OPS in the ACPI battery driver, make it
     use devm_ for initializing mutexes and allocating driver data, and
     make it check the register_pm_notifier() return value (Thomas
     Weißschuh, Andy Shevchenko)

   - Make the ACPI EC driver support compile-time conditional and allow
     ACPI to be built without CONFIG_HAS_IOPORT (Arnd Bergmann)

   - Remove a redundant error check from the pfr_telemetry driver (Colin
     Ian King)

   - Rearrange the processor_perflib code in the ACPI processor driver
     to avoid compiling x86-specific code on other architectures (Arnd
     Bergmann)

   - Add adev NULL check to acpi_quirk_skip_serdev_enumeration() and
     make UART skip quirks work on PCI UARTs without an UID (Hans de
     Goede)

   - Force native backlight handling Apple MacbookPro11,2 and Air7,2 in
     the ACPI video driver (Jonathan Denose)

   - Switch several ACPI platform drivers back to using struct
     platform_driver::remove() (Uwe Kleine-König)

   - Replace strcpy() with strscpy() in multiple places in the ACPI
     subsystem (Muhammad Qasim Abdul Majeed, Abdul Rahim)"

* tag 'acpi-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (24 commits)
  ACPI: video: force native for Apple MacbookPro11,2 and Air7,2
  ACPI: CPPC: Fix _CPC register setting issue
  ACPI: Switch back to struct platform_driver::remove()
  ACPI: x86: Add adev NULL check to acpi_quirk_skip_serdev_enumeration()
  ACPI: x86: Make UART skip quirks work on PCI UARTs without an UID
  ACPI: allow building without CONFIG_HAS_IOPORT
  ACPI: processor_perflib: extend X86 dependency
  ACPI: scan: Use strscpy() instead of strcpy()
  ACPI: SBSHC: Use strscpy() instead of strcpy()
  ACPI: SBS: Use strscpy() instead of strcpy()
  ACPI: power: Use strscpy() instead of strcpy()
  ACPI: pci_root: Use strscpy() instead of strcpy()
  ACPI: pci_link: Use strscpy() instead of strcpy()
  ACPI: event: Use strscpy() instead of strcpy()
  ACPI: EC: Use strscpy() instead of strcpy()
  ACPI: APD: Use strscpy() instead of strcpy()
  ACPI: thermal: Use strscpy() instead of strcpy()
  ACPI: battery: Check for error code from devm_mutex_init() call
  ACPI: EC: make EC support compile-time conditional
  ACPI: pfr_telemetry: remove redundant error check on ret
  ...
parents cd7fa3e1 d47a60e4

drivers/acpi/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -132,8 +132,17 @@ config ACPI_REV_OVERRIDE_POSSIBLE 
	  makes it possible to force the kernel to return "5" as the supported

	  ACPI revision via the "acpi_rev_override" command line switch.



config ACPI_EC

	bool "Embedded Controller"

	depends on HAS_IOPORT

	default X86

	help

	  This driver handles communication with the microcontroller

	  on many x86 laptops and other machines.



config ACPI_EC_DEBUGFS

	tristate "EC read/write access through /sys/kernel/debug/ec"

	depends on ACPI_EC

	help

	  Say N to disable Embedded Controller /sys/kernel/debug interface
@@ -433,7 +442,7 @@ config ACPI_HOTPLUG_IOAPIC 


config ACPI_SBS

	tristate "Smart Battery System"

	depends on X86

	depends on X86 && ACPI_EC

	select POWER_SUPPLY

	help

	  This driver supports the Smart Battery System, another

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ acpi-y += resource.o 
acpi-y				+= acpi_processor.o

acpi-y				+= processor_core.o

acpi-$(CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC) += processor_pdc.o

acpi-y				+= ec.o

acpi-$(CONFIG_ACPI_EC)		+= ec.o

acpi-$(CONFIG_ACPI_DOCK)	+= dock.o

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

obj-$(CONFIG_ACPI_MCFG)		+= pci_mcfg.o

drivers/acpi/ac.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static void acpi_ac_remove(struct platform_device *pdev) 


static struct platform_driver acpi_ac_driver = {

	.probe = acpi_ac_probe,

	.remove_new = acpi_ac_remove,

	.remove = acpi_ac_remove,

	.driver = {

		.name = "ac",

		.acpi_match_table = ac_device_ids,

drivers/acpi/acpi_apd.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int fch_misc_setup(struct apd_private_data *pdata) 
		if (!clk_data->name)

			return -ENOMEM;



		strcpy(clk_data->name, obj->string.pointer);

		strscpy(clk_data->name, obj->string.pointer, obj->string.length);

	} else {

		/* Set default name to mclk if entry missing in firmware */

		clk_data->name = "mclk";

drivers/acpi/acpi_pad.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ MODULE_DEVICE_TABLE(acpi, pad_device_ids); 


static struct platform_driver acpi_pad_driver = {

	.probe = acpi_pad_probe,

	.remove_new = acpi_pad_remove,

	.remove = acpi_pad_remove,

	.driver = {

		.dev_groups = acpi_pad_groups,

		.name = "processor_aggregator",