Skip to content

Commit

Permalink
Merge tag 'acpi-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/rafael/linux-pm

Pull ACPI updates from Rafael Wysocki:
 "These update the ACPICA code in the kernel to the most recent upstream
  revision (20200110), add new hardware support to a handful of ACPI
  drivers, make the ACPI fan driver expose power states information for
  fans, add some more quirks, fix bugs and clean up assorted things.

  Specifics:

   - Update the ACPICA code in the kernel to upstream revision 20200110
     including:
      - Update of copyright notices to 2020 (Bob Moore).
      - Dispatcher fix to always generate buffer objects for the ASL
        create_field() operator (Maximilian Luz).
      - Debugger cleanup (Colin Ian King).
      - Disassembler change to create buffer fields in
        ACPI_PARSE_LOAD_PASS1 (Erik Kaneda).
      - UNIX line ending support for non-windows builds in acpisrc (Erik
        Kaneda).

   - Update the list of ACPICA maintainers (Rafael Wysocki).

   - Add Intel Tiger Lake ACPI device IDs to the ACPI DPTF, ACPI fan,
     int340x_thermal and intel-hid drivers (Gayatri Kammela).

   - Make the ACPI fan driver create additional sysfs attributes to
     expose power states information for fans (Srinivas Pandruvada).

   - Fix up the ACPI battery driver to deal with unexpected battery
     capacity information in a better way (Hans de Goede).

   - Add ACPI backlight quirks for Lenovo E41-25/45 and MSI MS-7721
     boards (Aaron Ma, Hans de Goede).

   - Add DMI quirk for Razer Blade Stealth 13 late 2019 lid switch to
     the ACPI button driver (Jason Ekstrand).

   - Drop TIMER_DEFERRABLE from the GHES polling mode timer function
     flags to make it run precisely at the configured time (Bhaskar
     Upadhaya).

   - Fix race condition related to the reference counting of query
     handlers in the ACPI EC driver (Rafael Wysocki).

   - Fix ACPI tools build issue (Zhengyuan Liu).

   - Replace dma_request_slave_channel() with dma_request_chan() in the
     firmware guide documentation for ACPI (Peter Ujfalusi).

   - Fix typo in a comment and clean up function parameter data type
     inconsistencies (Kacper Piwiński, Tian Tao)"

* tag 'acpi-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (25 commits)
  ACPICA: Update version to 20200110
  ACPICA: All acpica: Update copyrights to 2020 Including tool signons.
  apei/ghes: Do not delay GHES polling
  ACPI: button: Add DMI quirk for Razer Blade Stealth 13 late 2019 lid switch
  ACPI: PPTT: Consistently use unsigned int as parameter type
  ACPI: EC: Reference count query handlers under lock
  ACPICA: Update the list of maintainers
  ACPICA: Update version to 20191213
  ACPICA: Dispatcher: always generate buffer objects for ASL create_field() operator
  ACPICA: acpisrc: add unix line ending support for non-windows build
  ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1
  ACPICA: debugger: fix spelling mistake "adress" -> "address"
  ACPI: video: Do not export a non working backlight interface on MSI MS-7721 boards
  docs: firmware-guide: ACPI: Replace dma_request_slave_channel() with dma_request_chan()
  thermal: int340x_thermal: Add Tiger Lake ACPI device IDs
  platform/x86: intel-hid: Add Tiger Lake ACPI device ID
  ACPI: fan: Add Tiger Lake ACPI device ID
  ACPI: DPTF: Add Tiger Lake ACPI device IDs
  ACPI: fan: Expose fan performance state information
  tools/power/acpi: fix compilation error
  ...
  • Loading branch information
torvalds committed Jan 27, 2020
2 parents 6d277ac + ca11abf commit 55816dc
Show file tree
Hide file tree
Showing 195 changed files with 511 additions and 246 deletions.
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ Dmitry Safonov <[email protected]> <[email protected]>
Domen Puncer <[email protected]>
Douglas Gilbert <[email protected]>
Ed L. Cashin <[email protected]>
Erik Kaneda <[email protected]> <[email protected]>
Evgeniy Polyakov <[email protected]>
Felipe W Damasio <[email protected]>
Felix Kuhling <[email protected]>
Expand Down
62 changes: 62 additions & 0 deletions Documentation/admin-guide/acpi/fan_performance_states.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
.. SPDX-License-Identifier: GPL-2.0
===========================
ACPI Fan Performance States
===========================

