Hi Geoff, On 26/07/2016:08:18:57 PM, Geoff Levand wrote: > From: Pratyush Anand <panand at redhat.com> > > Signed-off-by: Pratyush Anand <panand at redhat.com> > [Reworked and cleaned up] You removed page_offset calculation in rework. I am unable to understand that how arm64_mem.page_offset will be filled up now for binary image case. I think, we still need to keep page_offset user input. You may take following two patches which does this, or you may leave binary image support patch which I will send after your patches are merged. https://github.com/pratyushanand/kexec-tools/commit/5b7e49a75d1d6cd4ac846f50ff10275fd54cb545 https://github.com/pratyushanand/kexec-tools/commit/a0ce0ce673755c4061c1f081170a3a75dfa1d1fb ~Pratyush > Signed-off-by: Geoff Levand <geoff at infradead.org> > --- > kexec/arch/arm64/kexec-image-arm64.c | 31 +++++++++++++++++++++++++------ > 1 file changed, 25 insertions(+), 6 deletions(-) > > diff --git a/kexec/arch/arm64/kexec-image-arm64.c b/kexec/arch/arm64/kexec-image-arm64.c > index 84386f7..cad7c73 100644 > --- a/kexec/arch/arm64/kexec-image-arm64.c > +++ b/kexec/arch/arm64/kexec-image-arm64.c > @@ -24,21 +24,40 @@ int image_arm64_probe(const char *kernel_buf, off_t kernel_size) > return -1; > } > > - fprintf(stderr, "kexec: ARM64 binary image files are currently NOT SUPPORTED.\n"); > - > - return -1; > + return 0; > } > > int image_arm64_load(int argc, char **argv, const char *kernel_buf, > off_t kernel_size, struct kexec_info *info) > { > - return -EFAILED; > + const struct arm64_image_header *h; > + unsigned long image_base; > + > + h = (const struct arm64_image_header *)(kernel_buf); > + > + if (arm64_process_image_header(h)) > + return -EINVAL; > + > + dbgprintf("%s: text_offset: %016lx\n", __func__, > + arm64_mem.text_offset); > + dbgprintf("%s: image_size: %016lx\n", __func__, > + arm64_mem.image_size); > + dbgprintf("%s: phys_offset: %016lx\n", __func__, > + arm64_mem.phys_offset); > + dbgprintf("%s: PE format: %s\n", __func__, > + (arm64_header_check_pe_sig(h) ? "yes" : "no")); > + > + image_base = get_phys_offset() + arm64_mem.text_offset; > + > + add_segment_phys_virt(info, kernel_buf, kernel_size, image_base, > + arm64_mem.image_size, 0); > + > + return arm64_load_other_segments(info, image_base); > } > > void image_arm64_usage(void) > { > printf( > " An ARM64 binary image, compressed or not, big or little endian.\n" > -" Typically an Image, Image.gz or Image.lzma file.\n" > -" This file type is currently NOT SUPPORTED.\n\n"); > +" Typically an Image, Image.gz or Image.lzma file.\n\n"); > } > -- > 2.5.0
