summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-06-06 17:10:43 +0200
committerIngo Molnar <mingo@kernel.org>2016-06-08 11:04:19 +0200
commit4b703305d98bf7350d4b2953ee39a3aa2eeb1778 (patch)
treea0d54efdf01453b0a262109e517cc6cd69e773f5 /lib
parent6c5456474e7f0b63be66d44b0595001e2a8b44d5 (diff)
downloadlinux-stable-4b703305d98bf7350d4b2953ee39a3aa2eeb1778.tar.gz
linux-stable-4b703305d98bf7350d4b2953ee39a3aa2eeb1778.tar.bz2
linux-stable-4b703305d98bf7350d4b2953ee39a3aa2eeb1778.zip
x86/microcode: Fix suspend to RAM with builtin microcode
Usually, after we have found the proper microcode blob for the current machine, we stash it away for later use with save_microcode_in_initrd(). However, with builtin microcode which doesn't come from the initrd, we don't call that function because CONFIG_BLK_DEV_INITRD=n and even if set, we don't have a valid initrd. In order to fix this, let's make save_microcode_in_initrd() an fs_initcall which runs before rootfs_initcall() as this was the time it was called previously through: rootfs_initcall(populate_rootfs) |-> free_initrd() |-> free_initrd_mem() |-> save_microcode_in_initrd() Also, we make it run independently from initrd functionality being present or not. And since it is called in the microcode loader only now, we can also make it static. Reported-and-tested-by: Jim Bos <jim876@xs4all.nl> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: <stable@vger.kernel.org> # v4.6 Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1465225850-7352-3-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions