Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752820AbcDVJwJ (ORCPT ); Fri, 22 Apr 2016 05:52:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37204 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751622AbcDVJwF (ORCPT ); Fri, 22 Apr 2016 05:52:05 -0400 Date: Fri, 22 Apr 2016 02:50:42 -0700 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: mcgrof@kernel.org, peterz@infradead.org, bp@alien8.de, tglx@linutronix.de, brgerst@gmail.com, dvlasenk@redhat.com, hpa@zytor.com, luto@amacapital.net, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org Reply-To: dvlasenk@redhat.com, hpa@zytor.com, luto@amacapital.net, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org, mcgrof@kernel.org, peterz@infradead.org, bp@alien8.de, tglx@linutronix.de, brgerst@gmail.com In-Reply-To: <1460592286-300-6-git-send-email-mcgrof@kernel.org> References: <1460592286-300-6-git-send-email-mcgrof@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/ACPI: Move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Git-Commit-ID: 088a8ef8207f19aadbade0971af21ad89fdc3815 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3244 Lines: 95 Commit-ID: 088a8ef8207f19aadbade0971af21ad89fdc3815 Gitweb: http://git.kernel.org/tip/088a8ef8207f19aadbade0971af21ad89fdc3815 Author: Luis R. Rodriguez AuthorDate: Wed, 13 Apr 2016 17:04:35 -0700 Committer: Ingo Molnar CommitDate: Fri, 22 Apr 2016 10:29:01 +0200 x86/ACPI: Move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code This moves the ACPI specific check into the ACPI boot code, it also takes advantage of the x86_platform.legacy.rtc which is checked for already on the RTC initialization code. This lets us remove the nasty #ifdefery and consolidate the checks to use only one toggle to disable the RTC init code. The works as RTC is initialized by device_initcall(add_rtc_cmos), this will run late in boot on start_kernel() during rest_init(), acpi_parse_fadt() gets called earlier during setup_arch(). Signed-off-by: Luis R. Rodriguez Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: andrew.cooper3@citrix.com Cc: andriy.shevchenko@linux.intel.com Cc: bigeasy@linutronix.de Cc: boris.ostrovsky@oracle.com Cc: david.vrabel@citrix.com Cc: ffainelli@freebox.fr Cc: george.dunlap@citrix.com Cc: glin@suse.com Cc: jgross@suse.com Cc: jlee@suse.com Cc: josh@joshtriplett.org Cc: julien.grall@linaro.org Cc: konrad.wilk@oracle.com Cc: kozerkov@parallels.com Cc: lenb@kernel.org Cc: lguest@lists.ozlabs.org Cc: linux-acpi@vger.kernel.org Cc: lv.zheng@intel.com Cc: matt@codeblueprint.co.uk Cc: mbizon@freebox.fr Cc: rjw@rjwysocki.net Cc: robert.moore@intel.com Cc: rusty@rustcorp.com.au Cc: tiwai@suse.de Cc: toshi.kani@hp.com Cc: xen-devel@lists.xensource.com Link: http://lkml.kernel.org/r/1460592286-300-6-git-send-email-mcgrof@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/kernel/acpi/boot.c | 4 ++++ arch/x86/kernel/rtc.c | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 8c2f1ef..8c9c2bd 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -913,6 +913,10 @@ late_initcall(hpet_insert_resource); static int __init acpi_parse_fadt(struct acpi_table_header *table) { + if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC) { + pr_debug("ACPI: not registering RTC platform device\n"); + x86_platform.legacy.rtc = 0; + } #ifdef CONFIG_X86_PM_TIMER /* detect the location of the ACPI PM Timer */ diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index 62c48da..ff4f418 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -189,14 +189,6 @@ static __init int add_rtc_cmos(void) if (of_have_populated_dt()) return 0; -#ifdef CONFIG_ACPI - if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC) { - /* This warning can likely go away again in a year or two. */ - pr_info("ACPI: not registering RTC platform device\n"); - return -ENODEV; - } -#endif - if (!x86_platform.legacy.rtc) return -ENODEV;