Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3037084imu; Mon, 19 Nov 2018 09:40:58 -0800 (PST) X-Google-Smtp-Source: AJdET5d6XZqgK4FE+7hyktQd0uDus4RRU3ZG9dgdlgvPGJBRzAtOsUNpEz+w/odXArKEz/NzUqYV X-Received: by 2002:a63:160d:: with SMTP id w13mr21319676pgl.43.1542649258061; Mon, 19 Nov 2018 09:40:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542649258; cv=none; d=google.com; s=arc-20160816; b=XYd/PoU0mfCZm9OYcNXniqrvqge6y+9QrfBjsUk4i8Vh93sjL0r0BbKwECJPKLn5JJ UsEfAqSdHhwQxO7f3GwAIYa3DvpccLYYJaggwcCO+AwY2PTObPfhLaOB2n9+e5GA+2Rk 7uXZJCyUVIs+u7xbI9fRqfP4uB8TRYN93bJ0TBcIiKutnzpR4+c+2T/yaWDuY+Fc1+Ga 2G0Sw220giFNADbRQD91BQQOQ69wYhxGadcoYxqMi9VRZJEduEYBXJ6X+SkeznsTJRLT EzzoIC2fW0UtFOpHofPK5HXRL531Je7Dv7ohdt8yYt3xfvCBHjo1KC1Z6G59QHyxabX+ x+OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3fbVqDZh+iJPKU1APBqh7u8PaTzbDszJeL45DWDfASw=; b=g6Smmue3EQzPcI8yfcMMXWHLrMqcpjs8H2aq2PICvC2KWReqng4fvP9/C8pZlk0ned 2Pd2y3o56c0lhfdeFgVyEdPR/fQswlee6yrHBxoUV0Es7qZMXqQqnkl5gZX1K8H5VG2N toT1AiE+LtVqW26WkIWGzvTi00AuNAGtsDv2GeHnLYGkHFGnb5FwgkZi/8a5NG2tIX7F IKTAglrGK2jeKJNuhIIBn3gdUbiK5Lju2lBYxdSawzqd/OaERhrEdvBucoDJzkVEK5vH 4Np+7fHBe7uIGbLFnXUF0KVdiqK67TeUBl0QC4Nq/I+JDmri3yVbSOqd/Bi6kYmJQrIn Y+9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="QG/9d6Kf"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c26si27723634pgm.210.2018.11.19.09.40.41; Mon, 19 Nov 2018 09:40:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="QG/9d6Kf"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389796AbeKTDNt (ORCPT + 99 others); Mon, 19 Nov 2018 22:13:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:50752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389790AbeKTDNs (ORCPT ); Mon, 19 Nov 2018 22:13:48 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 18A9E20C01; Mon, 19 Nov 2018 16:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542646175; bh=uKY2+/86QuSCqzV+4FXgUeDBMoeO3JoU3rm6NyYgFMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QG/9d6Kft5JcoB84Zgxg7Ru+Qb7V/LS0EMMJjXXtJqVD6thpdb8TeTU0DBhzuEI4n k6p5gC+WTI8RtBuBzHZ/7rG9Lzpz8bzcJ4ipMVDT0fLiNRNfWPLqq0gv5UJYcWPZ49 zI2SV9I5B1JpjTCEUG61DJHxgj9zNPyMdIPJcIbE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Kelley , Thomas Gleixner , "devel@linuxdriverproject.org" , "daniel.lezcano@linaro.org" , "virtualization@lists.linux-foundation.org" , "jgross@suse.com" , "akataria@vmware.com" , "olaf@aepfle.de" , "apw@canonical.com" , vkuznets , "jasowang@redhat.com" , "marcelo.cerri@canonical.com" , KY Srinivasan Subject: [PATCH 4.14 064/124] x86/hyper-v: Enable PIT shutdown quirk Date: Mon, 19 Nov 2018 17:28:38 +0100 Message-Id: <20181119162625.804467418@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119162612.951907286@linuxfoundation.org> References: <20181119162612.951907286@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael Kelley commit 1de72c706488b7be664a601cf3843bd01e327e58 upstream. Hyper-V emulation of the PIT has a quirk such that the normal PIT shutdown path doesn't work, because clearing the counter register restarts the timer. Disable the counter clearing on PIT shutdown. Signed-off-by: Michael Kelley Signed-off-by: Thomas Gleixner Cc: "gregkh@linuxfoundation.org" Cc: "devel@linuxdriverproject.org" Cc: "daniel.lezcano@linaro.org" Cc: "virtualization@lists.linux-foundation.org" Cc: "jgross@suse.com" Cc: "akataria@vmware.com" Cc: "olaf@aepfle.de" Cc: "apw@canonical.com" Cc: vkuznets Cc: "jasowang@redhat.com" Cc: "marcelo.cerri@canonical.com" Cc: KY Srinivasan Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/1541303219-11142-3-git-send-email-mikelley@microsoft.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/mshyperv.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -243,6 +244,16 @@ static void __init ms_hyperv_init_platfo if (efi_enabled(EFI_BOOT)) x86_platform.get_nmi_reason = hv_get_nmi_reason; + /* + * Hyper-V VMs have a PIT emulation quirk such that zeroing the + * counter register during PIT shutdown restarts the PIT. So it + * continues to interrupt @18.2 HZ. Setting i8253_clear_counter + * to false tells pit_shutdown() not to zero the counter so that + * the PIT really is shutdown. Generation 2 VMs don't have a PIT, + * and setting this value has no effect. + */ + i8253_clear_counter_on_shutdown = false; + #if IS_ENABLED(CONFIG_HYPERV) /* * Setup the hook to get control post apic initialization.