Skip to content

Commit 57356d9

Browse files
rafaeljwrafaeljw
committed
Merge branch 'acpica'
Merge ACPICA updates, including two upstream releases 20241212 and 20250404, for 6.16-rc1: - Fix two ACPICA SLAB cache leaks (Seunghun Han). - Add EINJv2 get error type action and define Error Injection Actions in hex values to avoid inconsistencies between the specification and the code (Zaid Alali). - Fix typo in comments for SRAT structures (Adam Lackorzynski). - Prevent possible loss of data in ACPICA because of u32 to u8 conversions (Saket Dumbre). - Fix reading FFixedHW operation regions in ACPICA (Daniil Tatianin). - Add support for printing AML arguments when the ACPICA debug level is ACPI_LV_TRACE_POINT (Mario Limonciello). - Drop a stale comment about the file content from actbl2.h (Sudeep Holla). - Apply pack(1) to union aml_resource (Tamir Duberstein). - Fix overflow check in the ACPICA version of vsnprintf() (gldrk). - Interpret SIDP structures in DMAR added revision 3.4 of the VT-d specification (Alexey Neyman). - Add typedef and other definitions related to MRRM to ACPICA (Tony Luck). - Add definitions for RIMT to ACPICA (Sunil V L). - Fix spelling mistake "Incremement" -> "Increment" in the ACPICA utilities code (Colin Ian King). - Add typedef and other definitions for ERDT to ACPICA (Tony Luck). - Introduce ACPI_NONSTRING and use it (Kees Cook, Ahmed Salem). - Rename structure and field names of the RAS2 table in actbl2.h (Shiju Jose). - Fix up whitespace in acpica/utcache.c (Zhe Qiao). - Avoid sequence overread in a call to strncmp() in ap_get_table_length() and replace strncpy() with memcpy() in ACPICA in some places (Ahmed Salem). - Update copyright year in all ACPICA files (Saket Dumbre). * acpica: (30 commits) ACPICA: Update copyright year ACPICA: Logfile: Changes for version 20250404 ACPICA: Replace strncpy() with memcpy() ACPICA: Apply ACPI_NONSTRING in more places ACPICA: Avoid sequence overread in call to strncmp() ACPICA: Adjust the position of code lines ACPICA: actbl2.h: ACPI 6.5: RAS2: Rename structure and field names of the RAS2 table ACPICA: Apply ACPI_NONSTRING ACPICA: Introduce ACPI_NONSTRING ACPICA: actbl2.h: ERDT: Add typedef and other definitions ACPICA: infrastructure: Add new DMT_BUF types and shorten a long name ACPICA: Utilities: Fix spelling mistake "Incremement" -> "Increment" ACPICA: MRRM: Some cleanups ACPICA: actbl2: Add definitions for RIMT ACPICA: actbl2.h: MRRM: Add typedef and other definitions ACPICA: infrastructure: Add new header and ACPI_DMT_BUF26 types ACPICA: Interpret SIDP structures in DMAR ACPICA: utilities: Fix overflow check in vsnprintf() ACPICA: Apply pack(1) to union aml_resource ACPICA: Drop stale comment about the header file content ...
2 parents 94a370f + 0e9fd69 commit 57356d9

File tree

184 files changed

+672
-310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+672
-310
lines changed

‎drivers/acpi/acpica/acapps.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Module Name: acapps - common include for ACPI applications/tools
55
*
6-
* Copyright (C) 2000 - 2023, Intel Corp.
6+
* Copyright (C) 2000 - 2025, Intel Corp.
77
*
88
*****************************************************************************/
99

@@ -17,7 +17,7 @@
1717
/* Common info for tool signons */
1818

1919
#define ACPICA_NAME "Intel ACPI Component Architecture"
20-
#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2022 Intel Corporation"
20+
#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2025 Intel Corporation"
2121

2222
#if ACPI_MACHINE_WIDTH == 64
2323
#define ACPI_WIDTH " (64-bit version)"

‎drivers/acpi/acpica/accommon.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Name: accommon.h - Common include files for generation of ACPICA source
55
*
6-
* Copyright (C) 2000 - 2023, Intel Corp.
6+
* Copyright (C) 2000 - 2025, Intel Corp.
77
*
88
*****************************************************************************/
99

