Commit 1961b06c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents aa051d36 5db9ce20

Documentation/firmware-guide/acpi/enumeration.rst

+1 −2
Original line number Diff line number Diff line
@@ -167,8 +167,7 @@ The table below shows an example of its usage:: 
        Name (_DSD, Package () {

            ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),

            Package () {

                Package () {"interrupt-names",

                Package (2) {"default", "alert"}},

                Package () { "interrupt-names", Package () { "default", "alert" } },

            }

        ...

        })

arch/x86/kernel/acpi/boot.c

+3 −4
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, 
	isa_irq_to_gsi[bus_irq] = gsi;

}



static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,

static void mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,

			int polarity)

{

#ifdef CONFIG_X86_MPPARSE
@@ -447,9 +447,9 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, 
	u8 pin;



	if (!acpi_ioapic)

		return 0;

		return;

	if (!dev || !dev_is_pci(dev))

		return 0;

		return;



	pdev = to_pci_dev(dev);

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


	mp_save_irq(&mp_irq);

#endif

	return 0;

}



static int __init mp_register_ioapic_irq(u8 bus_irq, u8 polarity,

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

+3 −5
Original line number Diff line number Diff line
@@ -177,16 +177,14 @@ ssize_t apei_read_mce(struct mce *m, u64 *record_id) 
	/* no more record */

	if (*record_id == APEI_ERST_INVALID_RECORD_ID)

		goto out;

	rc = erst_read(*record_id, &rcd.hdr, sizeof(rcd));

	rc = erst_read_record(*record_id, &rcd.hdr, sizeof(rcd), sizeof(rcd),

			&CPER_CREATOR_MCE);

	/* someone else has cleared the record, try next one */

	if (rc == -ENOENT)

		goto retry;

	else if (rc < 0)

		goto out;

	/* try to skip other type records in storage */

	else if (rc != sizeof(rcd) ||

		 !guid_equal(&rcd.hdr.creator_id, &CPER_CREATOR_MCE))

		goto retry;



	memcpy(m, &rcd.mce, sizeof(*m));

	rc = sizeof(*m);

out:

drivers/acpi/acpica/acapps.h

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Module Name: acapps - common include for ACPI applications/tools

 *

 * Copyright (C) 2000 - 2021, Intel Corp.

 * Copyright (C) 2000 - 2022, Intel Corp.

 *

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



#define ACPICA_NAME                 "Intel ACPI Component Architecture"

#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2021 Intel Corporation"

#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2022 Intel Corporation"



#if ACPI_MACHINE_WIDTH == 64

#define ACPI_WIDTH          " (64-bit version)"

drivers/acpi/acpica/accommon.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Name: accommon.h - Common include files for generation of ACPICA source

 *

 * Copyright (C) 2000 - 2021, Intel Corp.

 * Copyright (C) 2000 - 2022, Intel Corp.

 *

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