From patchwork Thu Apr 14 00:04:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8829991 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 AB8D09F3D1 for ; Thu, 14 Apr 2016 00:07:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C520120274 for ; Thu, 14 Apr 2016 00:07:22 +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 E18FA20173 for ; Thu, 14 Apr 2016 00:07:21 +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 1aqUmn-0007nc-OM; Thu, 14 Apr 2016 00:05:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aqUml-0007ky-W1 for xen-devel@lists.xensource.com; Thu, 14 Apr 2016 00:05:28 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id D7/2B-30904-7CEDE075; Thu, 14 Apr 2016 00:05:27 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsVybKJsh+6xe3z hBju6NS3uTXnP7sDosb1vF3sAYxRrZl5SfkUCa8b1rk7mgha+iu+d95kbGJt4uhg5OYQEpjJK 7Dkb3MXIBWTPYJJ43NjD2sXIwcEmoCtx87YESI2IQILE3affmEFqmAWOsUrMWzWXFSQhLBAk8 XjJP3YQm0VAVWL536dgcV4BB4l/i1cygdgSAnISLT92g8U5geILdq5ghVhsL9F/+wAjRE2GxL yeOawQtpfEohuXoGw1iavnNjFPYORbwMiwilGjOLWoLLVI19BAL6koMz2jJDcxMwfIM9XLTS0 uTkxPzUlMKtZLzs/dxAgMEwYg2MG4ZqrzIUZJDiYlUV6TVXzhQnxJ+SmVGYnFGfFFpTmpxYcY ZTg4lCR4w+8C5QSLUtNTK9Iyc4ABC5OW4OBREuHdDpLmLS5IzC3OTIdInWJUlBLnlQFJCIAkM krz4NpgUXKJUVZKmJcR6BAhnoLUotzMElT5V4ziHIxKwrxTQKbwZOaVwE1/BbSYCWhx2TtekM UliQgpqQZG52OLJadsEfdR0c5JsNu3K/DqLSlx7z+yzCuWcCTdnavdenPGKZl6Pz+/iRWSRS4 BF+uDrqgs2GvAIda6zH+pi7/C58NNX7IzhKI5bJLPX4rTYZSeX+6buu52qeHDY9mXD6y4L3Nw i7fMCXb7GR+4HiW+rqtft99b6rjSzBOfVH6+UDlrc/GmEktxRqKhFnNRcSIAZeGXPY0CAAA= X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-2.tower-206.messagelabs.com!1460592325!18561957!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 58879 invoked from network); 14 Apr 2016 00:05:26 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-2.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Apr 2016 00:05:26 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4F8DE20395; Thu, 14 Apr 2016 00:05:24 +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 569A420394; Thu, 14 Apr 2016 00:05:22 +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, 13 Apr 2016 17:04:46 -0700 Message-Id: <1460592286-300-17-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1460592286-300-1-git-send-email-mcgrof@kernel.org> References: <1460592286-300-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: 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, x86@kernel.org, robert.moore@intel.com, linux-acpi@vger.kernel.org, glin@suse.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, jgross@suse.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 v6 16/16] 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 --- 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;