From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Luis R. Rodriguez" Subject: [PATCH v5 09/14] x86/tboot: remove paravirt_enabled() Date: Fri, 8 Apr 2016 16:40:20 -0700 Message-ID: <1460158825-13117-10-git-send-email-mcgrof@kernel.org> References: <1460158825-13117-1-git-send-email-mcgrof@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1460158825-13117-1-git-send-email-mcgrof@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Cc: kozerkov@parallels.com, matt@codeblueprint.co.uk, lv.zheng@intel.com, xen-devel@lists.xensource.com, joro@8bytes.org, x86@kernel.org, robert.moore@intel.com, linux-acpi@vger.kernel.org, glin@suse.com, lenb@kernel.org, josh@joshtriplett.org, jlee@suse.com, lguest@lists.ozlabs.org, boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.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 List-Id: linux-acpi@vger.kernel.org VGhlcmUgaXMgYWxyZWFkeSBhIGNoZWNrIGZvciBib290X3BhcmFtcy50Ym9vdF9hZGRyIHByaW9y CnRvIHBhcmF2aXJ0X2VuYWJsZWQoKS4gQm90aCBYZW4gYW5kIGxndWVzdCwgd2hpY2ggYXJlIGFs c28gdGhlCm9ubHkgb25lcyB0aGF0IHNldCBwYXJhdmlydF9lbmFibGVkIHRvIHRydWUsIG5ldmVy IHNldCB0aGUKYm9vdF9wYXJhbXMudGJvb3RfYWRkci4gVGhlIFhlbiBmb2xrcyBhcmUgc3VyZSBh IGZvcmNlIGRpc2FibGUKdG8gMCBpcyBub3QgbmVlZGVkLCB3ZSByZWNlbnRseSBmb3JjZWQgZGlz YWJsZWQgdGhpcyBvbiBsZ3Vlc3QuCldpdGggdGhpcyBpbiBwbGFjZSB0aGlzIGNoZWNrIGlzIG5v IGxvbmdlciBuZWVkZWQuCgpYZW4gZm9sa3MgYXJlIHN1cmUgZm9yY2UgZGlzYWJsZSB0byAwIGlz IG5vdCBuZWVkZWQgYmVjYXVzZQphcG1faW5mbyBsaXZlcyBpbiAuYnNzLCB3ZSByZWNlbnRseSBm b3JjZWQgZGlzYWJsZWQgdGhpcyBvbgpsZ3Vlc3QsIGFuZCBvbiB0aGUgWGVuIHNpZGUganVzdCB0 byBiZSBzdXJlIEJvcmlzIHplcm9lZCBvdXQKdGhlIC5ic3MgZm9yIFBWIGd1ZXN0cyB0aHJvdWdo IGNvbW1pdCAwNGI2YjRhNTY4ODQzMjdjMTY0OAooInhlbi94ODY6IFplcm8gb3V0IC5ic3MgZm9y IFBWIGd1ZXN0cyIpLiBXaXRoIHRoaXMgY2FyZSB0YWtlbgppbnRvIGNvbnNpZGVyYXRpb24gdGhl IHBhcmF2aXJ0X2VuYWJsZWQoKSBjaGVjayBpcyBzaW1wbHkgbm90Cm5lZWRlZCBhbnltb3JlLgoK U2lnbmVkLW9mZi1ieTogTHVpcyBSLiBSb2RyaWd1ZXogPG1jZ3JvZkBrZXJuZWwub3JnPgotLS0K IGFyY2gveDg2L2tlcm5lbC90Ym9vdC5jIHwgNiAtLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC90Ym9vdC5jIGIvYXJjaC94 ODYva2VybmVsL3Rib290LmMKaW5kZXggZTcyYTA3ZjIwYjA1Li45YjAxODVmYmUzZWIgMTAwNjQ0 Ci0tLSBhL2FyY2gveDg2L2tlcm5lbC90Ym9vdC5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC90Ym9v dC5jCkBAIC03NCwxMiArNzQsNiBAQCB2b2lkIF9faW5pdCB0Ym9vdF9wcm9iZSh2b2lkKQogCQly ZXR1cm47CiAJfQogCi0JLyogb25seSBhIG5hdGl2ZWx5IGJvb3RlZCBrZXJuZWwgc2hvdWxkIGJl IHVzaW5nIFRYVCAqLwotCWlmIChwYXJhdmlydF9lbmFibGVkKCkpIHsKLQkJcHJfd2FybmluZygi bm9uLTAgdGJvb3RfYWRkciBidXQgcHZfb3BzIGlzIGVuYWJsZWRcbiIpOwotCQlyZXR1cm47Ci0J fQotCiAJLyogTWFwIGFuZCBjaGVjayBmb3IgdGJvb3QgVVVJRC4gKi8KIAlzZXRfZml4bWFwKEZJ WF9UQk9PVF9CQVNFLCBib290X3BhcmFtcy50Ym9vdF9hZGRyKTsKIAl0Ym9vdCA9IChzdHJ1Y3Qg dGJvb3QgKilmaXhfdG9fdmlydChGSVhfVEJPT1RfQkFTRSk7Ci0tIAoyLjcuMgoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5n IGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRl dmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932952AbcDHXlF (ORCPT ); Fri, 8 Apr 2016 19:41:05 -0400 Received: from mail.kernel.org ([198.145.29.136]:39974 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932894AbcDHXlA (ORCPT ); Fri, 8 Apr 2016 19:41:00 -0400 From: "Luis R. Rodriguez" To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Cc: x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, boris.ostrovsky@oracle.com, david.vrabel@citrix.com, konrad.wilk@oracle.com, xen-devel@lists.xensource.com, lguest@lists.ozlabs.org, andriy.shevchenko@linux.intel.com, jlee@suse.com, glin@suse.com, matt@codeblueprint.co.uk, andrew.cooper3@citrix.com, rjw@rjwysocki.net, lenb@kernel.org, robert.moore@intel.com, lv.zheng@intel.com, toshi.kani@hp.com, linux-acpi@vger.kernel.org, kozerkov@parallels.com, josh@joshtriplett.org, joro@8bytes.org, tiwai@suse.de, "Luis R. Rodriguez" Subject: [PATCH v5 09/14] x86/tboot: remove paravirt_enabled() Date: Fri, 8 Apr 2016 16:40:20 -0700 Message-Id: <1460158825-13117-10-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1460158825-13117-1-git-send-email-mcgrof@kernel.org> References: <1460158825-13117-1-git-send-email-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); -- 2.7.2