lkml.org 
[lkml]   [2020]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 029/222] Fix built-in early-load Intel microcode alignment
    Date
    From: Jari Ruusu <jari.ruusu@gmail.com>

    commit f5ae2ea6347a308cfe91f53b53682ce635497d0d upstream.

    Intel Software Developer's Manual, volume 3, chapter 9.11.6 says:

    "Note that the microcode update must be aligned on a 16-byte boundary
    and the size of the microcode update must be 1-KByte granular"

    When early-load Intel microcode is loaded from initramfs, userspace tool
    'iucode_tool' has already 16-byte aligned those microcode bits in that
    initramfs image. Image that was created something like this:

    iucode_tool --write-earlyfw=FOO.cpio microcode-files...

    However, when early-load Intel microcode is loaded from built-in
    firmware BLOB using CONFIG_EXTRA_FIRMWARE= kernel config option, that
    16-byte alignment is not guaranteed.

    Fix this by forcing all built-in firmware BLOBs to 16-byte alignment.

    [ If we end up having other firmware with much bigger alignment
    requirements, we might need to introduce some method for the firmware
    to specify it, this is the minimal "just increase the alignment a bit
    to account for this one special case" patch - Linus ]

    Signed-off-by: Jari Ruusu <jari.ruusu@gmail.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Cc: Luis Chamberlain <mcgrof@kernel.org>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/base/firmware_loader/builtin/Makefile | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/base/firmware_loader/builtin/Makefile
    +++ b/drivers/base/firmware_loader/builtin/Makefile
    @@ -17,7 +17,7 @@ PROGBITS = $(if $(CONFIG_ARM),%,@)progb
    filechk_fwbin = \
    echo "/* Generated by $(src)/Makefile */" ;\
    echo " .section .rodata" ;\
    - echo " .p2align $(ASM_ALIGN)" ;\
    + echo " .p2align 4" ;\
    echo "_fw_$(FWSTR)_bin:" ;\
    echo " .incbin \"$(fwdir)/$(FWNAME)\"" ;\
    echo "_fw_end:" ;\

    \
     
     \ /
      Last update: 2020-01-22 14:19    [W:4.027 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site