From patchwork Mon Jul 19 14:53:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 479968 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4250188jao; Mon, 19 Jul 2021 08:48:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxq6cy1JzvfcPnuco6wzdec4lF8jyAtOAh8vcrZ0tpcEJ9oRUhWDu/0rDfCkZ7tsRUormYM X-Received: by 2002:aa7:ca1a:: with SMTP id y26mr35490828eds.231.1626709687520; Mon, 19 Jul 2021 08:48:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709687; cv=none; d=google.com; s=arc-20160816; b=qNrfxXKpFJfmi5HKEYkumSz06s/rheIFXlBUz4bC8TVtHFH+vNwFWfG7sysLUVzSBq hfumbTklv9Pdt73EA8HE75A+l0sPMapi2Mm+M2TjosJumhQCUx3a4Pnfgom04MHW0XSt 32ZItQoIcV9KfbQGNBZ//erl7xk3GvdpSY6Yk6wNJ2KMzQ5Kyck+/Z3L8kojToLQwOLy 3v/gz6g1MPO+APiaNaBCSw/CPIPgt80vfspx3+uOKr35wgnbfyO0Db/wJKAnkVLmwPiI i/Dqz94UTZyXPQKTLbVwIo85MBmqOapTIuwYsnO2/50mDX6R2WLc6Jk+5e9iGipZieBE l0Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dT/FDh3TZ5tYqygIjJ/f/fD7M/0j7TWECQgV46+bUu8=; b=ztnAsTE4ATizYmbh555xHnzkHRFVYTCWgigmg0EcE46wSC4kn0vJBX4l/IWYozYpnR vTTNwa7gc5WL2hdd8VIxSjX64S91fPitPhx8pNjb/zL3gUVmRigOvK7rJdPzWdZC33jd 0jzSkSwW6dVajN7HEK3vGwdyD7rxcdZQ+hd3e6m8FIpxnp3FK/8L3Pb1KE9qoaQ41PcS KNP9PBh4n/Ps2rhHck36bKyI8YvykuKYz4YDOODtfy3fd+2tWWdbLpUdMM3Sf4IntlnZ zR6jM7iWg/FqQksOflvCmNrdyg/4Y0/2dc+3V38Hv5py8ws2FkAawRYOyBfJ1y4C4UuJ Vg8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cUmFrpoc; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g15si1692108edt.268.2021.07.19.08.48.07; Mon, 19 Jul 2021 08:48:07 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cUmFrpoc; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344024AbhGSPHW (ORCPT + 12 others); Mon, 19 Jul 2021 11:07:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:59412 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345737AbhGSPE4 (ORCPT ); Mon, 19 Jul 2021 11:04:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 553EF6120E; Mon, 19 Jul 2021 15:45:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709516; bh=ilAAsza47fyhNzBq535goglq9AzNyrdKAK5+/wxC07o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cUmFrpocJN1t/XJy35A1T5GTX2n4U4GwRHRQ6j5FgCF4FptKiTXL9PB1sW4jqZfxd CeWbtDXKcCl5+mHG8uqUqqcqZmG5dvThDTwE3KCqwpG8y8LUiym85O49febUhGeOQA xDepBavtrD45QJaluY+4gGh3PWx6oohMFHIYitng= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 4.19 416/421] mips: always link byteswap helpers into decompressor Date: Mon, 19 Jul 2021 16:53:47 +0200 Message-Id: <20210719145000.734302278@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit cddc40f5617e53f97ef019d5b29c1bd6cbb031ec ] My series to clean up the unaligned access implementation across architectures caused some mips randconfig builds to fail with: mips64-linux-ld: arch/mips/boot/compressed/decompress.o: in function `decompress_kernel': decompress.c:(.text.decompress_kernel+0x54): undefined reference to `__bswapsi2' It turns out that this problem has already been fixed for the XZ decompressor but now it also shows up in (at least) LZO and LZ4. From my analysis I concluded that the compiler could always have emitted those calls, but the different implementation allowed it to make otherwise better decisions about not inlining the byteswap, which results in the link error when the out-of-line code is missing. While it could be addressed by adding it to the two decompressor implementations that are known to be affected, but as this only adds 112 bytes to the kernel, the safer choice is to always add them. Fixes: c50ec6787536 ("MIPS: zboot: Fix the build with XZ compression on older GCC versions") Fixes: 0652035a5794 ("asm-generic: unaligned: remove byteshift helpers") Link: https://lore.kernel.org/linux-mm/202106301304.gz2wVY9w-lkp@intel.com/ Link: https://lore.kernel.org/linux-mm/202106260659.TyMe8mjr-lkp@intel.com/ Link: https://lore.kernel.org/linux-mm/202106172016.onWT6Tza-lkp@intel.com/ Link: https://lore.kernel.org/linux-mm/202105231743.JJcALnhS-lkp@intel.com/ Signed-off-by: Arnd Bergmann Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/boot/compressed/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile index 378cbfb31ee7..1d6ebbc2a5d0 100644 --- a/arch/mips/boot/compressed/Makefile +++ b/arch/mips/boot/compressed/Makefile @@ -33,7 +33,7 @@ KBUILD_AFLAGS := $(KBUILD_AFLAGS) -D__ASSEMBLY__ \ KCOV_INSTRUMENT := n # decompressor objects (linked with vmlinuz) -vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o +vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o $(obj)/bswapsi.o ifdef CONFIG_DEBUG_ZBOOT vmlinuzobjs-$(CONFIG_DEBUG_ZBOOT) += $(obj)/dbg.o @@ -47,7 +47,7 @@ extra-y += uart-ath79.c $(obj)/uart-ath79.c: $(srctree)/arch/mips/ath79/early_printk.c $(call cmd,shipped) -vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o $(obj)/bswapsi.o +vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o extra-y += ashldi3.c $(obj)/ashldi3.c: $(obj)/%.c: $(srctree)/lib/%.c FORCE