bec0de4cfa
KEXEC needs the new kernel's load address to be aligned on a page boundary (see sanity_check_segment_list()), but on MIPS the default vmlinuz load address is only explicitly aligned to 16 bytes. Since the largest PAGE_SIZE supported by MIPS kernels is 64KB, increase the alignment calculated by calc_vmlinuz_load_addr to 64KB. Signed-off-by: Huacai Chen <chenhc@lemote.com> Signed-off-by: Paul Burton <paul.burton@mips.com> Patchwork: https://patchwork.linux-mips.org/patch/21131/ Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <james.hogan@mips.com> Cc: Steven J . Hill <Steven.Hill@cavium.com> Cc: linux-mips@linux-mips.org Cc: Fuxin Zhang <zhangfx@lemote.com> Cc: Zhangjin Wu <wuzhangjin@gmail.com> Cc: <stable@vger.kernel.org> # 2.6.36+
59 lines
1.4 KiB
C
59 lines
1.4 KiB
C
/*
|
|
* Copyright (C) 2010 "Wu Zhangjin" <wuzhangjin@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <errno.h>
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include "../../../../include/linux/sizes.h"
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
unsigned long long vmlinux_size, vmlinux_load_addr, vmlinuz_load_addr;
|
|
struct stat sb;
|
|
|
|
if (argc != 3) {
|
|
fprintf(stderr, "Usage: %s <pathname> <vmlinux_load_addr>\n",
|
|
argv[0]);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
if (stat(argv[1], &sb) == -1) {
|
|
perror("stat");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
/* Convert hex characters to dec number */
|
|
errno = 0;
|
|
if (sscanf(argv[2], "%llx", &vmlinux_load_addr) != 1) {
|
|
if (errno != 0)
|
|
perror("sscanf");
|
|
else
|
|
fprintf(stderr, "No matching characters\n");
|
|
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
vmlinux_size = (uint64_t)sb.st_size;
|
|
vmlinuz_load_addr = vmlinux_load_addr + vmlinux_size;
|
|
|
|
/*
|
|
* Align with 64KB: KEXEC needs load sections to be aligned to PAGE_SIZE,
|
|
* which may be as large as 64KB depending on the kernel configuration.
|
|
*/
|
|
|
|
vmlinuz_load_addr += (SZ_64K - vmlinux_size % SZ_64K);
|
|
|
|
printf("0x%llx\n", vmlinuz_load_addr);
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|