[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/

[Mike Gilbert]

commit:     cc7c5c7c914a5a240a3f15788ad125c58ab7271c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 18:34:16 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 18:34:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7c5c7c

sys-boot/grub: backport fix for efi

Closes: https://bugs.gentoo.org/688622
Package-Manager: Portage-2.3.67_p12, Repoman-2.3.14_p7
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/grub/files/2.02-efi-tsc-pmtimer.patch     | 32 ++++++++++++++++++++++
 .../{grub-2.02-r3.ebuild => grub-2.02-r4.ebuild}   |  1 +
 2 files changed, 33 insertions(+)

diff --git a/sys-boot/grub/files/2.02-efi-tsc-pmtimer.patch b/sys-boot/grub/files/2.02-efi-tsc-pmtimer.patch
new file mode 100644
index 00000000000..f20845d5a34
--- /dev/null
+++ b/sys-boot/grub/files/2.02-efi-tsc-pmtimer.patch
@@ -0,0 +1,32 @@
+From 446794de8da4329ea532cbee4ca877bcafd0e534 Mon Sep 17 00:00:00 2001
+From: "David E. Box" <david.e.box@×××××××××××.com>
+Date: Fri, 15 Sep 2017 15:37:05 -0700
+Subject: [PATCH] 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 <david.e.box@×××××××××××.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@××××××.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..f266eb131 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_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
+-- 
+2.22.0
+

diff --git a/sys-boot/grub/grub-2.02-r3.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
similarity index 99%
rename from sys-boot/grub/grub-2.02-r3.ebuild
rename to sys-boot/grub/grub-2.02-r4.ebuild
index 343fae3197d..e7fdf86942f 100644
--- a/sys-boot/grub/grub-2.02-r3.ebuild
+++ b/sys-boot/grub/grub-2.02-r4.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}"/2.02-xfs-sparse-inodes.patch
 	"${FILESDIR}"/2.02-X86_64_PLT32.patch
 	"${FILESDIR}"/2.02-gcc8.patch
+	"${FILESDIR}"/2.02-efi-tsc-pmtimer.patch
 )
 
 DEJAVU=dejavu-sans-ttf-2.37