From patchwork Mon Jan 27 21:29:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Igor Druzhinin X-Patchwork-Id: 11353277 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F22411580 for ; Mon, 27 Jan 2020 21:30:44 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C410F2465B for ; Mon, 27 Jan 2020 21:30:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="PX/Yidbx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C410F2465B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iwBwg-0008Po-LB; Mon, 27 Jan 2020 21:29:22 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iwBwf-0008Pj-Cd for xen-devel@lists.xenproject.org; Mon, 27 Jan 2020 21:29:21 +0000 X-Inumbo-ID: 13fdf1b0-414c-11ea-b45d-bc764e2007e4 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 13fdf1b0-414c-11ea-b45d-bc764e2007e4; Mon, 27 Jan 2020 21:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1580160560; h=from:to:cc:subject:date:message-id:mime-version; bh=K1A6RhuPaJ7idyjzd4rmn+1KtpWizlKboTNl7NmvBX4=; b=PX/YidbxKItxTdjX6OEJY6khb1gjDj1B6BCQgYdGmn4XZOpZrKE/at1x eMHtcveMjAlFN+ZZqVDezNnNNxtKwMWbe5xn513vJlDqEG4m4/3r90+XG DF6Vz/9aaYS5IeeHa7ZcLtKGtPzcim+Hh7LNrpQlFfqFNFnrNX7mRT7af c=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=igor.druzhinin@citrix.com; spf=Pass smtp.mailfrom=igor.druzhinin@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of igor.druzhinin@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="igor.druzhinin@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of igor.druzhinin@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="igor.druzhinin@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="igor.druzhinin@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 6Y6IAp+aR0ejqMsdWFm12UspUgsmf53UC20fCtnVuyYv9gOihFk7DBcPXxi+SRka4+OmUQXviM EuSb1Q8fdEfAZv7Vt3gy/OhNq+XTQExCjoCgvrskE64wiIbmrLgd/wtyc1H1MODcg0RhHqrry9 Rw1KNb6XF7UI4Tn5xZJHTOGhzSpZc6tk7WOsaREKBFFd+MUwlup60DJq7R/4t9Xn7xS3XR2/Au r3oL83Ycf51oajCXnvtyWCgPcCyTvVdBuFiqA0b6QMBZ8yXqoormVXIO5LOkMkgyVGAS79NZv/ nSs= X-SBRS: 2.7 X-MesageID: 11534475 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,371,1574139600"; d="scan'208";a="11534475" From: Igor Druzhinin To: Date: Mon, 27 Jan 2020 21:29:16 +0000 Message-ID: <1580160556-25621-1-git-send-email-igor.druzhinin@citrix.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] x86/suspend: disable watchdog before calling console_start_sync() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: andrew.cooper3@citrix.com, Igor Druzhinin , wl@xen.org, roger.pau@citrix.com Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" ... and enable it after exiting S-state. Otherwise accumulated output in serial buffer might easily trigger the watchdog if it's still enabled after entering sync transmission mode. The issue observed on machines which, unfortunately, generate non-0 output in CPU offline callbacks. Signed-off-by: Igor Druzhinin Reviewed-by: Roger Pau Monné --- xen/arch/x86/acpi/power.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 8078352..62384a4 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -223,6 +224,7 @@ static int enter_state(u32 state) acpi_sleep_prepare(state); + watchdog_disable(); console_start_sync(); printk("Entering ACPI S%d state.\n", state); @@ -281,6 +283,7 @@ static int enter_state(u32 state) tboot_s3_error(error); console_end_sync(); + watchdog_enable(); microcode_update_one(true);