From patchwork Mon Jul 19 14:53:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 479932 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4240817jao; Mon, 19 Jul 2021 08:38:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZp6fvfBXswm7sswHuZ9ho2YW5rdv0iwqI/+859jJP8ZOWzYg6rftUwGC0oYvqqIituFAR X-Received: by 2002:a92:c8c5:: with SMTP id c5mr962721ilq.1.1626708707452; Mon, 19 Jul 2021 08:31:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626708707; cv=none; d=google.com; s=arc-20160816; b=P6jjXc24S7iMzExxG/Qaec1hxUWRtuy8kduPCa+lePytooqReUqcmEAWcFR78Icexm vWlx/Pye/ZLpcPizf9NszWLA1j+nM5uWFgYTHXc5DCymnlwXg8bDtgtlpcT+2ilce0KW KD4JvrYAbLerC/VtAuAxO9eRh3VYudn7Eo2e2QLrIDTy8v73nPCdj14b0Ogh8PLQrV3O viW7Gs/mcO6Rqatr0Zpr2//lhKEjIcU4wJMgzneqh1cFU7p0j3sQ07/9cC6PtFuRmM+e +1m4RDDKO7Boy+74J6KCCMIQ/Sdrwhc5T4AxH801528mEcGG6lmlW7FDspT9SEjYoib8 5cnw== 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=PcP3Ig/qX54mSFONNQZXobKYbo4Gi7qdDegACde7/KQ=; b=bR5BrSkNmncCMpvwrHh/noZ6tbV3ZnnQS0eobJ6tm2cTkB+g5xznflY4HG9LPUkw+t y1Rg/2Sgu/uBww07/viPcA5mtMbiHWH7CwgZER8gzTVy2qBK5tte7tN0FX3UopKG3dGo 8kghXVuJVFFX/HO4FtZmFGptJ2pnSjQpF1afZIJbzlfegd3CrMgwSBJ1cl7hRREDRA50 W95G5cCMaZvLagXwNDPeYKLOrBuOdotQ80zYi/yJiJKFGLs4WVHrJbNbO4/LsUg+Qwae BJOS+lwYdMdBaJpNYOtPS0G7s8M+SZpXSZFWbFHXr2QBOIMj5X3Kn19vIJjDKZUkeEQq gHYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zL0G2NoW; 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 g5si10245056ilk.74.2021.07.19.08.31.47; Mon, 19 Jul 2021 08:31:47 -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=zL0G2NoW; 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 S238880AbhGSOuN (ORCPT + 12 others); Mon, 19 Jul 2021 10:50:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:40444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344236AbhGSOsn (ORCPT ); Mon, 19 Jul 2021 10:48:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4006F60FED; Mon, 19 Jul 2021 15:27:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708442; bh=MHBxAPKyqc+lJw8lq8G4ATINV2DINglleA8QB3vIpRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zL0G2NoWIE+B7HVyjrLgHw2nQv79QI5nKaPkgqhIptxDy1iYzEXV3XUtiugyjVWJQ e7f66+HqnTGKf/T/Zg7bzvimIYEUietrr3XCri9kdngBUakL5G5ha2clmXOBRYXD4u 0vZRGh1cHkNW07KNWTly81eqZRIaHEPnc2ZlJJvY= 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.14 312/315] mips: always link byteswap helpers into decompressor Date: Mon, 19 Jul 2021 16:53:21 +0200 Message-Id: <20210719144953.740204246@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.861561397@linuxfoundation.org> References: <20210719144942.861561397@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 516e593a8ee9..b5f08fac5ddc 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 bswapsi.c $(obj)/ashldi3.o $(obj)/bswapsi.o: KBUILD_CFLAGS += -I$(srctree)/arch/mips/lib