From patchwork Tue Apr 12 22:44:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8817041 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E82379F54F for ; Tue, 12 Apr 2016 22:47:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D28920166 for ; Tue, 12 Apr 2016 22:47:30 +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 312F020160 for ; Tue, 12 Apr 2016 22:47:29 +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 1aq73V-0005uP-Fk; Tue, 12 Apr 2016 22:45:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aq73U-0005uJ-BE for xen-devel@lists.xensource.com; Tue, 12 Apr 2016 22:45:08 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 3B/E5-03971-37A7D075; Tue, 12 Apr 2016 22:45:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsVybKJsh25xFW+ 4wertLBb3prxnd2D02N63iz2AMYo1My8pvyKBNWPb1MWMBd/4K240P2dsYDzB28XIySEkMJVR 4ndPVhcjF5A9g0nifc881i5GDg42AV2Jm7clQGpEBBIk7j79xgxSwyywgE1ide97JpCEsICPx IE/S1lBbBYBVYm2O1vBbF4BR4nz22awgdgSAnISLT92g8U5BYwkjr68yAyx2FDixKP3UDUZEv N65rBC2F4Si25cgrLVJK6e28Q8gZFvASPDKkb14tSistQiXWO9pKLM9IyS3MTMHF1DQxO93NT i4sT01JzEpGK95PzcTYzAIGEAgh2Md/ucDzFKcjApifLmZfKGC/El5adUZiQWZ8QXleakFh9i lOHgUJLg9awEygkWpaanVqRl5gDDFSYtwcGjJMLrBpLmLS5IzC3OTIdInWJUlBLnDQJJCIAkM krz4NpgMXKJUVZKmJcR6BAhnoLUotzMElT5V4ziHIxKwryNIFN4MvNK4Ka/AlrMBLT42T9OkM UliQgpqQbGU1IWkQGx/EtN9x2eVh6Srsq6Z+5sl22nj33c1BWgbuqkcLCufXL0/5lslmfzcg5 80TETWc7DnnH+1Outgpnpm/bFdHkEdrufl+a2r1zQXWIrLjXbL5ahtpelf1ZmZ/4rYQmeP/8C rJdFKdT9TOh3ZVbgZfE0E5sS4Bh308Lhe2FYyc5DS5VYijMSDbWYi4oTAf3KvL2MAgAA X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1460501105!23010427!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 20200 invoked from network); 12 Apr 2016 22:45:06 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-14.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 12 Apr 2016 22:45:06 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 118DE20166; Tue, 12 Apr 2016 22:45:04 +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 25A7120160; Tue, 12 Apr 2016 22:45:01 +0000 (UTC) From: "Luis R. Rodriguez" To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Date: Tue, 12 Apr 2016 15:44:58 -0700 Message-Id: <1460501098-28132-1-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <20160412223012.GO1990@wotan.suse.de> References: <20160412223012.GO1990@wotan.suse.de> 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: sathyanarayanan.kuppuswamy@linux.intel.com, 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, joro@8bytes.org, x86@kernel.org, robert.moore@intel.com, linux-acpi@vger.kernel.org, glin@suse.com, rui.zhang@intel.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, alan@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 Subject: [Xen-devel] [PATCH v2] x86/init: disable pnpbios and rtc for X86_SUBARCH_CE4100 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 As per hpa CE4100 platforms can also disable pnpbios [0]. Then Sebastian also recently noted that CE4100 also disables RTC probe, to do that Sebastian had long ago added the RTC of_have_populated_dt() check, he noted that it was meant to skip the RTC probe on all OF platforms but as of now, CE4100 was the only x86 DT using this. We can just fold this requirement into the platform quirk then. This now means that all of these match platform quirks for pnpbios and RTC preferences: * X86_SUBARCH_XEN * X86_SUBARCH_LGUEST * X86_SUBARCH_INTEL_MID * X86_SUBARCH_CE4100 [0] http://lkml.kernel.org/r/5702B5C2.7070101@zytor.com [1] http://lkml.kernel.org/r/570B52EA.60300@linutronix.de Suggested-by: H. Peter Anvin Suggested-by: Sebastian Andrzej Siewior Signed-off-by: Luis R. Rodriguez --- This series on the other paravirt_enabled() series, I'll be testing one more change to update one patch to reduce more space on __init, the 0-day testing should be done by tomorrow and then I can adjust the size computation on impact size. arch/x86/kernel/platform-quirks.c | 1 + arch/x86/kernel/rtc.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/kernel/platform-quirks.c b/arch/x86/kernel/platform-quirks.c index 853919484340..b2f8a33b36ff 100644 --- a/arch/x86/kernel/platform-quirks.c +++ b/arch/x86/kernel/platform-quirks.c @@ -17,6 +17,7 @@ void __init x86_early_init_platform_quirks(void) case X86_SUBARCH_XEN: case X86_SUBARCH_LGUEST: case X86_SUBARCH_INTEL_MID: + case X86_SUBARCH_CE4100: x86_platform.legacy.devices.pnpbios = 0; x86_platform.legacy.rtc = 0; break; diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index ff4f4180fefd..eceaa082ec3f 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -186,9 +186,6 @@ static __init int add_rtc_cmos(void) } } #endif - if (of_have_populated_dt()) - return 0; - if (!x86_platform.legacy.rtc) return -ENODEV;