Commit 28b06993 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-pad', 'acpi-cppc', 'acpi-ec' and 'acpi-resource' 

Merge assorted ACPI updates for 6.16-rc2:

 - Update data types of variables passed as arguments to
   mwait_idle_with_hints() in the ACPI PAD (processor aggregator device)
   driver to match the function definition after recent changes (Uros
   Bizjak).

 - Fix a NULL pointer dereference in the ACPI CPPC library that occurs
   when nosmp is passed to the kernel in the command line (Yunhui Cui).

 - Ignore ECDT tables with an invalid ID string to prevent using an
   incorrect GPE for signaling events on some systems (Armin Wolf).

 - Add a new IRQ override quirk for MACHENIKE 16P (Wentao Guan).

* acpi-pad:
  ACPI: PAD: Update arguments of mwait_idle_with_hints()

* acpi-cppc:
  ACPI: CPPC: Fix NULL pointer dereference when nosmp is used

* acpi-ec:
  ACPI: EC: Ignore ECDT tables with an invalid ID string

* acpi-resource:
  ACPI: resource: Use IRQ override on MACHENIKE 16P
parents 162457f5 2f76d269 15eece6c 7a0d59f6 c99ad987

drivers/acpi/acpi_pad.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
static DEFINE_MUTEX(isolated_cpus_lock);

static DEFINE_MUTEX(round_robin_lock);



static unsigned long power_saving_mwait_eax;

static unsigned int power_saving_mwait_eax;



static unsigned char tsc_detected_unstable;

static unsigned char tsc_marked_unstable;

drivers/acpi/cppc_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ bool cppc_allow_fast_switch(void) 
	struct cpc_desc *cpc_ptr;

	int cpu;



	for_each_possible_cpu(cpu) {

	for_each_present_cpu(cpu) {

		cpc_ptr = per_cpu(cpc_desc_ptr, cpu);

		desired_reg = &cpc_ptr->cpc_regs[DESIRED_PERF];

		if (!CPC_IN_SYSTEM_MEMORY(desired_reg) &&

drivers/acpi/ec.c

+17 −0
Original line number Diff line number Diff line
@@ -23,8 +23,10 @@ 
#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/list.h>

#include <linux/printk.h>

#include <linux/spinlock.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/suspend.h>

#include <linux/acpi.h>

#include <linux/dmi.h>
@@ -2031,6 +2033,21 @@ void __init acpi_ec_ecdt_probe(void) 
		goto out;

	}



	if (!strstarts(ecdt_ptr->id, "\\")) {

		/*

		 * The ECDT table on some MSI notebooks contains invalid data, together

		 * with an empty ID string ("").

		 *

		 * Section 5.2.15 of the ACPI specification requires the ID string to be

		 * a "fully qualified reference to the (...) embedded controller device",

		 * so this string always has to start with a backslash.

		 *

		 * By verifying this we can avoid such faulty ECDT tables in a safe way.

		 */

		pr_err(FW_BUG "Ignoring ECDT due to invalid ID string \"%s\"\n", ecdt_ptr->id);

		goto out;

	}



	ec = acpi_ec_alloc();

	if (!ec)

		goto out;

drivers/acpi/resource.c

+7 −0
Original line number Diff line number Diff line
@@ -666,6 +666,13 @@ static const struct dmi_system_id irq1_edge_low_force_override[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "GMxHGxx"),

		},

	},

	{

		/* MACHENIKE L16P/L16P */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "MACHENIKE"),

			DMI_MATCH(DMI_BOARD_NAME, "L16P"),

		},

	},

	{

		/*

		 * TongFang GM5HG0A in case of the SKIKK Vanaheim relabel the