Patch "MIPS: boot/compressed/: add __bswapdi2() to target for ZSTD decompression" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    MIPS: boot/compressed/: add __bswapdi2() to target for ZSTD decompression

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mips-boot-compressed-add-__bswapdi2-to-target-for-zs.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit a7ea8b229ff0d1b9cafd86246172d2dd5e0f28a9
Author: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Date:   Tue Nov 9 19:09:44 2021 -0800

    MIPS: boot/compressed/: add __bswapdi2() to target for ZSTD decompression
    
    [ Upstream commit e2f4b3be1d3c73176db734565b160250cc1300dd ]
    
    For MIPS pre-boot, when CONFIG_KERNEL_ZSTD=y, the decompressor
    function uses __bswapdi2(), so this object file should be added to
    the target object file.
    
    Fixes these build errors:
    
    mips-linux-ld: arch/mips/boot/compressed/decompress.o: in function `xxh64':
    decompress.c:(.text+0x8be0): undefined reference to `__bswapdi2'
    mips-linux-ld: decompress.c:(.text+0x8c78): undefined reference to `__bswapdi2'
    mips-linux-ld: decompress.c:(.text+0x8d04): undefined reference to `__bswapdi2'
    mips-linux-ld: arch/mips/boot/compressed/decompress.o:decompress.c:(.text+0xa010): more undefined references to `__bswapdi2' follow
    
    Fixes: 0652035a5794 ("asm-generic: unaligned: remove byteshift helpers")
    Fixes: cddc40f5617e ("mips: always link byteswap helpers into decompressor")
    Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
    Reported-by: kernel test robot <lkp@xxxxxxxxx>
    Cc: Arnd Bergmann <arnd@xxxxxxxx>
    Cc: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
    Cc: linux-mips@xxxxxxxxxxxxxxx
    Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
    Signed-off-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 3548b3b452699..9112bdb86be45 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -56,6 +56,8 @@ $(obj)/uart-ath79.c: $(srctree)/arch/mips/ath79/early_printk.c
 
 vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o
 
+vmlinuzobjs-$(CONFIG_KERNEL_ZSTD) += $(obj)/bswapdi.o
+
 extra-y += ashldi3.c
 $(obj)/ashldi3.c: $(obj)/%.c: $(srctree)/lib/%.c FORCE
 	$(call if_changed,shipped)
@@ -64,6 +66,10 @@ extra-y += bswapsi.c
 $(obj)/bswapsi.c: $(obj)/%.c: $(srctree)/arch/mips/lib/%.c FORCE
 	$(call if_changed,shipped)
 
+extra-y += bswapdi.c
+$(obj)/bswapdi.c: $(obj)/%.c: $(srctree)/arch/mips/lib/%.c FORCE
+	$(call if_changed,shipped)
+
 targets := $(notdir $(vmlinuzobjs-y))
 
 targets += vmlinux.bin