From patchwork Tue Aug 24 21:13:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 1520442 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=XF4T+hNa; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GvMKq0PzPz9sWd; Wed, 25 Aug 2021 07:13:51 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mIdju-000120-SK; Tue, 24 Aug 2021 21:13:46 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mIdjl-00011I-Dz for kernel-team@lists.ubuntu.com; Tue, 24 Aug 2021 21:13:37 +0000 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id BD4823F31C for ; Tue, 24 Aug 2021 21:13:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1629839616; bh=GiwjXIzEi4O2+NFHzfgEUHemT1GooORPsi75JZnf4S8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XF4T+hNaRXx8UeMez7xKXX/lrj72bmzh+BJloow5rwXWalb28x2V0C/uvsL98y8fw 0f+smExR/bQppZnLB1gPMqpUKqhQZ1XHB32CBN8PB9sgStOuKAeBf6pgNbn/0sRxEj p7GgGBnip4uNgO3nYsUNAHEiFtpC8MdqtobjUBORutv1P+tYp54rJKsSYr1qZoWePZ P9HEc0tj+yajaHNYx/YNyoo6azBdbQ3pTFnbFd8XP+YnuRwlG3EZ7eRp2KVCP9nX8Z R3otMVKvAMwRgxDyLKdD+jhINccb19FesMNA3o/ya7HyPnnZjPCk2aYRaA8l19Xxy5 f9bs6y52qW2nw== Received: by mail-pg1-f200.google.com with SMTP id u5-20020a63d3450000b029023a5f6e6f9bso12844111pgi.21 for ; Tue, 24 Aug 2021 14:13:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GiwjXIzEi4O2+NFHzfgEUHemT1GooORPsi75JZnf4S8=; b=FzexbRJEnO+vnf3PWY7mzRHQaaQMe8jgr+RtMBKKEwXWVsxhi4NTvTbQo7u0qx5/F/ 5vEITT+Acu3mtNJTLdCYMsmxYQoxIUxRs/UKR79WSbQFbxXlBVQBShSCnhiT5XPZbZcX LPtdl+tkP6+odc9xVyTHh88mS+nEsDIMo5B6cXsJ9QkcBMLVeuGUCgTVM0J5esMvmhic PaRtfLJPZzf9tAj53ikKE99ejp9KRmRKawPLqAc75/3Ljvh2ELzAQcJHJrZwd1bbhZdK 2jfDrhqo93pkFeFWQD9P+WoxQVzt/jzPeRFIkjtjTkn92fzI7n4GrBofevLC3rSyRM9U cdwA== X-Gm-Message-State: AOAM533miE6dkYWR6W7GlYI7wIj9CKwUYnmlbZz4w+LYB5AGT0bObCNt 0+VZ+Pp4dFYUa65KDBYCOWoaH67FNTgo6SV3Vnk10UDp6gSdHQQFaMTPWTXA+A9PtgRFaW5i6Pg s1H0Xx5NU3tWByqbAZLE9j5qKiQXqkRBj1ASR9sBAmg== X-Received: by 2002:a63:cf0c:: with SMTP id j12mr38629156pgg.411.1629839615179; Tue, 24 Aug 2021 14:13:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7nk2Ibs5gvJ5fQE4LxOohYxLW8y0Zlc30D+ymXlv6MecqShPr+2PAYacZ9aYiI5M9iwvs/g== X-Received: by 2002:a63:cf0c:: with SMTP id j12mr38629144pgg.411.1629839614879; Tue, 24 Aug 2021 14:13:34 -0700 (PDT) Received: from canonical.com (node-1w7jr9yebujeq5th4a1ypmfqh.ipv6.telus.net. [2001:56a:78ed:fb00::a29]) by smtp.gmail.com with ESMTPSA id z8sm19970767pfa.113.2021.08.24.14.13.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 14:13:34 -0700 (PDT) From: Alex Hung To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][OEM-5.13] ACPI: PM: Add support for upcoming AMD uPEP HID AMDI007 Date: Tue, 24 Aug 2021 15:13:32 -0600 Message-Id: <20210824211332.615748-2-alex.hung@canonical.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210824211332.615748-1-alex.hung@canonical.com> References: <20210824211332.615748-1-alex.hung@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Mario Limonciello BugLink: https://bugs.launchpad.net/bugs/1941010 AMD systems with uPEP HID AMDI007 should be using revision 2 and the AMD method. Fixes: 8fbd6c15ea0a ("ACPI: PM: Adjust behavior for field problems on AMD systems") Signed-off-by: Mario Limonciello Signed-off-by: Rafael J. Wysocki (cherry picked from commit f0c6225531e4a9e43e51c5f7b02089bdd725c734) Signed-off-by: Alex Hung --- drivers/acpi/x86/s2idle.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index 1c507804fb10..fbdbef0ab552 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -378,19 +378,25 @@ static int lps0_device_attach(struct acpi_device *adev, * AMDI0006: * - should use rev_id 0x0 * - function mask = 0x3: Should use Microsoft method + * AMDI0007: + * - Should use rev_id 0x2 + * - Should only use AMD method */ const char *hid = acpi_device_hid(adev); - rev_id = 0; + rev_id = strcmp(hid, "AMDI0007") ? 0 : 2; lps0_dsm_func_mask = validate_dsm(adev->handle, ACPI_LPS0_DSM_UUID_AMD, rev_id, &lps0_dsm_guid); lps0_dsm_func_mask_microsoft = validate_dsm(adev->handle, - ACPI_LPS0_DSM_UUID_MICROSOFT, rev_id, + ACPI_LPS0_DSM_UUID_MICROSOFT, 0, &lps0_dsm_guid_microsoft); if (lps0_dsm_func_mask > 0x3 && (!strcmp(hid, "AMD0004") || !strcmp(hid, "AMDI0005"))) { lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1; acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n", ACPI_LPS0_DSM_UUID_AMD, lps0_dsm_func_mask); + } else if (lps0_dsm_func_mask_microsoft > 0 && !strcmp(hid, "AMDI0007")) { + lps0_dsm_func_mask_microsoft = -EINVAL; + acpi_handle_debug(adev->handle, "_DSM Using AMD method\n"); } } else { rev_id = 1;