From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Luis R. Rodriguez" Subject: [PATCH v5 08/14] apm32: remove paravirt_enabled() use Date: Fri, 8 Apr 2016 16:40:19 -0700 Message-ID: <1460158825-13117-9-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 VGhlcmUgaXMgYWxyZWFkeSBhIGNoZWNrIGZvciBhcG1faW5mby5iaW9zID09IDAsIHRoZQphcG1f aW5mby5iaW9zIGlzIHNldCBmcm9tIHRoZSBib290X3BhcmFtcy5hcG1fYmlvc19pbmZvLgpCb3Ro IFhlbiBhbmQgbGd1ZXN0LCB3aGljaCBhcmUgYWxzbyB0aGUgb25seSBvbmVzIHRoYXQgc2V0CnBh cmF2aXJ0X2VuYWJsZWQgdG8gdHJ1ZSwgbmV2ZXIgc2V0IHRoZSBhcG1fYmlvcy5pbmZvLiBUaGUK ClhlbiBmb2xrcyBhcmUgc3VyZSBmb3JjZSBkaXNhYmxlIHRvIDAgaXMgbm90IG5lZWRlZCBiZWNh dXNlCmFwbV9pbmZvIGxpdmVzIGluIC5ic3MsIHdlIHJlY2VudGx5IGZvcmNlZCBkaXNhYmxlZCB0 aGlzIG9uCmxndWVzdCwgYW5kIG9uIHRoZSBYZW4gc2lkZSBqdXN0IHRvIGJlIHN1cmUgQm9yaXMg emVyb2VkIG91dAp0aGUgLmJzcyBmb3IgUFYgZ3Vlc3RzIHRocm91Z2ggY29tbWl0IDA0YjZiNGE1 Njg4NDMyN2MxNjQ4CigieGVuL3g4NjogWmVybyBvdXQgLmJzcyBmb3IgUFYgZ3Vlc3RzIikuIFdp dGggdGhpcyBjYXJlIHRha2VuCmludG8gY29uc2lkZXJhdGlvbiB0aGUgcGFyYXZpcnRfZW5hYmxl ZCgpIGNoZWNrIGlzIHNpbXBseSBub3QKbmVlZGVkIGFueW1vcmUuCgpTaWduZWQtb2ZmLWJ5OiBM dWlzIFIuIFJvZHJpZ3VleiA8bWNncm9mQGtlcm5lbC5vcmc+Ci0tLQogYXJjaC94ODYva2VybmVs L2FwbV8zMi5jIHwgMiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0 aW9uKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVsL2FwbV8zMi5jIGIvYXJjaC94ODYv a2VybmVsL2FwbV8zMi5jCmluZGV4IDkzMDdmMTgyZmUzMC4uYzczNjRiZDYzM2UxIDEwMDY0NAot LS0gYS9hcmNoL3g4Ni9rZXJuZWwvYXBtXzMyLmMKKysrIGIvYXJjaC94ODYva2VybmVsL2FwbV8z Mi5jCkBAIC0yMjY3LDcgKzIyNjcsNyBAQCBzdGF0aWMgaW50IF9faW5pdCBhcG1faW5pdCh2b2lk KQogCiAJZG1pX2NoZWNrX3N5c3RlbShhcG1fZG1pX3RhYmxlKTsKIAotCWlmIChhcG1faW5mby5i aW9zLnZlcnNpb24gPT0gMCB8fCBwYXJhdmlydF9lbmFibGVkKCkgfHwgbWFjaGluZV9pc19vbHBj KCkpIHsKKwlpZiAoYXBtX2luZm8uYmlvcy52ZXJzaW9uID09IDAgfHwgbWFjaGluZV9pc19vbHBj KCkpIHsKIAkJcHJpbnRrKEtFUk5fSU5GTyAiYXBtOiBCSU9TIG5vdCBmb3VuZC5cbiIpOwogCQly ZXR1cm4gLUVOT0RFVjsKIAl9Ci0tIAoyLjcuMgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932979AbcDHXlH (ORCPT ); Fri, 8 Apr 2016 19:41:07 -0400 Received: from mail.kernel.org ([198.145.29.136]:39942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932534AbcDHXk6 (ORCPT ); Fri, 8 Apr 2016 19:40:58 -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 08/14] apm32: remove paravirt_enabled() use Date: Fri, 8 Apr 2016 16:40:19 -0700 Message-Id: <1460158825-13117-9-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 apm_info.bios == 0, the apm_info.bios is set from the boot_params.apm_bios_info. Both Xen and lguest, which are also the only ones that set paravirt_enabled to true, never set the apm_bios.info. The 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/apm_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 9307f182fe30..c7364bd633e1 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -2267,7 +2267,7 @@ static int __init apm_init(void) dmi_check_system(apm_dmi_table); - if (apm_info.bios.version == 0 || paravirt_enabled() || machine_is_olpc()) { + if (apm_info.bios.version == 0 || machine_is_olpc()) { printk(KERN_INFO "apm: BIOS not found.\n"); return -ENODEV; } -- 2.7.2