When the optional _FPS object is present under an ACPI device representing a
fan (for example, PNP0C0B or INT3404), the ACPI fan driver creates additional
"state*" attributes in the sysfs directory of the ACPI device in question.
These attributes list properties of fan performance states.

For more information on _FPS refer to the ACPI specification at:

http://uefi.org/specifications

For instance, the contents of the INT3404 ACPI device sysfs directory
may look as follows::

$ ls -l /sys/bus/acpi/devices/INT3404:00/
total 0
...
-r--r--r-- 1 root root 4096 Dec 13 20:38 state0
-r--r--r-- 1 root root 4096 Dec 13 20:38 state1
-r--r--r-- 1 root root 4096 Dec 13 20:38 state10
-r--r--r-- 1 root root 4096 Dec 13 20:38 state11
-r--r--r-- 1 root root 4096 Dec 13 20:38 state2
-r--r--r-- 1 root root 4096 Dec 13 20:38 state3
-r--r--r-- 1 root root 4096 Dec 13 20:38 state4
-r--r--r-- 1 root root 4096 Dec 13 20:38 state5
-r--r--r-- 1 root root 4096 Dec 13 20:38 state6
-r--r--r-- 1 root root 4096 Dec 13 20:38 state7
-r--r--r-- 1 root root 4096 Dec 13 20:38 state8
-r--r--r-- 1 root root 4096 Dec 13 20:38 state9
-r--r--r-- 1 root root 4096 Dec 13 01:00 status
...

where each of the "state*" files represents one performance state of the fan
and contains a colon-separated list of 5 integer numbers (fields) with the
following interpretation::

control_percent:trip_point_index:speed_rpm:noise_level_mdb:power_mw

* ``control_percent``: The percent value to be used to set the fan speed to a
specific level using the _FSL object (0-100).

* ``trip_point_index``: The active cooling trip point number that corresponds
to this performance state (0-9).

* ``speed_rpm``: Speed of the fan in rotations per minute.

* ``noise_level_mdb``: Audible noise emitted by the fan in this state in
millidecibels.

* ``power_mw``: Power draw of the fan in this state in milliwatts.

For example::

$cat /sys/bus/acpi/devices/INT3404:00/state1
25:0:3200:12500:1250

When a given field is not populated or its value provided by the platform
firmware is invalid, the "not-defined" string is shown instead of the value.
1 change: 1 addition & 0 deletions Documentation/admin-guide/acpi/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ the Linux ACPI support.
dsdt-override
ssdt-overlays
cppc_sysfs
fan_performance_states
16 changes: 8 additions & 8 deletions Documentation/firmware-guide/acpi/enumeration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ DMA support
DMA controllers enumerated via ACPI should be registered in the system to
provide generic access to their resources. For example, a driver that would
like to be accessible to slave devices via generic API call
dma_request_slave_channel() must register itself at the end of the probe
function like this::
dma_request_chan() must register itself at the end of the probe function like
this::

err = devm_acpi_dma_controller_register(dev, xlate_func, dw);
/* Handle the error if it's not a case of !CONFIG_ACPI */
Expand Down Expand Up @@ -112,15 +112,15 @@ could look like::
}
#endif

dma_request_slave_channel() will call xlate_func() for each registered DMA
controller. In the xlate function the proper channel must be chosen based on
dma_request_chan() will call xlate_func() for each registered DMA controller.
In the xlate function the proper channel must be chosen based on
information in struct acpi_dma_spec and the properties of the controller
provided by struct acpi_dma.

Clients must call dma_request_slave_channel() with the string parameter that
corresponds to a specific FixedDMA resource. By default "tx" means the first
entry of the FixedDMA resource array, "rx" means the second entry. The table
below shows a layout::
Clients must call dma_request_chan() with the string parameter that corresponds
to a specific FixedDMA resource. By default "tx" means the first entry of the
FixedDMA resource array, "rx" means the second entry. The table below shows a
layout::

