From patchwork Thu Apr 14 00:04:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8829981 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 64192C0554 for ; Thu, 14 Apr 2016 00:07:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A2E1201B9 for ; Thu, 14 Apr 2016 00:07:20 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 901CB20357 for ; Thu, 14 Apr 2016 00:07:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aqUmY-0007VO-VE; Thu, 14 Apr 2016 00:05:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aqUmX-0007Si-U4 for xen-devel@lists.xensource.com; Thu, 14 Apr 2016 00:05:14 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 6D/5A-19343-9BEDE075; Thu, 14 Apr 2016 00:05:13 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsVybKJsh+6Oe3z hBhsnGFvcm/Ke3YHRY3vfLvYAxijWzLyk/IoE1oy7LQsYCzq4K+6u7GNqYFzO2cXIxSEkMJVR 4siLFmYIZwaTxLId21m6GDk42AR0JW7eluhi5OQQEUiQuPv0G1gNs8AxVol5q+aygiSEBewk/ p/byAJiswioSrz/tJ4NxOYVcJCYsfEeWFxCQE6i5cdusHpOoPiCnSvAbCEBe4n+2wcYIWoyJO b1zGGFsL0kFt24BGWrSVw9t4l5AiPfAkaGVYzqxalFZalFuuZ6SUWZ6RkluYmZObqGBsZ6uan FxYnpqTmJScV6yfm5mxiBYcIABDsYG787HWKU5GBSEuU1WcUXLsSXlJ9SmZFYnBFfVJqTWnyI UYaDQ0mC9+9doJxgUWp6akVaZg4wYGHSEhw8SiK820HSvMUFibnFmekQqVOMilLivDNAEgIgi YzSPLg2WJRcYpSVEuZlBDpEiKcgtSg3swRV/hWjOAejkjAvJzDmhHgy80rgpr8CWswEtLjsHS /I4pJEhJRUA+NEDoNnni7ys5aFTmBRdEgvWXI+eivfgllJXccjO4Xqv/6aWtOs072/Ont796s lZwKefzGxrZSedvKSs9Ve9lrTTdsurCxa5lgrsczUx+Ln89c3uPhvcxsZvDpbo2Aqu75LYv6c LXssiotS/uVffn9hEue2ZSVqrkENCb7fd54JcG7xSvR8JaTEUpyRaKjFXFScCACj+SKzjQIAA A== X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-2.tower-31.messagelabs.com!1460592311!34671500!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18606 invoked from network); 14 Apr 2016 00:05:12 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-2.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Apr 2016 00:05:12 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 959C82037E; Thu, 14 Apr 2016 00:05:10 +0000 (UTC) Received: from garbanzo.do-not-panic.com (c-73-15-241-2.hsd1.ca.comcast.net [73.15.241.2]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D28CD20381; Thu, 14 Apr 2016 00:05:08 +0000 (UTC) From: "Luis R. Rodriguez" To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Date: Wed, 13 Apr 2016 17:04:39 -0700 Message-Id: <1460592286-300-10-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1460592286-300-1-git-send-email-mcgrof@kernel.org> References: <1460592286-300-1-git-send-email-mcgrof@kernel.org> X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cc: kozerkov@parallels.com, matt@codeblueprint.co.uk, bigeasy@linutronix.de, lv.zheng@intel.com, ffainelli@freebox.fr, mbizon@freebox.fr, xen-devel@lists.xensource.com, x86@kernel.org, robert.moore@intel.com, linux-acpi@vger.kernel.org, glin@suse.com, lenb@kernel.org, julien.grall@linaro.org, josh@joshtriplett.org, george.dunlap@citrix.com, jlee@suse.com, lguest@lists.ozlabs.org, boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.com, jgross@suse.com, toshi.kani@hp.com, andrew.cooper3@citrix.com, rjw@rjwysocki.net, linux-kernel@vger.kernel.org, luto@amacapital.net, "Luis R. Rodriguez" , david.vrabel@citrix.com, tiwai@suse.de Subject: [Xen-devel] [PATCH v6 09/16] x86/tboot: remove paravirt_enabled() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP There is already a check for boot_params.tboot_addr prior to paravirt_enabled(). Both Xen and lguest, which are also the only ones that set paravirt_enabled to true, never set the boot_params.tboot_addr. The Xen folks are sure a force disable to 0 is not needed, we recently forced disabled this on lguest. With this in place this check is no longer needed. Xen folks are sure force disable to 0 is not needed because apm_info lives in .bss, we recently forced disabled this on lguest, and on the Xen side just to be sure Boris zeroed out the .bss for PV guests through commit 04b6b4a56884327c1648 ("xen/x86: Zero out .bss for PV guests"). With this care taken into consideration the paravirt_enabled() check is simply not needed anymore. Signed-off-by: Luis R. Rodriguez --- arch/x86/kernel/tboot.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index e72a07f20b05..9b0185fbe3eb 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -74,12 +74,6 @@ void __init tboot_probe(void) return; } - /* only a natively booted kernel should be using TXT */ - if (paravirt_enabled()) { - pr_warning("non-0 tboot_addr but pv_ops is enabled\n"); - return; - } - /* Map and check for tboot UUID. */ set_fixmap(FIX_TBOOT_BASE, boot_params.tboot_addr); tboot = (struct tboot *)fix_to_virt(FIX_TBOOT_BASE);