Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1372979
| From | "Luis R. Rodriguez" <mcgrof@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v4 05/14] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code |
| Date | 2016-04-07 02:20 +0200 |
| Message-ID | <rl5PY-3DR-5@gated-at.bofh.it> (permalink) |
| References | <rl5Gh-3Ao-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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 <mcgrof@kernel.org>
---
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 1db7e80c26f2..5e736e2108a1 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -911,6 +911,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 62c48da3889d..ff4f4180fefd 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;
--
2.7.2
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v4 00/14] x86: remove paravirt_enabled "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
Re: [Xen-devel] [PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda David Vrabel <david.vrabel@citrix.com> - 2016-04-07 11:50 +0200
Re: [Xen-devel] [PATCH v4 06/14] x86/init: use a platform legacy quirk for ebda "Luis R. Rodriguez" <mcgrof@suse.com> - 2016-04-07 23:10 +0200
[PATCH v4 10/14] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 14/14] x86/paravirt: remove paravirt_enabled() "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 13/14] x86/init: rename ebda code file "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
Re: [Xen-devel] [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk David Vrabel <david.vrabel@citrix.com> - 2016-04-07 11:50 +0200
Re: [Xen-devel] [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-14 01:10 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-04-07 15:00 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 02:40 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Juergen Gross <jgross@suse.com> - 2016-04-08 07:20 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Juergen Gross <jgross@suse.com> - 2016-04-08 08:40 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 09:00 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Juergen Gross <jgross@suse.com> - 2016-04-08 09:20 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 09:40 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Juergen Gross <jgross@suse.com> - 2016-04-08 10:10 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-04-08 14:40 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 20:50 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 08:40 +0200
Re: [PATCH v4 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-04-08 14:30 +0200
[PATCH v4 07/14] tools/lguest: force disable tboot and apm "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
Re: [PATCH v4 07/14] tools/lguest: force disable tboot and apm Rusty Russell <rusty@rustcorp.com.au> - 2016-04-11 06:00 +0200
[PATCH v4 03/14] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 08/14] apm32: remove paravirt_enabled() use "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
Re: [PATCH v4 08/14] apm32: remove paravirt_enabled() use Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-04-07 15:10 +0200
Re: [PATCH v4 08/14] apm32: remove paravirt_enabled() use "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 00:40 +0200
[PATCH v4 12/14] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 01/14] x86/boot: enumerate documentation for the x86 hardware_subarch "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
Re: [PATCH v4 01/14] x86/boot: enumerate documentation for the x86 hardware_subarch Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-04-07 13:30 +0200
Re: [PATCH v4 01/14] x86/boot: enumerate documentation for the x86 hardware_subarch "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 00:40 +0200
[PATCH v4 09/14] x86/tboot: remove paravirt_enabled() "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:10 +0200
[PATCH v4 02/14] x86/xen: use X86_SUBARCH_XEN for PV guest boots "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:20 +0200
Re: [Xen-devel] [PATCH v4 02/14] x86/xen: use X86_SUBARCH_XEN for PV guest boots David Vrabel <david.vrabel@citrix.com> - 2016-04-07 11:50 +0200
[PATCH v4 05/14] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 02:20 +0200
Re: [Xen-devel] [PATCH v4 00/14] x86: remove paravirt_enabled Juergen Gross <jgross@suse.com> - 2016-04-07 15:30 +0200
[PATCH v4 13/14] x86/init: rename ebda code file "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-07 23:40 +0200
Re: [PATCH v4 00/14] x86: remove paravirt_enabled "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-04-08 03:20 +0200
Re: [PATCH v4 00/14] x86: remove paravirt_enabled Borislav Petkov <bp@alien8.de> - 2016-04-08 12:30 +0200
csiph-web