# 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/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 8b909e3548706cbebc0a676067b81aadda57f47e # < make -s -j 24 ARCH=mips O=/kisskb/build/powerpc-fixes_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- defconfig # make -s -j 24 ARCH=mips O=/kisskb/build/powerpc-fixes_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- FIT description: Linux 5.2.0-rc1-g8b909e354870 Created: Thu May 23 16:35:16 2019 Image 0 (kernel@0) Description: Linux 5.2.0-rc1-g8b909e354870 Created: Thu May 23 16:35:16 2019 Type: Kernel Image Compression: gzip compressed Data Size: 4650028 Bytes = 4541.04 KiB = 4.43 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x80896370 Hash algo: sha1 Hash value: b3ec4235c1cd4c0fad9596f4c9ca31d6fe85454d Image 1 (fdt@boston) Description: img,boston Device Tree Created: Thu May 23 16:35:16 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Thu May 23 16:35:16 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Thu May 23 16:35:16 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 4603 Bytes = 4.50 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 33e429f316125d86bb863c2fe8d9c42fbcf90bfb Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Thu May 23 16:35:16 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 5162 Bytes = 5.04 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 0c5db3f23ba8b80fafd8c8e4eacfcb8ad62a91ae Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Thu May 23 16:35:16 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/powerpc-fixes_mips-defconfig_mipsel # Build took: 0:02:01.761984