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

Merge branches 'acpi-apei', 'acpi-dptf', 'acpi-x86' and 'acpi-docs' 

Merge APEI material, changes related to DPTF, ACPI-related x86 cleanup
and documentation improvement for 5.19-rc1:

 - 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).

* acpi-apei:
  ACPI, APEI, EINJ: Refuse to inject into the zero page
  ACPI: APEI: Fix missing ERST record id

* acpi-dptf:
  ACPI: DPTF: Add support for high frequency impedance notification
  ACPI: DPTF: Correct description of INT3407 / INT3532 attributes

* acpi-x86:
  x86: ACPI: Make mp_config_acpi_gsi() a void function

* acpi-docs:
  ACPI: docs: enumeration: Unify Package () for properties (part 2)
parents 4aa8c70c ab59c893 42e5ed06 24773e6c e802ca75

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
@@ -375,7 +375,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
@@ -387,9 +387,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;
@@ -408,7 +408,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/apei/einj.c

+3 −0
Original line number Diff line number Diff line
@@ -549,6 +549,9 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, 
	     !arch_is_platform_page(base_addr)))

		return -EINVAL;



	if (is_zero_pfn(base_addr >> PAGE_SHIFT))

		return -EADDRINUSE;



inject:

	mutex_lock(&einj_mutex);

	rc = __einj_error_inject(type, flags, param1, param2, param3, param4);

drivers/acpi/apei/erst-dbg.c

+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ static ssize_t erst_dbg_read(struct file *filp, char __user *ubuf, 
		goto out;

	}

retry:

	rc = len = erst_read(id, erst_dbg_buf, erst_dbg_buf_len);

	rc = len = erst_read_record(id, erst_dbg_buf, erst_dbg_buf_len,

			erst_dbg_buf_len, NULL);

	/* The record may be cleared by others, try read next record */

	if (rc == -ENOENT)

		goto retry_next;