From patchwork Thu Apr 7 00:06:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8767621 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 9C222C0553 for ; Thu, 7 Apr 2016 00:09:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3998820204 for ; Thu, 7 Apr 2016 00:09:18 +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 712B0201E4 for ; Thu, 7 Apr 2016 00:09:17 +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 1anxTa-0002n2-VT; Thu, 07 Apr 2016 00:07:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1anxTZ-0002ka-6Z for xen-devel@lists.xensource.com; Thu, 07 Apr 2016 00:07:09 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id DC/3D-03172-CA4A5075; Thu, 07 Apr 2016 00:07:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsVybKJsh+7qJaz hBg/fGlncm/Ke3YHRY3vfLvYAxijWzLyk/IoE1owfE44xFnRxVLS2zWVpYHzF1sXIxSEkMJVR YuPUw0wQzgwmidb1E1i6GDk42AR0JW7eluhi5OQQEUiQuPv0GzNIDbPANyaJ3aefMYMkhAXsJ M68mMkIYrMIqEocu9XKBmLzCjhKdGxrAquREJCTaPmxmxXE5gSKLz81FcwWEnCQaFy6hBGiJk NiXs8cVgjbS2LRjUtQtprE1XObmCcw8i1gZFjFqF6cWlSWWqRrqJdUlJmeUZKbmJmja2hgrJe bWlycmJ6ak5hUrJecn7uJERgmDECwg3H5R6dDjJIcTEqivK6VrOFCfEn5KZUZicUZ8UWlOanF hxhlODiUJHiPLQbKCRalpqdWpGXmAAMWJi3BwaMkwrsCJM1bXJCYW5yZDpE6xagoJc4rBAxzI QGQREZpHlwbLEouMcpKCfMyAh0ixFOQWpSbWYIq/4pRnINRSZj3Hsh4nsy8Erjpr4AWMwEtrh dmAllckoiQkmpgXNt2xuHjNr1L/hM6nz5/4ifo1FrL5tuu2ztn1xXL63WTSlh3rTo/Y4aH1wL t5a3vnqUcOfvtUw/HEb+VK7S4Fvckmk+Zv7nLucH4oOKSu1qfi9f6xLp8jm7aeKO1f9cfEw2J hvWv317eM3mxrlXElDmBsk5vp3vdMrgzR+7O+a59eWXTo2Z171RiKc5INNRiLipOBADRq7eUj QIAAA== X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-10.tower-31.messagelabs.com!1459987626!32750774!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 1903 invoked from network); 7 Apr 2016 00:07:07 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-10.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Apr 2016 00:07:07 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D57B2026D; Thu, 7 Apr 2016 00:07:05 +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 4382220274; Thu, 7 Apr 2016 00:07:04 +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, 6 Apr 2016 17:06:29 -0700 Message-Id: <1459987594-5434-10-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1459987594-5434-1-git-send-email-mcgrof@kernel.org> References: <1459987594-5434-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: xen-devel@lists.xensource.com, matt@codeblueprint.co.uk, andrew.cooper3@citrix.com, x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, jlee@suse.com, "Luis R. Rodriguez" , lguest@lists.ozlabs.org, glin@suse.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.com Subject: [Xen-devel] [PATCH v4 09/14] 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. 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);