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

Commit 54ce685c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more ACPI updates from Rafael Wysocki:
 "These are mostly fixes and cleanups, a few new quirks, a couple of
  updates related to the handling of ACPI tables and ACPICA copyrights
  refreshment.

  Specifics:

   - Update the ACPICA kernel code to upstream revision 20180105
     including:
       * Assorted fixes (Jung-uk Kim)
       * Support for X32 ABI compilation (Anuj Mittal)
       * Update of ACPICA copyrights to 2018 (Bob Moore)

   - Prepare for future modifications to avoid executing the _STA
     control method too early (Hans de Goede)

   - Make the processor performance control library code ignore _PPC
     notifications if they cannot be handled and fix up the C1 idle
     state definition when it is used as a fallback state (Chen Yu,
     Yazen Ghannam)

   - Make it possible to use the SPCR table on x86 and to replace the
     original IORT table with a new one from initrd (Prarit Bhargava,
     Shunyong Yang)

   - Add battery-related quirks for Asus UX360UA and UX410UAK and add
     quirks for table parsing on Dell XPS 9570 and Precision M5530 (Kai
     Heng Feng)

   - Address static checker warnings in the CPPC code (Gustavo Silva)

   - Avoid printing a raw pointer to the kernel log in the smart battery
     driver (Greg Kroah-Hartman)"

* tag 'acpi-part2-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: sbshc: remove raw pointer from printk() message
  ACPI: SPCR: Make SPCR available to x86
  ACPI / CPPC: Use 64-bit arithmetic instead of 32-bit
  ACPI / tables: Add IORT to injectable table list
  ACPI / bus: Parse tables as term_list for Dell XPS 9570 and Precision M5530
  ACPICA: Update version to 20180105
  ACPICA: All acpica: Update copyrights to 2018
  ACPI / processor: Set default C1 idle state description
  ACPI / battery: Add quirk for Asus UX360UA and UX410UAK
  ACPI: processor_perflib: Do not send _PPC change notification if not ready
  ACPI / scan: Use acpi_bus_get_status() to initialize ACPI_TYPE_DEVICE devs
  ACPI / bus: Do not call _STA on battery devices with unmet dependencies
  PCI: acpiphp_ibm: prepare for acpi_get_object_info() no longer returning status
  ACPI: export acpi_bus_get_status_handle()
  ACPICA: Add a missing pair of parentheses
  ACPICA: Prefer ACPI_TO_POINTER() over ACPI_ADD_PTR()
  ACPICA: Avoid NULL pointer arithmetic
  ACPICA: Linux: add support for X32 ABI compilation
  ACPI / video: Use true for boolean value
parents a051c14b d4abd46b

Documentation/admin-guide/kernel-parameters.txt

+6 −3
Original line number Diff line number Diff line
@@ -931,9 +931,12 @@ 


	earlycon=	[KNL] Output early console device and options.



			When used with no options, the early console is

			determined by the stdout-path property in device

			tree's chosen node.

			[ARM64] The early console is determined by the

			stdout-path property in device tree's chosen node,

			or determined by the ACPI SPCR table.



			[X86] When used with no options the early console is

			determined by the ACPI SPCR table.



		cdns,<addr>[,options]

			Start an early, polled-mode console on a Cadence

arch/arm64/kernel/acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -230,10 +230,10 @@ void __init acpi_boot_table_init(void) 


done:

	if (acpi_disabled) {

		if (earlycon_init_is_deferred)

		if (earlycon_acpi_spcr_enable)

			early_init_dt_scan_chosen_stdout();

	} else {

		parse_spcr(earlycon_init_is_deferred);

		acpi_parse_spcr(earlycon_acpi_spcr_enable, true);

		if (IS_ENABLED(CONFIG_ACPI_BGRT))

			acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt);

	}

arch/x86/kernel/acpi/boot.c

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/ioport.h>

#include <linux/pci.h>

#include <linux/efi-bgrt.h>

#include <linux/serial_core.h>



#include <asm/e820/api.h>

#include <asm/irqdomain.h>
@@ -1625,6 +1626,8 @@ int __init acpi_boot_init(void) 
	if (!acpi_noirq)

		x86_init.pci.init = pci_acpi_init;



	/* Do not enable ACPI SPCR console by default */

	acpi_parse_spcr(earlycon_acpi_spcr_enable, false);

	return 0;

}

drivers/acpi/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -79,7 +79,12 @@ config ACPI_DEBUGGER_USER 
endif



config ACPI_SPCR_TABLE

	bool

	bool "ACPI Serial Port Console Redirection Support"

	default y if X86

	help

	  Enable support for Serial Port Console Redirection (SPCR) Table.

	  This table provides information about the configuration of the

	  earlycon console.



config ACPI_LPIT

	bool

drivers/acpi/acpi_video.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ MODULE_AUTHOR("Bruno Ducrot"); 
MODULE_DESCRIPTION("ACPI Video Driver");

MODULE_LICENSE("GPL");



static bool brightness_switch_enabled = 1;

static bool brightness_switch_enabled = true;

module_param(brightness_switch_enabled, bool, 0644);



/*