From patchwork Sat Jan 16 00:44:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 1427430 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; dmarc=fail (p=none dis=none) header.from=canonical.com 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 4DHfTQ3TfSz9sWT; Sat, 16 Jan 2021 11:44:56 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1l0Zi1-0003Us-2X; Sat, 16 Jan 2021 00:44:53 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l0Zhz-0003Ud-E3 for kernel-team@lists.ubuntu.com; Sat, 16 Jan 2021 00:44:51 +0000 Received: from 1.general.alexhung.us.vpn ([10.172.65.254] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l0Zhy-00041K-P7 for kernel-team@lists.ubuntu.com; Sat, 16 Jan 2021 00:44:51 +0000 From: Alex Hung To: kernel-team@lists.ubuntu.com Subject: [SRU][OEM-5.10][PATCH 1/1] UBUNTU: SAUCE: ACPI: avoid auto-wakeup with an _OSI string Date: Fri, 15 Jan 2021 17:44:45 -0700 Message-Id: <20210116004445.626941-2-alex.hung@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210116004445.626941-1-alex.hung@canonical.com> References: <20210116004445.626941-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" Some TGL systems wake up automatically from s2idle when connecting to a docking station with a monitor. The wake-up events are generated when BIOS sets ALL_MONITOR_OFF for power-saving on TGL systems. A BIOS workaround is used to skip ALL_MONITOR_OFF with an _OSI string "Linux-Dell-USB4-Wakeup". BugLink: http://bugs.launchpad.net/bugs/1902577 Signed-off-by: Alex Hung --- drivers/acpi/osi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/acpi/osi.c b/drivers/acpi/osi.c index 6fce7fb54f6d..69f8820cd0a7 100644 --- a/drivers/acpi/osi.c +++ b/drivers/acpi/osi.c @@ -68,6 +68,12 @@ osi_setup_entries[OSI_STRING_ENTRIES_MAX] __initdata = { * hybrid graphics supports. */ {"Linux-HPI-Hybrid-Graphics", true}, + /* + * Linux-Dell-USB4-Wakeup is used by BIOS to workaround auto wakeup + * on Tigerlake. This is done by skipping ALL_MONITOR_OFF when systems + * are going to s2idle. + */ + {"Linux-Dell-USB4-Wakeup", true}, }; static u32 acpi_osi_handler(acpi_string interface, u32 supported)