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

Commit 43e31e40 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI updates from Rafael Wysocki:
 "These update the ACPICA code in the kernel to upstream revision
  20170119, which among other things updates copyright notices in all of
  the ACPICA files, fix a couple of issues in the ACPI EC and button
  drivers, fix modalias handling for non-discoverable devices with
  DT-compatible identification strings, add a suspend quirk for one
  platform and fix a message in the APEI code.

  Specifics:

   - Update of the ACPICA code in the kernel to upstream revision
     20170119 including:

      + Fixes related to the handling of the bit width and bit offset
        fields in Generic Address Structure (Lv Zheng)
      + ACPI resources handling fix related to invalid resource
        descriptors (Bob Moore)
      + Fix to enable implicit result conversion for several ASL library
        functions (Bob Moore)
      + Support for method invocations as target operands in AML (Bob
        Moore)
      + Fix to use a correct operand type for DeRefOf() in some
        situations (Bob Moore)
      + Utilities updates (Bob Moore, Lv Zheng)
      + Disassembler/debugger updates (David Box, Lv Zheng)
      + Build fixes (Colin Ian King, Lv Zheng)
      + Update of copyright notices in all files (Bob Moore)

   - Fix for modalias handling for SPI and I2C devices with
     DT-compatible identification strings (Dan O'Donovan)

   - Fixes for the ACPI EC and button drivers (Lv Zheng)

   - ACPI processor handling fix related to CPU hotplug (online/offline)
     on x86 (Vitaly Kuznetsov)

   - Suspend quirk to save/restore NVS memory over S3 transitions for
     Lenovo G50-45 (Zhang Rui)

   - Message formatting fix for the ACPI APEI code (Colin Ian King)"

* tag 'acpi-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (32 commits)
  ACPICA: Update version to 20170119
  ACPICA: Tools: Update common signon, remove compilation bit width
  ACPICA: Source tree: Update copyright notices to 2017
  ACPICA: Linuxize: Restore and fix Intel compiler build
  x86/ACPI: keep x86_cpu_to_acpiid mapping valid on CPU hotplug
  spi: acpi: Initialize modalias from of_compatible
  i2c: acpi: Initialize info.type from of_compatible
  ACPI / bus: Introduce acpi_of_modalias() equiv of of_modalias_node()
  ACPI: save NVS memory for Lenovo G50-45
  ACPI, APEI, EINJ: fix malformed newline escape
  ACPI / button: Remove lid_init_state=method mode
  ACPI / button: Change default behavior to lid_init_state=open
  ACPI / EC: Use busy polling mode when GPE is not enabled
  ACPI / EC: Remove old CLEAR_ON_RESUME quirk
  ACPICA: Update version to 20161222
  ACPICA: Parser: Update parse info table for some operators
  ACPICA: Fix a problem with recent extra support for control method invocations
  ACPICA: Parser: Allow method invocations as target operands
  ACPICA: Fix for implicit result conversion for the ToXXX functions
  ACPICA: Resources: Not a valid resource if buffer length too long
  ..
parents 02c3de11 ac18c0c4

Documentation/acpi/acpi-lid.txt

+4 −12
Original line number Diff line number Diff line
@@ -59,28 +59,20 @@ button driver uses the following 3 modes in order not to trigger issues. 
If the userspace hasn't been prepared to ignore the unreliable "opened"

events and the unreliable initial state notification, Linux users can use

the following kernel parameters to handle the possible issues:

A. button.lid_init_state=method:

   When this option is specified, the ACPI button driver reports the

   initial lid state using the returning value of the _LID control method

   and whether the "opened"/"closed" events are paired fully relies on the

   firmware implementation.

   This option can be used to fix some platforms where the returning value

   of the _LID control method is reliable but the initial lid state

   notification is missing.

   This option is the default behavior during the period the userspace

   isn't ready to handle the buggy AML tables.

B. button.lid_init_state=open:

A. button.lid_init_state=open:

   When this option is specified, the ACPI button driver always reports the

   initial lid state as "opened" and whether the "opened"/"closed" events

   are paired fully relies on the firmware implementation.

   This may fix some platforms where the returning value of the _LID

   control method is not reliable and the initial lid state notification is

   missing.

   This option is the default behavior during the period the userspace

   isn't ready to handle the buggy AML tables.



If the userspace has been prepared to ignore the unreliable "opened" events

and the unreliable initial state notification, Linux users should always

use the following kernel parameter:

C. button.lid_init_state=ignore:

B. button.lid_init_state=ignore:

   When this option is specified, the ACPI button driver never reports the

   initial lid state and there is a compensation mechanism implemented to

   ensure that the reliable "closed" notifications can always be delievered

arch/ia64/kernel/acpi.c

+2 −1
Original line number Diff line number Diff line
@@ -887,7 +887,8 @@ static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) 
}



/* wrapper to silence section mismatch warning */

int __ref acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu)

int __ref acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id,

		       int *pcpu)

{

	return _acpi_map_lsapic(handle, physid, pcpu);

}

arch/x86/kernel/acpi/boot.c

+3 −2
Original line number Diff line number Diff line
@@ -724,11 +724,12 @@ int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) 
	return 0;

}



int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu)

int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id,

		 int *pcpu)

{

	int cpu;



	cpu = acpi_register_lapic(physid, U32_MAX, ACPI_MADT_ENABLED);

	cpu = acpi_register_lapic(physid, acpi_id, ACPI_MADT_ENABLED);

	if (cpu < 0) {

		pr_info(PREFIX "Unable to map lapic to logical cpu number\n");

		return cpu;

drivers/acpi/acpi_processor.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int acpi_processor_errata(void) 


#ifdef CONFIG_ACPI_HOTPLUG_CPU

int __weak acpi_map_cpu(acpi_handle handle,

		phys_cpuid_t physid, int *pcpu)

		phys_cpuid_t physid, u32 acpi_id, int *pcpu)

{

	return -ENODEV;

}
@@ -203,7 +203,7 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr) 
	cpu_maps_update_begin();

	cpu_hotplug_begin();



	ret = acpi_map_cpu(pr->handle, pr->phys_id, &pr->id);

	ret = acpi_map_cpu(pr->handle, pr->phys_id, pr->acpi_id, &pr->id);

	if (ret)

		goto out;

drivers/acpi/acpica/acapps.h

+7 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2016, Intel Corp.

 * Copyright (C) 2000 - 2017, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -51,26 +51,26 @@ 
/* Common info for tool signons */



#define ACPICA_NAME                 "Intel ACPI Component Architecture"

#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2016 Intel Corporation"

#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2017 Intel Corporation"



#if ACPI_MACHINE_WIDTH == 64

#define ACPI_WIDTH          "-64"

#define ACPI_WIDTH          " (64-bit version)"



#elif ACPI_MACHINE_WIDTH == 32

#define ACPI_WIDTH          "-32"

#define ACPI_WIDTH          " (32-bit version)"



#else

#error unknown ACPI_MACHINE_WIDTH

#define ACPI_WIDTH          "-??"

#define ACPI_WIDTH          " (unknown bit width, not 32 or 64)"



#endif



/* Macros for signons and file headers */



#define ACPI_COMMON_SIGNON(utility_name) \

	"\n%s\n%s version %8.8X%s\n%s\n\n", \

	"\n%s\n%s version %8.8X\n%s\n\n", \

	ACPICA_NAME, \

	utility_name, ((u32) ACPI_CA_VERSION), ACPI_WIDTH, \

	utility_name, ((u32) ACPI_CA_VERSION), \

	ACPICA_COPYRIGHT



#define ACPI_COMMON_HEADER(utility_name, prefix) \