Skip to content

Commit 95abc81

Browse files
committed
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
2 parents 4b992ea + a3babdb commit 95abc81

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

drivers/acpi/resource.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,13 @@ static const struct dmi_system_id asus_laptop[] = {
439439
DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
440440
},
441441
},
442+
{
443+
.ident = "Asus ExpertBook B1502CBA",
444+
.matches = {
445+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
446+
DMI_MATCH(DMI_BOARD_NAME, "B1502CBA"),
447+
},
448+
},
442449
{
443450
.ident = "Asus ExpertBook B2402CBA",
444451
.matches = {

drivers/acpi/x86/utils.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ bool acpi_device_override_status(struct acpi_device *adev, unsigned long long *s
213213
disk in the system.
214214
*/
215215
static const struct x86_cpu_id storage_d3_cpu_ids[] = {
216+
X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 24, NULL), /* Picasso */
216217
X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 96, NULL), /* Renoir */
217218
X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 104, NULL), /* Lucienne */
218219
X86_MATCH_VENDOR_FAM_MODEL(AMD, 25, 80, NULL), /* Cezanne */

0 commit comments

Comments
 (0)