Kexec Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Pingfan Liu <piliu@redhat.com>
To: kexec@lists.infradead.org
Cc: Jeremy Linton <jeremy.linton@arm.com>,
	Pingfan Liu <piliu@redhat.com>,
	horms@verge.net.au, ardb@kernel.org
Subject: [PATCHv5 8/8] arm64: Hook up the ZBOOT support as vmlinuz
Date: Mon, 17 Jul 2023 21:07:32 +0800	[thread overview]
Message-ID: <20230717130732.22710-9-piliu@redhat.com> (raw)
In-Reply-To: <20230717130732.22710-1-piliu@redhat.com>

From: Jeremy Linton <jeremy.linton@arm.com>

Add the previously defined _probe() and _usage() routines
to the kexec file types table, and build the new module.

It should be noted that this "vmlinuz" support reuses the
"Image" support to actually load the resulting image after
it has been decompressed to a temporary file.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Pingfan Liu <piliu@redhat.com>
To: kexec@lists.infradead.org
Cc: horms@verge.net.au
Cc: ardb@kernel.org
Cc: jeremy.linton@arm.com
---
 kexec/arch/arm64/Makefile      | 3 ++-
 kexec/arch/arm64/kexec-arm64.c | 1 +
 kexec/arch/arm64/kexec-arm64.h | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/kexec/arch/arm64/Makefile b/kexec/arch/arm64/Makefile
index d27c8ee..900f246 100644
--- a/kexec/arch/arm64/Makefile
+++ b/kexec/arch/arm64/Makefile
@@ -16,7 +16,8 @@ arm64_KEXEC_SRCS += \
 	kexec/arch/arm64/kexec-elf-arm64.c \
 	kexec/arch/arm64/kexec-uImage-arm64.c \
 	kexec/arch/arm64/kexec-image-arm64.c \
-	kexec/arch/arm64/kexec-zImage-arm64.c
+	kexec/arch/arm64/kexec-zImage-arm64.c \
+	kexec/arch/arm64/kexec-vmlinuz-arm64.c
 
 arm64_UIMAGE = kexec/kexec-uImage.c
 
diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
index f391f77..1812a88 100644
--- a/kexec/arch/arm64/kexec-arm64.c
+++ b/kexec/arch/arm64/kexec-arm64.c
@@ -76,6 +76,7 @@ struct file_type file_type[] = {
 	{"Image", NULL, image_arm64_load, image_arm64_usage, image_arm64_probe},
 	{"uImage", NULL, uImage_arm64_load, uImage_arm64_usage, uImage_arm64_probe},
 	{"zImage", NULL, zImage_arm64_load, zImage_arm64_usage, zImage_arm64_probe},
+	{"vmlinuz", NULL, image_arm64_load, pez_arm64_usage, pez_arm64_probe},
 };
 
 int file_types = sizeof(file_type) / sizeof(file_type[0]);
diff --git a/kexec/arch/arm64/kexec-arm64.h b/kexec/arch/arm64/kexec-arm64.h
index eeb35ae..ec8936c 100644
--- a/kexec/arch/arm64/kexec-arm64.h
+++ b/kexec/arch/arm64/kexec-arm64.h
@@ -49,6 +49,9 @@ int zImage_arm64_load(int argc, char **argv, const char *kernel_buf,
 	off_t kernel_size, struct kexec_info *info);
 void zImage_arm64_usage(void);
 
+int pez_arm64_probe(const char *kern_fname, struct parsed_info *info);
+void pez_arm64_usage(void);
+
 
 extern off_t initrd_base;
 extern off_t initrd_size;
-- 
2.31.1


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

  parent reply	other threads:[~2023-07-17 13:09 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-17 13:07 [PATCHv5 0/8] arm64: zboot support Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 1/8] arm64: Fix some issues with zImage _probe() Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 2/8] kexec: Isolate probe method Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 3/8] kexec: Introduce a new image probe method 'probe2' Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 4/8] arm64: Transfer from probe() to probe2() Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 5/8] kexec: Drop condition macro for aarch64 Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 6/8] kexec/zboot: Add arch independent zboot support Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 7/8] arm64: Add ZBOOT PE containing compressed image support Pingfan Liu
2023-07-17 13:07 ` Pingfan Liu [this message]
2023-07-19  3:02 ` [PATCHv5 0/8] arm64: zboot support Dave Young
2023-07-20  2:04   ` Pingfan Liu
2023-07-20  7:29     ` Dave Young
2023-07-20  8:59       ` Pingfan Liu
2023-07-20 10:08         ` Dave Young
2023-07-20 10:08           ` Dave Young

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=20230717130732.22710-9-piliu@redhat.com \
    --to=piliu@redhat.com \
    --cc=ardb@kernel.org \
    --cc=horms@verge.net.au \
    --cc=jeremy.linton@arm.com \
    --cc=kexec@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox