Commit 95abc817 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These add two ACPI-related quirks:

   - Add a quirk to force StorageD3Enable on AMD Picasso systems (Mario
     Limonciello)

   - Add an ACPI IRQ override quirk for ASUS ExpertBook B1502CBA (Paul
     Menzel)"

* tag 'acpi-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CBA
  ACPI: x86: utils: Add Picasso to the list for forcing StorageD3Enable
parents 4b992ead a3babdb7

drivers/acpi/resource.c

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

		},

	},

	{

		.ident = "Asus ExpertBook B1502CBA",

		.matches = {

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

			DMI_MATCH(DMI_BOARD_NAME, "B1502CBA"),

		},

	},

	{

		.ident = "Asus ExpertBook B2402CBA",

		.matches = {

drivers/acpi/x86/utils.c

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ bool acpi_device_override_status(struct acpi_device *adev, unsigned long long *s 
      disk in the system.

 */

static const struct x86_cpu_id storage_d3_cpu_ids[] = {

	X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 24, NULL),  /* Picasso */

	X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 96, NULL),	/* Renoir */

	X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 104, NULL),	/* Lucienne */

	X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 80, NULL),	/* Cezanne */