1 |
From 446794de8da4329ea532cbee4ca877bcafd0e534 Mon Sep 17 00:00:00 2001 |
2 |
From: "David E. Box" <david.e.box@linux.intel.com> |
3 |
Date: Fri, 15 Sep 2017 15:37:05 -0700 |
4 |
Subject: [PATCH] tsc: Change default tsc calibration method to pmtimer on EFI |
5 |
systems |
6 |
|
7 |
On efi systems, make pmtimer based tsc calibration the default over the |
8 |
pit. This prevents Grub from hanging on Intel SoC systems that power gate |
9 |
the pit. |
10 |
|
11 |
Signed-off-by: David E. Box <david.e.box@linux.intel.com> |
12 |
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> |
13 |
|
14 |
diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c |
15 |
index 2e85289d8..f266eb131 100644 |
16 |
--- a/grub-core/kern/i386/tsc.c |
17 |
+++ b/grub-core/kern/i386/tsc.c |
18 |
@@ -68,7 +68,7 @@ grub_tsc_init (void) |
19 |
#ifdef GRUB_MACHINE_XEN |
20 |
(void) (grub_tsc_calibrate_from_xen () || calibrate_tsc_hardcode()); |
21 |
#elif defined (GRUB_MACHINE_EFI) |
22 |
- (void) (grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode()); |
23 |
+ (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode()); |
24 |
#elif defined (GRUB_MACHINE_COREBOOT) |
25 |
(void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || calibrate_tsc_hardcode()); |
26 |
#else |
27 |
-- |
28 |
2.13.7 |