From: Catalin Marinas <catalin.marinas@arm.com>
To: Josef Bacik <josef@toxicpanda.com>
Cc: will@kernel.org, linux-arm-kernel@lists.infradead.org,
Ard Biesheuvel <ardb@kernel.org>
Subject: Re: [PATCH] arm64: properly install vmlinuz.efi
Date: Fri, 15 Dec 2023 20:03:39 +0000 [thread overview]
Message-ID: <ZXyxG9qsASMQ-1Ty@arm.com> (raw)
In-Reply-To: <6edb1402769c2c14c4fbef8f7eaedb3167558789.1702570674.git.josef@toxicpanda.com>
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 <josef@toxicpanda.com>
> ---
> 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: <stable@vger.kernel.org> # 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
next prev parent reply other threads:[~2023-12-15 20:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-14 16:18 [PATCH] arm64: properly install vmlinuz.efi Josef Bacik
2023-12-14 20:12 ` Simon Glass
2023-12-15 14:25 ` Josef Bacik
2023-12-15 17:49 ` Simon Glass
2023-12-15 20:03 ` Catalin Marinas [this message]
2023-12-15 21:43 ` Josef Bacik
2023-12-17 13:41 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZXyxG9qsASMQ-1Ty@arm.com \
--to=catalin.marinas@arm.com \
--cc=ardb@kernel.org \
--cc=josef@toxicpanda.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.