diff options
| author | Pingfan Liu <piliu@redhat.com> | 2021-05-26 18:41:28 +0800 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2021-06-06 08:52:08 +0200 |
| commit | 61b8c79b0fb76490f944fd5e61f25edd81f2a46b (patch) | |
| tree | e592c02ab5e4a6d36e1ac41dcda9422ff2d08216 | |
| parent | 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c (diff) | |
arm64/crashdump-arm64: deduce the paddr of _text
Since kernel commit e2a073dde921 ("arm64: omit [_text, _stext) from
permanent kernel mapping"), the physical address of 'Kernel code' in
/proc/iomem is mapped from _text, instead, from _stext.
Taking the compatibility into account, it had better deduce the paddr of
_text despite of the unavailability through /proc/iomem. It can be
achieved by utilizing the fact _text aligned on 2MB.
Signed-off-by: Pingfan Liu <piliu@redhat.com>
Cc: Simon Horman <horms@verge.net.au>
To: kexec@lists.infradead.org
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/arm64/crashdump-arm64.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/kexec/arch/arm64/crashdump-arm64.c b/kexec/arch/arm64/crashdump-arm64.c index 38d1a0f..03d6204 100644 --- a/kexec/arch/arm64/crashdump-arm64.c +++ b/kexec/arch/arm64/crashdump-arm64.c @@ -90,8 +90,16 @@ static int iomem_range_callback(void *UNUSED(data), int UNUSED(nr), else if (strncmp(str, SYSTEM_RAM, strlen(SYSTEM_RAM)) == 0) return mem_regions_alloc_and_add(&system_memory_rgns, base, length, RANGE_RAM); - else if (strncmp(str, KERNEL_CODE, strlen(KERNEL_CODE)) == 0) - elf_info.kern_paddr_start = base; + else if (strncmp(str, KERNEL_CODE, strlen(KERNEL_CODE)) == 0) { + /* + * old: kernel_code.start = __pa_symbol(_text); + * new: kernel_code.start = __pa_symbol(_stext); + * + * By utilizing the fact that paddr(_text) should align on 2MB, plus + * _stext - _text <= 64K. + */ + elf_info.kern_paddr_start = base & ((0xffffffffffffffffUL) << 21); + } else if (strncmp(str, KERNEL_DATA, strlen(KERNEL_DATA)) == 0) elf_info.kern_size = base + length - elf_info.kern_paddr_start; |