Commit b46a8eda authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica:
  ACPICA: Update version to 20210730
  ACPICA: Add method name "_DIS" For use with aslmethod.c
  ACPICA: iASL: Fix for WPBT table with no command-line arguments
  ACPICA: Headers: Add new DBG2 Serial Port Subtypes
  ACPICA: Macros should not use a trailing semicolon
  ACPICA: Fix an if statement (add parens)
  ACPICA: iASL: Add support for the AEST table (data compiler)
parents 294c34e7 696e0c93

drivers/acpi/acpica/dswexec.c

+2 −3
Original line number Diff line number Diff line
@@ -561,8 +561,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state) 
								op->common.

								node->object,

								NULL);

				if ACPI_FAILURE

					(status) {

				if (ACPI_FAILURE(status)) {

					ACPI_EXCEPTION((AE_INFO, status,

							"While writing to buffer field"));

				}

include/acpi/acnames.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define METHOD_NAME__CLS        "_CLS"

#define METHOD_NAME__CRS        "_CRS"

#define METHOD_NAME__DDN        "_DDN"

#define METHOD_NAME__DIS        "_DIS"

#define METHOD_NAME__DMA        "_DMA"

#define METHOD_NAME__HID        "_HID"

#define METHOD_NAME__INI        "_INI"

include/acpi/acoutput.h

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ 
/* Conditional execution */



#define ACPI_DEBUG_EXEC(a)              a

#define ACPI_DEBUG_ONLY_MEMBERS(a)      a;

#define ACPI_DEBUG_ONLY_MEMBERS(a)      a

#define _VERBOSE_STRUCTURES



/* Various object display routines for debug */

include/acpi/acpixf.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


/* Current ACPICA subsystem version in YYYYMMDD format */



#define ACPI_CA_VERSION                 0x20210604

#define ACPI_CA_VERSION                 0x20210730



#include <acpi/acconfig.h>

#include <acpi/actypes.h>

include/acpi/actbl1.h

+15 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 * file. Useful because they make it more difficult to inadvertently type in

 * the wrong signature.

 */

#define ACPI_SIG_AEST           "AEST"	/* Arm Error Source Table */

#define ACPI_SIG_ASF            "ASF!"	/* Alert Standard Format table */

#define ACPI_SIG_BERT           "BERT"	/* Boot Error Record Table */

#define ACPI_SIG_BGRT           "BGRT"	/* Boot Graphics Resource Table */
@@ -482,7 +483,7 @@ struct acpi_csrt_descriptor { 
 * DBG2 - Debug Port Table 2

 *        Version 0 (Both main table and subtables)

 *

 * Conforms to "Microsoft Debug Port Table 2 (DBG2)", December 10, 2015

 * Conforms to "Microsoft Debug Port Table 2 (DBG2)", September 21, 2020

 *

 ******************************************************************************/
@@ -532,11 +533,24 @@ struct acpi_dbg2_device { 


#define ACPI_DBG2_16550_COMPATIBLE  0x0000

#define ACPI_DBG2_16550_SUBSET      0x0001

#define ACPI_DBG2_MAX311XE_SPI      0x0002

#define ACPI_DBG2_ARM_PL011         0x0003

#define ACPI_DBG2_MSM8X60           0x0004

#define ACPI_DBG2_16550_NVIDIA      0x0005

#define ACPI_DBG2_TI_OMAP           0x0006

#define ACPI_DBG2_APM88XXXX         0x0008

#define ACPI_DBG2_MSM8974           0x0009

#define ACPI_DBG2_SAM5250           0x000A

#define ACPI_DBG2_INTEL_USIF        0x000B

#define ACPI_DBG2_IMX6              0x000C

#define ACPI_DBG2_ARM_SBSA_32BIT    0x000D

#define ACPI_DBG2_ARM_SBSA_GENERIC  0x000E

#define ACPI_DBG2_ARM_DCC           0x000F

#define ACPI_DBG2_BCM2835           0x0010

#define ACPI_DBG2_SDM845_1_8432MHZ  0x0011

#define ACPI_DBG2_16550_WITH_GAS    0x0012

#define ACPI_DBG2_SDM845_7_372MHZ   0x0013

#define ACPI_DBG2_INTEL_LPSS        0x0014



#define ACPI_DBG2_1394_STANDARD     0x0000