Changeset 6e493187

Timestamp:

01/09/2020 04:18:14 PM (4 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 9.1, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

cce4984

Parents:

e3b66f3

Message:

Add early loading of microcode to the initramfs
Fix a bug in mkinitramfs, leading to a "cp" error

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@22557 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (2 diffs)
• postlfs/config/firmware.xml (modified) (1 diff)
• postlfs/filesystems/initramfs.xml (modified) (5 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "08">                   <!-- Always 2 digits -->
+<!ENTITY day          "09">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2020">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 8th, &year;">
+<!ENTITY releasedate  "January 9th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <listitem>
+      <para>January 9th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Add early microcode loading to the initramfs.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 8th, 2020</para>
       <itemizedlist>
@@ -100 +109 @@
         <listitem>
           <para>[bdubbs] - Update to seahorse-3.34.1. Fixes
-          <ulink url="&blfs-ticket-root;12985">#12985</ulink>.</para>
+          <ulink url="&blfs-ticket-root;12986">#12986</ulink>.</para>
         </listitem>
         <listitem>

postlfs/config/firmware.xml

@@ -309 +309 @@
 
       <para>If you are already booting with an initrd (see <xref
-      linkend="initramfs"/>) you must specify the microcode initrd first, using
-      a line such as <userinput>initrd /microcode.img
-      /other-initrd.img</userinput> (adapt that as above if /boot is not a
-      separate mountpoint).</para>
+      linkend="initramfs"/>), you should run <command>mkinitramfs</command> 
+      again after putting the appropriate blob or container into <filename
+      class="directory">/lib/firmware</filename> as explained above.
+      Alternatively, you can have both initrd on the same line, such as
+      <userinput>initrd /microcode.img /other-initrd.img</userinput> (adapt
+      that as above if /boot is not a separate mountpoint).</para>
 
       <para>You can now reboot with the added initrd, and then use the same

postlfs/filesystems/initramfs.xml

@@ -69 +69 @@
   fi
 
-  if [ -n $file ] ; then
+  if [ -n "$file" ] ; then
     cp $file $WDIR/$2
   else
@@ -209 +209 @@
 # Install libraries
 sort $unsorted | uniq | while read library ; do
-  if [ "$library" == "linux-vdso.so.1" ] ||
-     [ "$library" == "linux-gate.so.1" ]; then
+# linux-vdso and linux-gate are pseudo libraries and do not correspond to a file
+# libsystemd-shared is in /lib/systemd, so it is not found by copy, and
+# it is copied below anyway
+  if [[ "$library" == linux-vdso.so.1 ]] ||
+     [[ "$library" == linux-gate.so.1 ]] ||
+     [[ "$library" == libsystemd-shared* ]]; then
     continue
   fi
@@ -244 +248 @@
 ( cd $WDIR ; find . | cpio -o -H newc --quiet | gzip -9 ) > $INITRAMFS_FILE
 
-# Remove the temporary directory and file
+# Prepare early loading of microcode if available
+if ls /lib/firmware/intel-ucode/* >/dev/null 2>&1 ||
+   ls /lib/firmware/amd-ucode/*   >/dev/null 2>&1; then
+
+# first empty WDIR to reuse it
+  rm -r $WDIR/*
+
+  DSTDIR=$WDIR/kernel/x86/microcode
+  mkdir -p $DSTDIR
+
+  if [ -d /lib/firmware/amd-ucode ]; then
+    cat /lib/firmware/amd-ucode/microcode_amd*.bin > $DSTDIR/AuthenticAMD.bin
+  fi
+
+  if [ -d /lib/firmware/intel-ucode ]; then
+    cat /lib/firmware/intel-ucode/* > $DSTDIR/GenuineIntel.bin
+  fi
+
+  ( cd $WDIR; find . | cpio -o -H newc --quiet ) > microcode.img
+  cat microcode.img $INITRAMFS_FILE > tmpfile
+  mv tmpfile $INITRAMFS_FILE
+  rm microcode.img
+fi
+
+# Remove the temporary directories and files
 rm -rf $WDIR $unsorted
 printf "done.\n"
@@ -399 +427 @@
       <xref role="runtime" linkend="mdadm"/> must be installed before
       generating the initramfs, if the system partition uses them.
-
     </para>
 
@@ -421 +448 @@
     current directory.</para>
 
+    <para>If early loading of microcode is needed (see <xref
+    linkend="cpu-microcode"/>), you can install the appropriate blob or
+    container in <filename class="directory">/lib/firmware</filename>.
+    It will be automatically added to the initrd when running
+    <command>mkinitramfs</command>.</para>
+
     <para>After generating the initrd, copy it to the <filename
     class='directory'>/boot</filename> directory.</para>