Device (I2C0)
{
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ F: drivers/acpi/apei/

ACPI COMPONENT ARCHITECTURE (ACPICA)
M: Robert Moore <[email protected]>
M: Erik Schmauss <erik.schmauss@intel.com>
M: Erik Kaneda <erik.kaneda@intel.com>
M: "Rafael J. Wysocki" <[email protected]>
L: [email protected]
L: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpi_video.c
Original file line number Diff line number Diff line change
Expand Up @@ -2187,7 +2187,7 @@ int acpi_video_register(void)
if (register_count) {
/*
* if the function of acpi_video_register is already called,
* don't register the acpi_vide_bus again and return no error.
* don't register the acpi_video_bus again and return no error.
*/
goto leave;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/acapps.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: acapps - common include for ACPI applications/tools
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand All @@ -17,7 +17,7 @@
/* Common info for tool signons */

#define ACPICA_NAME "Intel ACPI Component Architecture"
#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2019 Intel Corporation"
#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2020 Intel Corporation"

#if ACPI_MACHINE_WIDTH == 64
#define ACPI_WIDTH " (64-bit version)"
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/accommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: accommon.h - Common include files for generation of ACPICA source
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acconvert.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: acapps - common include for ACPI applications/tools
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acdebug.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acdebug.h - ACPI/AML debugger
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acdispat.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acdispat.h - dispatcher (parser to interpreter interface)
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acevents.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acevents.h - Event subcomponent prototypes and defines
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acglobal.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acglobal.h - Declarations for global variables
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/achware.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: achware.h -- hardware specific interfaces
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acinterp.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acinterp.h - Interpreter subcomponent prototypes and defines
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/aclocal.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: aclocal.h - Internal data types used across the ACPI subsystem
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acmacros.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acmacros.h - C macros for the entire subsystem.
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acnamesp.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acnamesp.h - Namespace subcomponent prototypes and defines
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
5 changes: 3 additions & 2 deletions drivers/acpi/acpica/acobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acobject.h - Definition of union acpi_operand_object (Internal object only)
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down Expand Up @@ -260,7 +260,8 @@ struct acpi_object_index_field {
/* The buffer_field is different in that it is part of a Buffer, not an op_region */

struct acpi_object_buffer_field {
ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO union acpi_operand_object *buffer_obj; /* Containing Buffer object */
ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO u8 is_create_field; /* Special case for objects created by create_field() */
union acpi_operand_object *buffer_obj; /* Containing Buffer object */
};

/******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acopcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acopcode.h - AML opcode information for the AML parser and interpreter
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acparser.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: acparser.h - AML Parser subcomponent prototypes and defines
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acpredef.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acpredef - Information table for ACPI predefined methods and objects
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acresrc.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acresrc.h - Resource Manager function prototypes
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acstruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acstruct.h - Internal structs
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/actables.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: actables.h - ACPI table management
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/amlcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Declarations and definitions contained herein are derived
* directly from the ACPI specification.
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/amlresrc.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: amlresrc.h - AML resource descriptors
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dbhistry.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dbhistry - debugger HISTORY command
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dbinput.c
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ acpi_db_command_dispatch(char *input_buffer,
if (ACPI_FAILURE(status)
|| temp64 >= ACPI_NUM_PREDEFINED_REGIONS) {
acpi_os_printf
("Invalid adress space ID: must be between 0 and %u inclusive\n",
("Invalid address space ID: must be between 0 and %u inclusive\n",
ACPI_NUM_PREDEFINED_REGIONS - 1);
return (AE_OK);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dsargs.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Module Name: dsargs - Support for execution of dynamic arguments for static
* objects (regions, fields, buffer fields, etc.)
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dscontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Module Name: dscontrol - Support for execution control opcodes -
* if/else/while/return
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dsdebug.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dsdebug - Parser/Interpreter interface - debugging
*
* Copyright (C) 2000 - 2019, Intel Corp.
* Copyright (C) 2000 - 2020, Intel Corp.
*
*****************************************************************************/

Expand Down
Loading

0 comments on commit 55816dc

Please sign in to comment.