‎drivers/acpi/acpica/acconvert.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Module Name: acapps - common include for ACPI applications/tools
55
*
6-
* Copyright (C) 2000 - 2023, Intel Corp.
6+
* Copyright (C) 2000 - 2025, Intel Corp.
77
*
88
*****************************************************************************/
99

‎drivers/acpi/acpica/acdebug.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Name: acdebug.h - ACPI/AML debugger
55
*
6-
* Copyright (C) 2000 - 2023, Intel Corp.
6+
* Copyright (C) 2000 - 2025, Intel Corp.
77
*
88
*****************************************************************************/
99

@@ -37,7 +37,7 @@ struct acpi_db_argument_info {
3737
struct acpi_db_execute_walk {
3838
u32 count;
3939
u32 max_count;
40-
char name_seg[ACPI_NAMESEG_SIZE + 1];
40+
char name_seg[ACPI_NAMESEG_SIZE + 1] ACPI_NONSTRING;
4141
};
4242

4343
#define PARAM_LIST(pl) pl

‎drivers/acpi/acpica/acdispat.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Name: acdispat.h - dispatcher (parser to interpreter interface)
55
*
6-
* Copyright (C) 2000 - 2023, Intel Corp.
6+
* Copyright (C) 2000 - 2025, Intel Corp.
77
*
88
*****************************************************************************/
99

‎drivers/acpi/acpica/acevents.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Name: acevents.h - Event subcomponent prototypes and defines
55
*
6-
* Copyright (C) 2000 - 2023, Intel Corp.
6+
* Copyright (C) 2000 - 2025, Intel Corp.
77
*
88
*****************************************************************************/
99

‎drivers/acpi/acpica/acglobal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Name: acglobal.h - Declarations for global variables
55
*
6-
* Copyright (C) 2000 - 2023, Intel Corp.
6+
* Copyright (C) 2000 - 2025, Intel Corp.
77
*
88
*****************************************************************************/
99

‎drivers/acpi/acpica/achware.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Name: achware.h -- hardware specific interfaces
55
*
6-
* Copyright (C) 2000 - 2023, Intel Corp.
6+
* Copyright (C) 2000 - 2025, Intel Corp.
77
*
88
*****************************************************************************/
99

‎drivers/acpi/acpica/acinterp.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Name: acinterp.h - Interpreter subcomponent prototypes and defines
55
*
6-
* Copyright (C) 2000 - 2023, Intel Corp.
6+
* Copyright (C) 2000 - 2025, Intel Corp.
77
*
88
*****************************************************************************/
99

@@ -120,6 +120,9 @@ void
120120
acpi_ex_trace_point(acpi_trace_event_type type,
121121
u8 begin, u8 *aml, char *pathname);
122122

123+
void
124+
acpi_ex_trace_args(union acpi_operand_object **params, u32 count);
125+
123126
/*
124127
* exfield - ACPI AML (p-code) execution - field manipulation
125128
*/

‎drivers/acpi/acpica/aclocal.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Name: aclocal.h - Internal data types used across the ACPI subsystem
55
*
6-
* Copyright (C) 2000 - 2023, Intel Corp.
6+
* Copyright (C) 2000 - 2025, Intel Corp.
77
*
88
*****************************************************************************/
99

@@ -293,7 +293,7 @@ acpi_status (*acpi_internal_method) (struct acpi_walk_state * walk_state);
293293
* expected_return_btypes - Allowed type(s) for the return value
294294
*/
295295
struct acpi_name_info {
296-
char name[ACPI_NAMESEG_SIZE] __nonstring;
296+
char name[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;
297297
u16 argument_list;
298298
u8 expected_btypes;
299299
};
@@ -370,7 +370,7 @@ typedef acpi_status (*acpi_object_converter) (struct acpi_namespace_node *
370370
converted_object);
371371

372372
struct acpi_simple_repair_info {
373-
char name[ACPI_NAMESEG_SIZE] __nonstring;
373+
char name[ACPI_NAMESEG_SIZE] ACPI_NONSTRING;
374374
u32 unexpected_btypes;
375375
u32 package_index;
376376
acpi_object_converter object_converter;

0 commit comments

Comments
 (0)