31cddd
From 446794de8da4329ea532cbee4ca877bcafd0e534 Mon Sep 17 00:00:00 2001
da63b3
From: "David E. Box" <david.e.box@linux.intel.com>
da63b3
Date: Fri, 15 Sep 2017 15:37:05 -0700
31cddd
Subject: [PATCH] tsc: Change default tsc calibration method to pmtimer on EFI
31cddd
 systems
da63b3
da63b3
On efi systems, make pmtimer based tsc calibration the default over the
da63b3
pit. This prevents Grub from hanging on Intel SoC systems that power gate
da63b3
the pit.
da63b3
da63b3
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
da63b3
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
da63b3
---
da63b3
 grub-core/kern/i386/tsc.c | 2 +-
da63b3
 1 file changed, 1 insertion(+), 1 deletion(-)
da63b3
da63b3
diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c
ec4acb
index 2e85289d848..f266eb13185 100644
da63b3
--- a/grub-core/kern/i386/tsc.c
da63b3
+++ b/grub-core/kern/i386/tsc.c
da63b3
@@ -68,7 +68,7 @@ grub_tsc_init (void)
da63b3
 #ifdef GRUB_MACHINE_XEN
da63b3
   (void) (grub_tsc_calibrate_from_xen () || calibrate_tsc_hardcode());
da63b3
 #elif defined (GRUB_MACHINE_EFI)
da63b3
-  (void) (grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode());
da63b3
+  (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode());
da63b3
 #elif defined (GRUB_MACHINE_COREBOOT)
da63b3
   (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || calibrate_tsc_hardcode());
da63b3
 #else