tsc: Change default tsc calibration method to pmtimer on EFI systems

PATCH In review David E. Box 2 participants 3 messages Sep 15, 2017 – Oct 6, 2017

Share & tools

David E. Box

author

2017-09-15 22:37 UTC #0 lore raw

PATCH v2 1/1 tsc: Change default tsc calibration method to pmtimer on EFI systems

On efi systems, make pmtimer based tsc calibration the default over the pit. This prevents Grub from hanging on Intel SoC systems that power gate the pit.

Signed-off-by David E. Box <[email protected]>

---
ChangeLog:

v2: Make pmtimer the default. Keep the rest in the original order.

v1: Make efi timer the default followed by the pmtimer.

 grub-core/kern/i386/tsc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

grub-core/kern/i386/tsc.c +1 -1

index 2e85289d8..5b9da7c86 100644
@@ -68,7 +68,7 @@ grub_tsc_init (void)
 #ifdef GRUB_MACHINE_XEN
   (void) (grub_tsc_calibrate_from_xen () || calibrate_tsc_hardcode());
 #elif defined (GRUB_MACHINE_EFI)
-  (void) (grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode());
+  (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode());
 #elif defined (GRUB_MACHINE_COREBOOT)
   (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || calibrate_tsc_hardcode());
 #else

Signature · 1 line

2.13.5

Daniel Kiper

2017-09-28 20:51 UTC #1 lore raw

Quoted 5 lines · David E. Box

On efi systems, make pmtimer based tsc calibration the default over the pit. This prevents Grub from hanging on Intel SoC systems that power gate the pit.
Signed-off-by David E. Box <[email protected]>

LGTM. If there are no objections I will apply this next week.

Daniel

Daniel Kiper

2017-10-06 15:02 UTC #2 lore raw

Quoted 8 lines · Daniel Kiper

Quoted 5 lines · David E. Box
On efi systems, make pmtimer based tsc calibration the default over the pit. This prevents Grub from hanging on Intel SoC systems that power gate the pit.
Signed-off-by David E. Box <[email protected]>
LGTM. If there are no objections I will apply this next week.

Committed!

Thanks,

Daniel