On Wed,  6 Sep 2017 13:20:54 -0700
"David E. Box" <david.e....@linux.intel.com> wrote:

> On efi systems, make efi based tsc calibration the default, followed by
> the pmtimer before using the pit. This prevents Grub boot failure on
> newer x86 systems that power gate the pit.
> 
> Signed-off-by: David E. Box <david.e....@linux.intel.com>
> ---
>  grub-core/kern/i386/tsc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c
> index 2e85289d8..de4057ddb 100644
> --- a/grub-core/kern/i386/tsc.c
> +++ b/grub-core/kern/i386/tsc.c
> @@ -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_efi () || grub_tsc_calibrate_from_pmtimer 
> () || grub_tsc_calibrate_from_pit () || calibrate_tsc_hardcode());
>  #elif defined (GRUB_MACHINE_COREBOOT)
>    (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit 
> () || calibrate_tsc_hardcode());
>  #else

Good catch!

Noted the baked-in, minor style cleanup:
  grub_tsc_calibrate_from_efi() -> grub_tsc_calibrate_from_efi ()

You have my:
  Reviewed-by: Joe Konno <joe.ko...@intel.com>


Cheers

Attachment: pgplUyJmqgh4j.pgp
Description: OpenPGP digital signature

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Reply via email to