Commit d2aaa49e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI updates from Rafael Wysocki:
 "These include an ACPICA update (to upstream revision 20190816),
  improvements of support for memory hot-add in the HMAT handling code
  and some assorted fixes and cleanups.

  Specifics:

   - Update the ACPICA code in the kernel to upstream revision 20190816
     including:
      * Internal limits change to support larger systems (Bob Moore).
      * Macros clean up (Bob Moore).
      * printf format string fixes (Bob Moore).
      * Full deployment of the ACPI_PRINTF_LIKE macro (Bob Moore).
      * Tools improvements (Bob Moore, Colin Ian King).
      * Windows _OSI support fixes (Jung-uk Kim).

   - Improve memory hot-add support in the ACPI HMAT handling code (Dan
     Williams, Keith Busch).

   - Fix the ACPI LPSS (Low-Power Subsystem) driver for Intel SoCs to
     save and restore private registers during system-wide suspend and
     resume on systems with the Lynxpoint PCH (Jarkko Nikula).

   - Convert the ACPI documentation related to LEDs to ReST (Sakari
     Ailus).

   - Fix assorted issues and make assorted minor improvements in the
     ACPI-related code (Al Stone, Andy Shevchenko, Jiri Slaby, Kelsey
     Skunberg, Krzysztof Wilczynski, Liguang Zhang, Wenwen Wang,
     YueHaibing)"

* tag 'acpi-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (23 commits)
  ACPI / PCI: fix acpi_pci_irq_enable() memory leak
  ACPI: custom_method: fix memory leaks
  ACPI: thermal: Remove redundant acpi_has_method() calls
  ACPI / CPPC: do not require the _PSD method
  ACPI: SBS: remove unused const variable 'SMBUS_PEC'
  ACPI / LPSS: Save/restore LPSS private registers also on Lynxpoint
  ACPI/PCI: Remove surplus parentheses from a return statement
  ACPICA: Update version to 20190816.
  ACPICA: Add "Windows 2019" string to _OSI support.
  ACPICA: Differentiate Windows 8.1 from Windows 8.
  ACPICA: Fully deploy ACPI_PRINTF_LIKE macro
  ACPICA: iASL,acpi_dump: Improve y/n query
  ACPICA: Fix issues with arg types within printf format strings
  ACPICA: Macros: remove pointer math on a null pointer
  ACPICA: Increase total number of possible Owner IDs
  ACPICA: Debugger: remove redundant assignment on obj_desc
  Documentation: ACPI: DSD: Convert LED documentation to ReST
  ACPI / APEI: Release resources if gen_pool_add() fails
  HMAT: Skip publishing target info for nodes with no online memory
  HMAT: Register attributes for memory hot add
  ...
parents 77dcfe2b 0b3e7973

Documentation/acpi/dsd/leds.txt→Documentation/firmware-guide/acpi/dsd/leds.rst

+16 −4
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0

.. include:: <isonum.txt>



========================================

Describing and referring to LEDs in ACPI

========================================



Individual LEDs are described by hierarchical data extension [6] nodes under the

device node, the LED driver chip. The "reg" property in the LED specific nodes
@@ -25,8 +30,12 @@ entry shall contain the string "led@" followed by the number of the LED, 
followed by the referred object name. That object shall be named "LED" followed

by the number of the LED.



An ASL example of a camera sensor device and a LED driver device for two LEDs.

Objects not relevant for LEDs or the references to them have been omitted.

Example

=======



An ASL example of a camera sensor device and a LED driver device for two LEDs is

show below. Objects not relevant for LEDs or the references to them have been

omitted. ::



	Device (LED)

	{
@@ -71,12 +80,15 @@ Objects not relevant for LEDs or the references to them have been omitted. 
	}



where

::



	LED	LED driver device

	LED0	First LED

	LED1	Second LED

	SEN	Camera sensor device (or another device the LED is

		related to)

	SEN	Camera sensor device (or another device the LED is related to)



References

==========



[1] Device tree. <URL:http://www.devicetree.org>, referenced 2019-02-21.

Documentation/firmware-guide/acpi/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ ACPI Support 
   namespace

   dsd/graph

   dsd/data-node-references

   dsd/leds

   enumeration

   osi

   method-customizing

drivers/acpi/acpi_lpss.c

+5 −3
Original line number Diff line number Diff line
@@ -219,12 +219,13 @@ static void bsw_pwm_setup(struct lpss_private_data *pdata) 
}



static const struct lpss_device_desc lpt_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR,

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR

			| LPSS_SAVE_CTX,

	.prv_offset = 0x800,

};



static const struct lpss_device_desc lpt_i2c_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_LTR,

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_LTR | LPSS_SAVE_CTX,

	.prv_offset = 0x800,

};
@@ -236,7 +237,8 @@ static struct property_entry uart_properties[] = { 
};



static const struct lpss_device_desc lpt_uart_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR,

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR

			| LPSS_SAVE_CTX,

	.clk_con_id = "baudclk",

	.prv_offset = 0x800,

	.setup = lpss_uart_setup,

drivers/acpi/acpi_processor.c

+7 −3
Original line number Diff line number Diff line
@@ -279,6 +279,10 @@ static int acpi_processor_get_info(struct acpi_device *device) 
	}



	if (acpi_duplicate_processor_id(pr->acpi_id)) {

		if (pr->acpi_id == 0xff)

			dev_info_once(&device->dev,

				"Entry not well-defined, consider updating BIOS\n");

		else

			dev_err(&device->dev,

				"Failed to get unique processor _UID (0x%x)\n",

				pr->acpi_id);

drivers/acpi/acpica/aclocal.h

+2 −2
Original line number Diff line number Diff line
@@ -134,12 +134,12 @@ struct acpi_namespace_node { 
	union acpi_operand_object *object;	/* Interpreter object */

	u8 descriptor_type;	/* Differentiate object descriptor types */

	u8 type;		/* ACPI Type associated with this name */

	u8 flags;		/* Miscellaneous flags */

	acpi_owner_id owner_id;	/* Node creator */

	u16 flags;		/* Miscellaneous flags */

	union acpi_name_union name;	/* ACPI Name, always 4 chars per ACPI spec */

	struct acpi_namespace_node *parent;	/* Parent node */

	struct acpi_namespace_node *child;	/* First child */

	struct acpi_namespace_node *peer;	/* First peer */

	acpi_owner_id owner_id;	/* Node creator */



	/*

	 * The following fields are used by the ASL compiler and disassembler only

CRA Git | Maintained and supported by SUSTech CRA and CCSE