Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753082AbcDVJxo (ORCPT ); Fri, 22 Apr 2016 05:53:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37340 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752851AbcDVJxk (ORCPT ); Fri, 22 Apr 2016 05:53:40 -0400 Date: Fri, 22 Apr 2016 02:52:14 -0700 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: bp@alien8.de, torvalds@linux-foundation.org, luto@amacapital.net, peterz@infradead.org, mcgrof@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, dvlasenk@redhat.com, mingo@kernel.org, brgerst@gmail.com Reply-To: mingo@kernel.org, dvlasenk@redhat.com, brgerst@gmail.com, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mcgrof@kernel.org, torvalds@linux-foundation.org, bp@alien8.de, peterz@infradead.org, luto@amacapital.net In-Reply-To: <1460592286-300-10-git-send-email-mcgrof@kernel.org> References: <1460592286-300-10-git-send-email-mcgrof@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/tboot: Remove paravirt_enabled() use Git-Commit-ID: 44ecf0ef907fe45510566d308d670aa5823a4dd5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2875 Lines: 82 Commit-ID: 44ecf0ef907fe45510566d308d670aa5823a4dd5 Gitweb: http://git.kernel.org/tip/44ecf0ef907fe45510566d308d670aa5823a4dd5 Author: Luis R. Rodriguez AuthorDate: Wed, 13 Apr 2016 17:04:39 -0700 Committer: Ingo Molnar CommitDate: Fri, 22 Apr 2016 10:29:04 +0200 x86/tboot: Remove paravirt_enabled() use 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 Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: andrew.cooper3@citrix.com Cc: andriy.shevchenko@linux.intel.com Cc: bigeasy@linutronix.de Cc: boris.ostrovsky@oracle.com Cc: david.vrabel@citrix.com Cc: ffainelli@freebox.fr Cc: george.dunlap@citrix.com Cc: glin@suse.com Cc: jgross@suse.com Cc: jlee@suse.com Cc: josh@joshtriplett.org Cc: julien.grall@linaro.org Cc: konrad.wilk@oracle.com Cc: kozerkov@parallels.com Cc: lenb@kernel.org Cc: lguest@lists.ozlabs.org Cc: linux-acpi@vger.kernel.org Cc: lv.zheng@intel.com Cc: matt@codeblueprint.co.uk Cc: mbizon@freebox.fr Cc: rjw@rjwysocki.net Cc: robert.moore@intel.com Cc: rusty@rustcorp.com.au Cc: tiwai@suse.de Cc: toshi.kani@hp.com Cc: xen-devel@lists.xensource.com Link: http://lkml.kernel.org/r/1460592286-300-10-git-send-email-mcgrof@kernel.org Signed-off-by: Ingo Molnar --- 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 e72a07f..9b0185f 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);