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

Merge branches 'acpi-x86', 'acpi-processor' and 'acpi-resource' 

Merge an x86-specific ACPI fix, an ACPI processor driver fix, and a new
ACPI resources management quirk for 6.15-rc1:

 - Extend the Lenovo Yoga Tab 3 ACPI quirk to skip GPIO event-handlers
   along with ACPI AC and battery which makes it work with Linux when
   started in the Windows mode (Hans de Goede).

 - Prevent the ACPI processor idle driver from being used on systems
   without _CST and with invalid C2/C3 in FADT in order to restore its
   previous (and expected) behavior that has been altered inadvertently
   by a recent code change (Giovanni Gherdovich).

 - Skip ACPI IRQ override on ASUS Vivobook 14 X1404VAP to make the
   internal keyboard work on it (Paul Menzel).

* acpi-x86:
  ACPI: x86: Extend Lenovo Yoga Tab 3 quirk with skip GPIO event-handlers

* acpi-processor:
  ACPI: processor: idle: Return an error if both P_LVL{2,3} idle states are invalid

* acpi-resource:
  ACPI: resource: Skip IRQ override on ASUS Vivobook 14 X1404VAP
parents f06777cf 2fa87c71 9e9b8934 2da31ea2

drivers/acpi/processor_idle.c

+4 −0
Original line number Diff line number Diff line
@@ -268,6 +268,10 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr) 
			 ACPI_CX_DESC_LEN, "ACPI P_LVL3 IOPORT 0x%x",

			 pr->power.states[ACPI_STATE_C3].address);



	if (!pr->power.states[ACPI_STATE_C2].address &&

	    !pr->power.states[ACPI_STATE_C3].address)

		return -ENODEV;



	return 0;

}

drivers/acpi/resource.c

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

		},

	},

	{

		/* Asus Vivobook X1404VAP */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_BOARD_NAME, "X1404VAP"),

		},

	},

	{

		/* Asus Vivobook X1504VAP */

		.matches = {

drivers/acpi/x86/utils.c

+2 −1
Original line number Diff line number Diff line
@@ -374,7 +374,8 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = { 
			DMI_MATCH(DMI_PRODUCT_VERSION, "Blade3-10A-001"),

		},

		.driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |

					ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY),

					ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY |

					ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS),

	},

	{

		/* Medion Lifetab S10346 */