From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C1D34C4167B for ; Fri, 15 Dec 2023 20:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VD7P0JsXs0varQhxt4KtW2Wfoazsn1EzEZ+TjKWq5QY=; b=DqIF8qoP3PIifq /K7HRFOg3gRYBf2POzwgGFxs9GiIZIeLY/nuogiOIie7kiQF0faDSzssy+W3lDJQCdIFiWvo8kj1o gIQEofeQxE0SJ4BFE9fumksePi/1tW7hFuTp8s+tLtUDLpvy7+380tfmDQb2jGrELjiekaUFVwJmi 0rcZNZXJP+QcERURZ0GWjMWtQpRVXkEH1qiQdxNnv6syZwVPzivHTKx+tCNnhLTR3WtAlwbmCDmQS HMESf63KQLOCLCRDCcfAzBDMIOK9693smr7Cm09Dkg1tI1G6VhdqUMzAnY5VtQktleV94Zualdg+1 D5G7RtcjppNiD61aU04w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rEEPU-004PzQ-2P; Fri, 15 Dec 2023 20:03:48 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rEEPS-004PxA-0h for linux-arm-kernel@lists.infradead.org; Fri, 15 Dec 2023 20:03:47 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 813B7CE2FCD; Fri, 15 Dec 2023 20:03:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D535CC433C7; Fri, 15 Dec 2023 20:03:41 +0000 (UTC) Date: Fri, 15 Dec 2023 20:03:39 +0000 From: Catalin Marinas To: Josef Bacik Cc: will@kernel.org, linux-arm-kernel@lists.infradead.org, Ard Biesheuvel Subject: Re: [PATCH] arm64: properly install vmlinuz.efi Message-ID: References: <6edb1402769c2c14c4fbef8f7eaedb3167558789.1702570674.git.josef@toxicpanda.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <6edb1402769c2c14c4fbef8f7eaedb3167558789.1702570674.git.josef@toxicpanda.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231215_120346_483780_ED98102F X-CRM114-Status: GOOD ( 18.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Dec 14, 2023 at 11:18:50AM -0500, Josef Bacik wrote: > If you select CONFIG_EFI_ZBOOT, we will generate vmlinuz.efi, and then > when we go to install the kernel we'll install the vmlinux instead > because install.sh only recognizes Image.gz as wanting the compressed > install image. With CONFIG_EFI_ZBOOT we don't get the proper kernel > installed, which means it doesn't boot, which makes for a very confused > and subsequently angry kernel developer. > > Fix this by properly installing our compressed kernel if we've enabled > CONFIG_EFI_ZBOOT. > > Signed-off-by: Josef Bacik > --- > arch/arm64/boot/install.sh | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/install.sh b/arch/arm64/boot/install.sh > index 7399d706967a..9b7a09808a3d 100755 > --- a/arch/arm64/boot/install.sh > +++ b/arch/arm64/boot/install.sh > @@ -17,7 +17,8 @@ > # $3 - kernel map file > # $4 - default install path (blank if root directory) > > -if [ "$(basename $2)" = "Image.gz" ]; then > +if [ "$(basename $2)" = "Image.gz" ] || [ "$(basename $2)" = "vmlinuz.efi" ] > +then > # Compressed install > echo "Installing compressed kernel" > base=vmlinuz + Ard who added the EFI_ZBOOT support. If we go with this fix we should probably also add: Fixes: c37b830fef13 ("arm64: efi: enable generic EFI compressed boot") Cc: # 6.1.x But is arm64 the only one with this issue? -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel