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

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

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

Pull ACPI updates from Rafael Wysocki:
 "These mostly update the ACPICA code in the kernel to upstream revision
  20170531 which covers all of the new material from ACPI 6.2, including
  new tables (WSMT, HMAT, PPTT), new subtables and definition changes
  for some existing tables (BGRT, HEST, SRAT, TPM2, PCCT), new resource
  descriptor macros for pin control, support for new predefined methods
  (_LSI, _LSR, _LSW, _HMA), fixes and cleanups.

  On top of that, an additional ACPICA change from Kees (which also is
  upstream already) switches all of the definitions of function pointer
  structures in ACPICA to use designated initializers so as to make the
  structure layout randomization GCC plugin work with it.

  The rest is a few fixes and cleanups in the EC driver, an xpower PMIC
  driver update, a new backlight blacklist entry, and update of the
  tables configfs interface and a messages formatting cleanup.

  Specifics:

   - Update the ACPICA code in the kernel to upstream revision revision
     20170531 (which covers all of the new material from ACPI 6.2)
     including:
      * Support for the PinFunction(), PinConfig(), PinGroup(),
        PinGroupFunction(), and PinGroupConfig() resource descriptors
        (Mika Westerberg).
      * Support for new subtables in HEST and SRAT, new notify value for
        HEST, header support for TPM2 table changes, and BGRT Status
        field update (Bob Moore).
      * Support for new PCCT subtables (David Box).
      * Support for _LSI, _LSR, _LSW, and _HMA as predefined methods
        (Erik Schmauss).
      * Support for the new WSMT, HMAT, and PPTT tables (Lv Zheng).
      * New UUID values for Processor Properties (Bob Moore).
      * New notify values for memory attributes and graceful shutdown
        (Bob Moore).
      * Fix related to the PCAT_COMPAT MADT flag (Janosch Hildebrand).
      * Resource to AML conversion fix for resources containing GPIOs
        (Mika Westerberg).
      * Disassembler-related updates (Bob Moore, David Box, Erik
        Schmauss).
      * Assorted fixes and cleanups (Bob Moore, Erik Schmauss, Lv Zheng,
        Cao Jin).

   - Modify ACPICA to always use designated initializers for function
     pointer structures to make the structure layout randomization GCC
     plugin work with it (Kees Cook).

   - Update the tables configfs interface to unload SSDTs on configfs
     entry removal (Jan Kiszka).

   - Add support for the GPI1 regulator to the xpower PMIC Operation
     Region handler (Hans de Goede).

   - Fix ACPI EC issues related to conflicting EC definitions in the
     ECDT and in the ACPI namespace (Lv Zheng, Carlo Caione, Chris
     Chiu).

   - Fix an interrupt storm issue in the EC driver and make its debug
     output work with dynamic debug as expected (Lv Zheng).

   - Add ACPI backlight quirk for Dell Precision 7510 (Shih-Yuan Lee).

   - Fix whitespace in pr_fmt() to align log entries properly in some
     places in the ACPI subsystem (Vincent Legoll)"

* tag 'acpi-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (63 commits)
  ACPI / EC: Add quirk for GL720VMK
  ACPI / EC: Fix media keys not working problem on some Asus laptops
  ACPI / EC: Add support to skip boot stage DSDT probe
  ACPI / EC: Enhance boot EC sanity check
  ACPI / video: Add quirks for the Dell Precision 7510
  ACPI: EC: Fix EC command visibility for dynamic debug
  ACPI: EC: Fix an EC event IRQ storming issue
  ACPICA: Use designated initializers
  ACPICA: Update version to 20170531
  ACPICA: Update a couple of debug output messages
  ACPICA: acpiexec: enhance local signal handler
  ACPICA: Simplify output for the ACPI Debug Object
  ACPICA: Unix application OSL: Correctly handle control-c (EINTR)
  ACPICA: Improvements for debug output only
  ACPICA: Disassembler: allow conflicting external declarations to be emitted.
  ACPICA: Disassembler: add external op to namespace on first pass
  ACPICA: Disassembler: prevent external op's from opening a new scope
  ACPICA: Changed Gbl_disasm_flag to acpi_gbl_disasm_flag
  ACPICA: Changing External to a named object
  ACPICA: Update two error messages to emit control method name
  ...
parents 408c9861 03471c06

drivers/acpi/acpi_configfs.c

+19 −1
Original line number Diff line number Diff line
@@ -15,11 +15,15 @@ 
#include <linux/configfs.h>

#include <linux/acpi.h>



#include "acpica/accommon.h"

#include "acpica/actables.h"



static struct config_group *acpi_table_group;



struct acpi_table {

	struct config_item cfg;

	struct acpi_table_header *header;

	u32 index;

};



static ssize_t acpi_table_aml_write(struct config_item *cfg,
@@ -52,7 +56,11 @@ static ssize_t acpi_table_aml_write(struct config_item *cfg, 
	if (!table->header)

		return -ENOMEM;



	ret = acpi_load_table(table->header);

	ACPI_INFO(("Host-directed Dynamic ACPI Table Load:"));

	ret = acpi_tb_install_and_load_table(

			ACPI_PTR_TO_PHYSADDR(table->header),

			ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, FALSE,

			&table->index);

	if (ret) {

		kfree(table->header);

		table->header = NULL;
@@ -215,8 +223,18 @@ static struct config_item *acpi_table_make_item(struct config_group *group, 
	return &table->cfg;

}



static void acpi_table_drop_item(struct config_group *group,

				 struct config_item *cfg)

{

	struct acpi_table *table = container_of(cfg, struct acpi_table, cfg);



	ACPI_INFO(("Host-directed Dynamic ACPI Table Unload"));

	acpi_tb_unload_table(table->index);

}



struct configfs_group_operations acpi_table_group_ops = {

	.make_item = acpi_table_make_item,

	.drop_item = acpi_table_drop_item,

};



static struct config_item_type acpi_tables_type = {

drivers/acpi/acpica/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ acpi-y += \ 
	utosi.o		\

	utownerid.o	\

	utpredef.o	\

	utresdecode.o	\

	utresrc.o	\

	utstate.o	\

	utstring.o	\

drivers/acpi/acpica/acapps.h

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ acpi_dm_finish_namespace_load(union acpi_parse_object *parse_tree_root, 
			      acpi_owner_id owner_id);



void

acpi_dm_convert_resource_indexes(union acpi_parse_object *parse_tree_root,

acpi_dm_convert_parse_objects(union acpi_parse_object *parse_tree_root,

			      struct acpi_namespace_node *namespace_root);



/*

drivers/acpi/acpica/acglobal.h

+3 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_force_aml_disassembly, FALSE); 
ACPI_INIT_GLOBAL(u8, acpi_gbl_dm_opt_verbose, TRUE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_dm_emit_external_opcodes, FALSE);

ACPI_INIT_GLOBAL(u8, acpi_gbl_do_disassembler_optimizations, TRUE);

ACPI_INIT_GLOBAL(ACPI_PARSE_OBJECT_LIST, *acpi_gbl_temp_list_head, NULL);



ACPI_GLOBAL(u8, acpi_gbl_dm_opt_disasm);

ACPI_GLOBAL(u8, acpi_gbl_dm_opt_listing);
@@ -368,6 +369,8 @@ ACPI_GLOBAL(const char, *acpi_gbl_pld_vertical_position_list[]); 
ACPI_GLOBAL(const char, *acpi_gbl_pld_horizontal_position_list[]);

ACPI_GLOBAL(const char, *acpi_gbl_pld_shape_list[]);



ACPI_INIT_GLOBAL(u8, acpi_gbl_disasm_flag, FALSE);



#endif



/*

drivers/acpi/acpica/aclocal.h

+13 −2
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ ACPI_PARSE_COMMON}; 
 * and bytelists.

 */

struct acpi_parse_obj_named {

	ACPI_PARSE_COMMON u8 *path;

	ACPI_PARSE_COMMON char *path;

	u8 *data;		/* AML body or bytelist data */

	u32 length;		/* AML length */

	u32 name;		/* 4-byte name or zero if no name */
@@ -1142,8 +1142,13 @@ struct acpi_port_info { 
#define ACPI_RESOURCE_NAME_ADDRESS64            0x8A

#define ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64   0x8B

#define ACPI_RESOURCE_NAME_GPIO                 0x8C

#define ACPI_RESOURCE_NAME_PIN_FUNCTION         0x8D

#define ACPI_RESOURCE_NAME_SERIAL_BUS           0x8E

#define ACPI_RESOURCE_NAME_LARGE_MAX            0x8E

#define ACPI_RESOURCE_NAME_PIN_CONFIG           0x8F

#define ACPI_RESOURCE_NAME_PIN_GROUP            0x90

#define ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION   0x91

#define ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG     0x92

#define ACPI_RESOURCE_NAME_LARGE_MAX            0x92



/*****************************************************************************

 *
@@ -1176,12 +1181,18 @@ struct acpi_external_list { 
#define ACPI_EXT_INTERNAL_PATH_ALLOCATED    0x04	/* Deallocate internal path on completion */

#define ACPI_EXT_EXTERNAL_EMITTED           0x08	/* External() statement has been emitted */

#define ACPI_EXT_ORIGIN_FROM_OPCODE         0x10	/* External came from a External() opcode */

#define ACPI_EXT_CONFLICTING_DECLARATION    0x20	/* External has a conflicting declaration within AML */



struct acpi_external_file {

	char *path;

	struct acpi_external_file *next;

};



struct acpi_parse_object_list {

	union acpi_parse_object *op;

	struct acpi_parse_object_list *next;

};



/*****************************************************************************

 *

 * Debugger