# git rev-parse -q --verify 8b909e3548706cbebc0a676067b81aadda57f47e^{commit} 8b909e3548706cbebc0a676067b81aadda57f47e already have revision, skipping fetch # git checkout -q -f -B kisskb 8b909e3548706cbebc0a676067b81aadda57f47e # git clean -qxdf # < git log -1 # commit 8b909e3548706cbebc0a676067b81aadda57f47e # Author: Thiago Jung Bauermann # Date: Wed May 22 19:01:58 2019 -0300 # # powerpc/kexec: Fix loading of kernel + initramfs with kexec_file_load() # # Commit b6664ba42f14 ("s390, kexec_file: drop arch_kexec_mem_walk()") # changed kexec_add_buffer() to skip searching for a memory location if # kexec_buf.mem is already set, and use the address that is there. # # In powerpc code we reuse a kexec_buf variable for loading both the # kernel and the initramfs by resetting some of the fields between those # uses, but not mem. This causes kexec_add_buffer() to try to load the # kernel at the same address where initramfs will be loaded, which is # naturally rejected: # # # kexec -s -l --initrd initramfs vmlinuz # kexec_file_load failed: Invalid argument # # Setting the mem field before every call to kexec_add_buffer() fixes # this regression. # # Fixes: b6664ba42f14 ("s390, kexec_file: drop arch_kexec_mem_walk()") # Cc: stable@vger.kernel.org # v5.0+ # Signed-off-by: Thiago Jung Bauermann # Reviewed-by: Dave Young # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 8b909e3548706cbebc0a676067b81aadda57f47e # < make -s -j 8 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_ppa8548_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- 85xx/ppa8548_defconfig # make -s -j 8 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_ppa8548_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- INFO: Uncompressed kernel (size 0x492c20) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x500000) Image Name: Linux-5.2.0-rc1-g8b909e354870 Created: Thu May 23 18:03:58 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2369950 Bytes = 2314.40 KiB = 2.26 MiB Load Address: 00000000 Entry Point: 00000000 Completed OK # rm -rf /kisskb/build/powerpc-fixes_85xx_ppa8548_defconfig_powerpc-gcc5 # Build took: 0:00:51.476707