Skip to content

Commit c90b29c

Browse files
committed
Merge branch 'acpica'
Merge ACPICA material for 6.4-rc1: - Delete bogus node_array array of pointers from AEST table (Jessica Clarke). - Add support for trace buffer extension in GICC to the ACPI MADT parser (Xiongfeng Wang). - Add missing macro ACPI_FUNCTION_TRACE() for acpi_ns_repair_HID() (Xiongfeng Wang). - Add missing tables to astable (Pedro Falcato). - Add support for 64 bit loong_arch compilation to ACPICA (Huacai Chen). - Add support for ASPT table in disassembler to ACPICA (Jeremi Piotrowski). - Add support for Arm's MPAM ACPI table version 2 (Hesham Almatary). - Update all copyrights/signons in ACPICA to 2023 (Bob Moore). - Add support for ClockInput resource (v6.5) (Niyas Sait). - Add RISC-V INTC interrupt controller definition to the list of supported interrupt controllers for MADT (Sunil V L). - Add structure definitions for the RISC-V RHCT ACPI table (Sunil V L). - Address several cases in which the ACPICA code might lead to undefined behavior (Tamir Duberstein). - Make ACPICA code support flexible arrays properly (Kees Cook). - Check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects() (void0red). - Add os specific support for Zephyr RTOS to ACPICA (Najumon). - Update version to 20230331 (Bob Moore). * acpica: (32 commits) ACPICA: Update version to 20230331 ACPICA: add os specific support for Zephyr RTOS ACPICA: ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects ACPICA: acpi_resource_irq: Replace 1-element arrays with flexible array ACPICA: acpi_madt_oem_data: Fix flexible array member definition ACPICA: acpi_dmar_andd: Replace 1-element array with flexible array ACPICA: acpi_pci_routing_table: Replace fixed-size array with flex array member ACPICA: struct acpi_resource_dma: Replace 1-element array with flexible array ACPICA: Introduce ACPI_FLEX_ARRAY ACPICA: struct acpi_nfit_interleave: Replace 1-element array with flexible array ACPICA: actbl2: Replace 1-element arrays with flexible arrays ACPICA: actbl1: Replace 1-element arrays with flexible arrays ACPICA: struct acpi_resource_vendor: Replace 1-element array with flexible array ACPICA: Avoid undefined behavior: load of misaligned address ACPICA: Avoid undefined behavior: member access within misaligned address ACPICA: Avoid undefined behavior: member access within misaligned address ACPICA: Avoid undefined behavior: member access within misaligned address ACPICA: Avoid undefined behavior: member access within misaligned address ACPICA: Avoid undefined behavior: member access within null pointer ACPICA: Avoid undefined behavior: applying zero offset to null pointer ...
2 parents 03c57b0 + df22866 commit c90b29c

187 files changed

Lines changed: 733 additions & 243 deletions

File tree

Some content is hidden

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

drivers/acpi/acpica/acapps.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 - 2022, Intel Corp.
6+
* Copyright (C) 2000 - 2023, Intel Corp.
77
*
88
*****************************************************************************/
99

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 - 2022, Intel Corp.
6+
* Copyright (C) 2000 - 2023, 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 - 2022, Intel Corp.
6+
* Copyright (C) 2000 - 2023, Intel Corp.
77
*
88
*****************************************************************************/
99

drivers/acpi/acpica/acdebug.h

Lines changed: 1 addition & 1 deletion
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 - 2022, Intel Corp.
6+
* Copyright (C) 2000 - 2023, Intel Corp.
77
*
88
*****************************************************************************/
99

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 - 2022, Intel Corp.
6+
* Copyright (C) 2000 - 2023, 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 - 2022, Intel Corp.
6+
* Copyright (C) 2000 - 2023, 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 - 2022, Intel Corp.
6+
* Copyright (C) 2000 - 2023, 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 - 2022, Intel Corp.
6+
* Copyright (C) 2000 - 2023, Intel Corp.
77
*
88
*****************************************************************************/
99

drivers/acpi/acpica/acinterp.h

Lines changed: 1 addition & 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 - 2022, Intel Corp.
6+
* Copyright (C) 2000 - 2023, Intel Corp.
77
*
88
*****************************************************************************/
99

drivers/acpi/acpica/aclocal.h

Lines changed: 3 additions & 2 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 - 2022, Intel Corp.
6+
* Copyright (C) 2000 - 2023, Intel Corp.
77
*
88
*****************************************************************************/
99

@@ -1122,7 +1122,8 @@ struct acpi_port_info {
11221122
#define ACPI_RESOURCE_NAME_PIN_GROUP 0x90
11231123
#define ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION 0x91
11241124
#define ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG 0x92
1125-
#define ACPI_RESOURCE_NAME_LARGE_MAX 0x92
1125+
#define ACPI_RESOURCE_NAME_CLOCK_INPUT 0x93
1126+
#define ACPI_RESOURCE_NAME_LARGE_MAX 0x94
11261127

11271128
/*****************************************************************************
11281129
*

0 commit comments

Comments
 (0)