From patchwork Mon Nov 7 13:07:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 9415127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9011A6022E for ; Mon, 7 Nov 2016 13:11:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8196328B6C for ; Mon, 7 Nov 2016 13:11:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75E2428BBE; Mon, 7 Nov 2016 13:11:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_TVD_MIME_EPI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 349A328B6C for ; Mon, 7 Nov 2016 13:11:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932516AbcKGNKv (ORCPT ); Mon, 7 Nov 2016 08:10:51 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:51670 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932360AbcKGNKs (ORCPT ); Mon, 7 Nov 2016 08:10:48 -0500 Received: from localhost ([127.0.0.1]) by Galois.linutronix.de with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1c3jer-0006PH-TO; Mon, 07 Nov 2016 14:08:18 +0100 Date: Mon, 7 Nov 2016 14:07:43 +0100 (CET) From: Thomas Gleixner To: =?ISO-8859-15?Q?Ville_Syrj=E4l=E4?= cc: Feng Tang , feng.tang@intel.com, "Rafael J. Wysocki" , "Rafael J. Wysocki" , Steven Rostedt , Sebastian Andrzej Siewior , linux-arch@vger.kernel.org, Rik van Riel , "Srivatsa S. Bhat" , Peter Zijlstra , Arjan van de Ven , Rusty Russell , Oleg Nesterov , Tejun Heo , Andrew Morton , Paul McKenney , Linus Torvalds , Paul Turner , Linux Kernel Mailing List , "Zhang, Rui" , Len Brown , Linux PM , Linux ACPI Subject: Re: S3 resume regression [1cf4f629d9d2 ("cpu/hotplug: Move online calls to hotplugged cpu")] In-Reply-To: <20161107114937.GX4617@intel.com> Message-ID: References: <20160809172057.GZ4329@intel.com> <20161027172852.GE4617@intel.com> <20161027192006.GF4617@intel.com> <20161027203745.GH4617@intel.com> <20161028155603.GI4617@intel.com> <20161101204737.GB4617@intel.com> <20161107114937.GX4617@intel.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Mon, 7 Nov 2016, Ville Syrjälä wrote: > I didn't manage to find a lot of time to play around with this, but it > definitely looks like the SMM trap is the problem here. I repeated my > pm_trace experiemnts and when it gets stuck it is trying to execute the > _WAK ACPI method which is where the SMM trap happens. > > Maybe the SMM code was written with the expectation of a periodic tick > or something like that? Can you try the untested hack below, please? It should confirm that. Thanks, tglx 8<--------------- --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c @@ -269,6 +269,17 @@ acpi_status acpi_hw_legacy_wake_prep(u8 return_ACPI_STATUS(status); } +static const ktime_t time10ms = { .tv64 = 10 * NSEC_PER_MSEC }; + +static enum hrtimer_restart acpi_hw_legacy_tmr(struct hrtimer *tmr) +{ + hrtimer_forward_now(tmr, time10ms); + + return HRTIMER_RESTART; +} + + + /******************************************************************************* * * FUNCTION: acpi_hw_legacy_wake @@ -284,6 +295,7 @@ acpi_status acpi_hw_legacy_wake_prep(u8 acpi_status acpi_hw_legacy_wake(u8 sleep_state) { + struct hrtimer timer; acpi_status status; ACPI_FUNCTION_TRACE(hw_legacy_wake); @@ -311,12 +323,18 @@ acpi_status acpi_hw_legacy_wake(u8 sleep return_ACPI_STATUS(status); } + hrtimer_init_on_stack(&timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + timer.function = acpi_hw_legacy_tmr; + hrtimer_start(&timer, time10ms, HRTIMER_MODE_REL); + /* * Now we can execute _WAK, etc. Some machines require that the GPEs * are enabled before the wake methods are executed. */ acpi_hw_execute_sleep_method(METHOD_PATHNAME__WAK, sleep_state); + hrtimer_cancel(&timer); + /* * Some BIOS code assumes that WAK_STS will be cleared on resume * and use it to determine whether the system is rebooting or