Commit bacef661acdb634170a8faddbc1cf28e8f8b9eee

Authored by Jan Beulich
Committed by Ingo Molnar
1 parent eea5b5510f

x86-64/efi: Use EFI to deal with platform wall clock

Other than ix86, x86-64 on EFI so far didn't set the
{g,s}et_wallclock accessors to the EFI routines, thus
incorrectly using raw RTC accesses instead.

Simply removing the #ifdef around the respective code isn't
enough, however: While so far early get-time calls were done in
physical mode, this doesn't work properly for x86-64, as virtual
addresses would still need to be set up for all runtime regions
(which wasn't the case on the system I have access to), so
instead the patch moves the call to efi_enter_virtual_mode()
ahead (which in turn allows to drop all code related to calling
efi-get-time in physical mode).

Additionally the earlier calling of efi_set_executable()
requires the CPA code to cope, i.e. during early boot it must be
avoided to call cpa_flush_array(), as the first thing this
function does is a BUG_ON(irqs_disabled()).

Also make the two EFI functions in question here static -
they're not being referenced elsewhere.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Tested-by: Matt Fleming <matt.fleming@intel.com>
Acked-by: Matthew Garrett <mjg@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/4FBFBF5F020000780008637F@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Showing 4 changed files with 14 additions and 36 deletions Side-by-side Diff

arch/x86/mm/pageattr.c
... ... @@ -919,11 +919,13 @@
919 919  
920 920 /*
921 921 * On success we use clflush, when the CPU supports it to
922   - * avoid the wbindv. If the CPU does not support it and in the
923   - * error case we fall back to cpa_flush_all (which uses
924   - * wbindv):
  922 + * avoid the wbindv. If the CPU does not support it, in the
  923 + * error case, and during early boot (for EFI) we fall back
  924 + * to cpa_flush_all (which uses wbinvd):
925 925 */
926   - if (!ret && cpu_has_clflush) {
  926 + if (early_boot_irqs_disabled)
  927 + __cpa_flush_all((void *)(long)cache);
  928 + else if (!ret && cpu_has_clflush) {
927 929 if (cpa.flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) {
928 930 cpa_flush_array(addr, numpages, cache,
929 931 cpa.flags, pages);
arch/x86/platform/efi/efi.c
... ... @@ -234,23 +234,8 @@
234 234 return status;
235 235 }
236 236  
237   -static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
238   - efi_time_cap_t *tc)
  237 +static int efi_set_rtc_mmss(unsigned long nowtime)
239 238 {
240   - unsigned long flags;
241   - efi_status_t status;
242   -
243   - spin_lock_irqsave(&rtc_lock, flags);
244   - efi_call_phys_prelog();
245   - status = efi_call_phys2(efi_phys.get_time, virt_to_phys(tm),
246   - virt_to_phys(tc));
247   - efi_call_phys_epilog();
248   - spin_unlock_irqrestore(&rtc_lock, flags);
249   - return status;
250   -}
251   -
252   -int efi_set_rtc_mmss(unsigned long nowtime)
253   -{
254 239 int real_seconds, real_minutes;
255 240 efi_status_t status;
256 241 efi_time_t eft;
... ... @@ -278,7 +263,7 @@
278 263 return 0;
279 264 }
280 265  
281   -unsigned long efi_get_time(void)
  266 +static unsigned long efi_get_time(void)
282 267 {
283 268 efi_status_t status;
284 269 efi_time_t eft;
285 270  
286 271  
... ... @@ -621,18 +606,13 @@
621 606 }
622 607 /*
623 608 * We will only need *early* access to the following
624   - * two EFI runtime services before set_virtual_address_map
  609 + * EFI runtime service before set_virtual_address_map
625 610 * is invoked.
626 611 */
627   - efi_phys.get_time = (efi_get_time_t *)runtime->get_time;
628 612 efi_phys.set_virtual_address_map =
629 613 (efi_set_virtual_address_map_t *)
630 614 runtime->set_virtual_address_map;
631   - /*
632   - * Make efi_get_time can be called before entering
633   - * virtual mode.
634   - */
635   - efi.get_time = phys_efi_get_time;
  615 +
636 616 early_iounmap(runtime, sizeof(efi_runtime_services_t));
637 617  
638 618 return 0;
639 619  
... ... @@ -720,12 +700,10 @@
720 700 efi_enabled = 0;
721 701 return;
722 702 }
723   -#ifdef CONFIG_X86_32
724 703 if (efi_native) {
725 704 x86_platform.get_wallclock = efi_get_time;
726 705 x86_platform.set_wallclock = efi_set_rtc_mmss;
727 706 }
728   -#endif
729 707  
730 708 #if EFI_DEBUG
731 709 print_efi_memmap();
... ... @@ -503,8 +503,6 @@
503 503 extern int __init efi_uart_console_only (void);
504 504 extern void efi_initialize_iomem_resources(struct resource *code_resource,
505 505 struct resource *data_resource, struct resource *bss_resource);
506   -extern unsigned long efi_get_time(void);
507   -extern int efi_set_rtc_mmss(unsigned long nowtime);
508 506 extern void efi_reserve_boot_services(void);
509 507 extern struct efi_memory_map memmap;
510 508  
... ... @@ -460,6 +460,10 @@
460 460 percpu_init_late();
461 461 pgtable_cache_init();
462 462 vmalloc_init();
  463 +#ifdef CONFIG_X86
  464 + if (efi_enabled)
  465 + efi_enter_virtual_mode();
  466 +#endif
463 467 }
464 468  
465 469 asmlinkage void __init start_kernel(void)
... ... @@ -601,10 +605,6 @@
601 605 calibrate_delay();
602 606 pidmap_init();
603 607 anon_vma_init();
604   -#ifdef CONFIG_X86
605   - if (efi_enabled)
606   - efi_enter_virtual_mode();
607   -#endif
608 608 thread_info_cache_init();
609 609 cred_init();
610 610 fork_init(totalram_pages);