Commit 55816dc1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.6-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 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
  ...
parents 6d277aca ca11abf1

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com> 
Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>

Ed L. Cashin <ecashin@coraid.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Felipe W Damasio <felipewd@terra.com.br>

Felix Kuhling <fxkuehl@gmx.de>

Documentation/admin-guide/acpi/fan_performance_states.rst

0 → 100644
+62 −0
Original line number Diff line number Diff line 
.. 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.

Documentation/admin-guide/acpi/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ the Linux ACPI support. 
   dsdt-override

   ssdt-overlays

   cppc_sysfs

   fan_performance_states

Documentation/firmware-guide/acpi/enumeration.rst

+8 −8
Original line number Diff line number Diff line
@@ -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 */
@@ -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)

	{

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ F: drivers/acpi/apei/ 














ACPI COMPONENT ARCHITECTURE (ACPICA)















M:	Robert Moore <robert.moore@intel.com>













M:	Erik Schmauss <erik.schmauss@intel.com>













M:	Erik Kaneda <erik.kaneda@intel.com>















M:	"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>















L:	linux-acpi@vger.kernel.org















L:	devel@acpica.org









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE