Skip to content

Commit 1961b06

Browse files
torvaldstorvalds
committed
Merge tag 'acpi-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI updates from Rafael Wysocki: "These update the ACPICA kernel code to upstream revision 20220331, improve handling of PCI devices that are in D3cold during system initialization, add support for a few features, fix bugs and clean up code. Specifics: - Update ACPICA code in the kernel to upstream revision 20220331 including the following changes: - Add support for the Windows 11 _OSI string (Mario Limonciello) - Add the CFMWS subtable to the CEDT table (Lawrence Hileman). - iASL: NHLT: Treat Terminator as specific_config (Piotr Maziarz). - iASL: NHLT: Fix parsing undocumented bytes at the end of Endpoint Descriptor (Piotr Maziarz). - iASL: NHLT: Rename linux specific strucures to device_info (Piotr Maziarz). - Add new ACPI 6.4 semantics to Load() and LoadTable() (Bob Moore). - Clean up double word in comment (Tom Rix). - Update copyright notices to the year 2022 (Bob Moore). - Remove some tabs and // comments - automated cleanup (Bob Moore). - Replace zero-length array with flexible-array member (Gustavo A. R. Silva). - Interpreter: Add units to time variable names (Paul Menzel). - Add support for ARM Performance Monitoring Unit Table (Besar Wicaksono). - Inform users about ACPI spec violation related to sleep length (Paul Menzel). - iASL/MADT: Add OEM-defined subtable (Bob Moore). - Interpreter: Fix some typo mistakes (Selvarasu Ganesan). - Updates for revision E.d of IORT (Shameer Kolothum). - Use ACPI_FORMAT_UINT64 for 64-bit output (Bob Moore). - Improve debug messages in the ACPI device PM code (Rafael Wysocki). - Block ASUS B1400CEAE from suspend to idle by default (Mario Limonciello). - Improve handling of PCI devices that are in D3cold during system initialization (Rafael Wysocki). - Fix BERT error region memory mapping (Lorenzo Pieralisi). - Add support for NVIDIA 16550-compatible port subtype to the SPCR parsing code (Jeff Brasen). - Use static for BGRT_SHOW kobj_attribute defines (Tom Rix). - Fix missing prototype warning for acpi_agdi_init() (Ilkka Koskinen). - Fix missing ERST record ID in the APEI code (Liu Xinpeng). - Make APEI error injection to refuse to inject into the zero page (Tony Luck). - Correct description of INT3407 / INT3532 DPTF attributes in sysfs (Sumeet Pawnikar). - Add support for high frequency impedance notification to the DPTF driver (Sumeet Pawnikar). - Make mp_config_acpi_gsi() a void function (Li kunyu). - Unify Package () representation for properties in the ACPI device properties documentation (Andy Shevchenko). - Include UUID in _DSM evaluation warning (Michael Niewöhner)" * tag 'acpi-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (41 commits) Revert "ACPICA: executer/exsystem: Warn about sleeps greater than 10 ms" ACPI: utils: include UUID in _DSM evaluation warning ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default x86: ACPI: Make mp_config_acpi_gsi() a void function ACPI: DPTF: Add support for high frequency impedance notification ACPI: AGDI: Fix missing prototype warning for acpi_agdi_init() ACPI: bus: Avoid non-ACPI device objects in walks over children ACPI: DPTF: Correct description of INT3407 / INT3532 attributes ACPI: BGRT: use static for BGRT_SHOW kobj_attribute defines ACPI, APEI, EINJ: Refuse to inject into the zero page ACPI: PM: Always print final debug message in acpi_device_set_power() ACPI: SPCR: Add support for NVIDIA 16550-compatible port subtype ACPI: docs: enumeration: Unify Package () for properties (part 2) ACPI: APEI: Fix missing ERST record id ACPICA: Update version to 20220331 ACPICA: exsystem.c: Use ACPI_FORMAT_UINT64 for 64-bit output ACPICA: IORT: Updates for revision E.d ACPICA: executer/exsystem: Fix some typo mistakes ACPICA: iASL/MADT: Add OEM-defined subtable ACPICA: executer/exsystem: Warn about sleeps greater than 10 ms ...
2 parents aa051d3 + 5db9ce2 commit 1961b06

194 files changed

Lines changed: 626 additions & 322 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.

‎Documentation/firmware-guide/acpi/enumeration.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ The table below shows an example of its usage::
167167
Name (_DSD, Package () {
168168
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
169169
Package () {
170-
Package () {"interrupt-names",
171-
Package (2) {"default", "alert"}},
170+
Package () { "interrupt-names", Package () { "default", "alert" } },
172171
}
173172
...
174173
})

‎arch/x86/kernel/acpi/boot.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ static void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
435435
isa_irq_to_gsi[bus_irq] = gsi;
436436
}
437437

438-
static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
438+
static void mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
439439
int polarity)
440440
{
441441
#ifdef CONFIG_X86_MPPARSE
@@ -447,9 +447,9 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
447447
u8 pin;
448448

449449
if (!acpi_ioapic)
450-
return 0;
450+
return;
451451
if (!dev || !dev_is_pci(dev))
452-
return 0;
452+
return;
453453

454454
pdev = to_pci_dev(dev);
455455
number = pdev->bus->number;
@@ -468,7 +468,6 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
468468

469469
mp_save_irq(&mp_irq);
470470
#endif
471-
return 0;
472471
}
473472

474473
static int __init mp_register_ioapic_irq(u8 bus_irq, u8 polarity,

‎arch/x86/kernel/cpu/mce/apei.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,16 +177,14 @@ ssize_t apei_read_mce(struct mce *m, u64 *record_id)
177177
/* no more record */
178178
if (*record_id == APEI_ERST_INVALID_RECORD_ID)
179179
goto out;
180-
rc = erst_read(*record_id, &rcd.hdr, sizeof(rcd));
180+
rc = erst_read_record(*record_id, &rcd.hdr, sizeof(rcd), sizeof(rcd),
181+
&CPER_CREATOR_MCE);
181182
/* someone else has cleared the record, try next one */
182183
if (rc == -ENOENT)
183184
goto retry;
184185
else if (rc < 0)
185186
goto out;
186-
/* try to skip other type records in storage */
187-
else if (rc != sizeof(rcd) ||
188-
!guid_equal(&rcd.hdr.creator_id, &CPER_CREATOR_MCE))
189-
goto retry;
187+
190188
memcpy(m, &rcd.mce, sizeof(*m));
191189
rc = sizeof(*m);
192190
out:

‎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 - 2021, Intel Corp.
6+
* Copyright (C) 2000 - 2022, 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 - 2021 Intel Corporation"
20+
#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2022 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 - 2021, Intel Corp.
6+
* Copyright (C) 2000 - 2022, 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 - 2021, Intel Corp.
6+
* Copyright (C) 2000 - 2022, 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 - 2021, Intel Corp.
6+
* Copyright (C) 2000 - 2022, 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 - 2021, Intel Corp.
6+
* Copyright (C) 2000 - 2022, 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 - 2021, Intel Corp.
6+
* Copyright (C) 2000 - 2022, 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 - 2021, Intel Corp.
6+
* Copyright (C) 2000 - 2022, Intel Corp.
77
*
88
*****************************************************************************/
99

0 commit comments

Comments
 (0)