From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1dpgoo-00019y-Kp for mharc-grub-devel@gnu.org; Wed, 06 Sep 2017 16:21:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpgom-00019V-6L for grub-devel@gnu.org; Wed, 06 Sep 2017 16:21:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpgoj-0005No-2M for grub-devel@gnu.org; Wed, 06 Sep 2017 16:21:00 -0400 Received: from mga04.intel.com ([192.55.52.120]:12220) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpgoi-0005NQ-Pv for grub-devel@gnu.org; Wed, 06 Sep 2017 16:20:56 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Sep 2017 13:20:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,355,1500966000"; d="scan'208";a="308749660" Received: from linux.intel.com ([10.54.29.200]) by fmsmga004.fm.intel.com with ESMTP; 06 Sep 2017 13:20:54 -0700 Received: from debox1-dev.jf.intel.com (debox1-dev.jf.intel.com [10.54.75.155]) by linux.intel.com (Postfix) with ESMTP id 8CC455800C5 for ; Wed, 6 Sep 2017 13:20:54 -0700 (PDT) From: "David E. Box" To: grub-devel@gnu.org Subject: [PATCH] tsc: Change default tsc calibration method to EFI on EFI systems Date: Wed, 6 Sep 2017 13:20:54 -0700 Message-Id: <20170906202054.2214-1-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.13.5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.120 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Sep 2017 20:21:01 -0000 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 --- 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 -- 2.13.5