From b403b04a139c02156829d8d21943bc69b2cf0c53 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 5 Aug 2018 13:32:36 +0200
Subject: [PATCH] initrd: add early microcode load

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/dracut/dracut.conf           | 3 +++
 config/rootfiles/core/123/update.sh | 3 +++
 lfs/cdrom                           | 2 +-
 lfs/linux                           | 2 +-
 lfs/linux-initrd                    | 2 +-
 src/paks/linux-pae/install.sh       | 2 +-
 src/scripts/rebuild-initrd          | 2 +-
 7 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/config/dracut/dracut.conf b/config/dracut/dracut.conf
index 52bba9c629..e9bd566b64 100644
--- a/config/dracut/dracut.conf
+++ b/config/dracut/dracut.conf
@@ -31,6 +31,9 @@ filesystems+="reiserfs vfat xfs"
 #hostonly="yes"
 #
 
+# Load microcode for the CPU early
+early_microcode=yes
+
 # install local /etc/mdadm.conf
 #mdadmconf="no"
 
diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh
index cf488ec49e..76eff74bb3 100644
--- a/config/rootfiles/core/123/update.sh
+++ b/config/rootfiles/core/123/update.sh
@@ -51,6 +51,9 @@ ldconfig
 /etc/init.d/unbound restart
 /etc/init.d/squid start
 
+# rebuild initrd to add early microcode updates
+rebuild-initrd
+
 # This update needs a reboot...
 touch /var/run/need_reboot
 
diff --git a/lfs/cdrom b/lfs/cdrom
index 6382034b54..08bd609c47 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -84,7 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog
 ifneq "$(BUILD_PLATFORM)" "arm"
 	cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
-	dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
+	dracut --force --early-microcode -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
 	cp $(DIR_SRC)/config/syslinux/boot.png      /install/cdrom/boot/isolinux/boot.png
 	cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
 	cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot
diff --git a/lfs/linux b/lfs/linux
index c5d8a8e88f..b5877fc5be 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 75
+PAK_VER    = 76
 DEPS	   = ""
 
 KERNEL_ARCH   = $(BUILD_ARCH)
diff --git a/lfs/linux-initrd b/lfs/linux-initrd
index 1e6b071f99..93f21078ea 100644
--- a/lfs/linux-initrd
+++ b/lfs/linux-initrd
@@ -62,7 +62,7 @@ ifneq "$(KCFG)" "-rpi"
 ifneq "$(KCFG)" "-pae"
 
 	# Create initramfs images
-	dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
+	dracut --force --early-microcode --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
 
 ifeq "$(KCFG)" "-kirkwood"
 #	cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index e5f82c567f..fd71621d57 100644
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -60,7 +60,7 @@ depmod -a $KVER-ipfire-pae
 #
 # Made initramdisk
 #
-/usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae  
+/usr/bin/dracut --force --early-microcode --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae  
 
 if [ -e /boot/grub/grub.cfg ]; then
 	#
diff --git a/src/scripts/rebuild-initrd b/src/scripts/rebuild-initrd
index 06f30bbf05..91e68ca571 100644
--- a/src/scripts/rebuild-initrd
+++ b/src/scripts/rebuild-initrd
@@ -24,4 +24,4 @@
 #
 KVER=`uname -r | cut -d"-" -f1`
 
-dracut --force --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire
+dracut --force --early-microcode --verbose /boot/ipfirerd-$KVER.img $KVER-ipfire
-- 
2.39.2