ARM: kexec: fix kexec for Keystone 2 (0719392a) · Commits · 戴 / test

Provide kexec with the boot view of memory by overriding the normal kexec translation functions added in a previous patch. We also need to fix a call to memblock in machine_kexec_prepare() so that we provide it with a running-view physical address rather than a boot- view physical address. Link: http://lkml.kernel.org/r/E1b8koa-0004Hl-Ey@rmk-PC.armlinux.org.uk Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk> Cc: Keerthy <j-keerthy@ti.com> Cc: Pratyush Anand <panand@redhat.com> Cc: Vitaly Andrianov <vitalya@ti.com> Cc: Eric Biederman <ebiederm@xmission.com> Cc: Dave Young <dyoung@redhat.com> Cc: Baoquan He <bhe@redhat.com> Cc: Vivek Goyal <vgoyal@redhat.com> Cc: Simon Horman <horms@verge.net.au> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

arch/arm/include/asm/kexec.h

+24 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,30 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
		/* Function pointer to optional machine-specific reinitialization */
		extern void (*kexec_reinit)(void);

		static inline unsigned long phys_to_boot_phys(phys_addr_t phys)
		{
		return phys_to_idmap(phys);
		}
		#define phys_to_boot_phys phys_to_boot_phys

		static inline phys_addr_t boot_phys_to_phys(unsigned long entry)
		{
		return idmap_to_phys(entry);
		}
		#define boot_phys_to_phys boot_phys_to_phys

		static inline unsigned long page_to_boot_pfn(struct page *page)
		{
		return page_to_pfn(page) + (arch_phys_to_idmap_offset >> PAGE_SHIFT);
		}
		#define page_to_boot_pfn page_to_boot_pfn

		static inline struct page *boot_pfn_to_page(unsigned long boot_pfn)
		{
		return pfn_to_page(boot_pfn - (arch_phys_to_idmap_offset >> PAGE_SHIFT));
		}
		#define boot_pfn_to_page boot_pfn_to_page

		#endif /* __ASSEMBLY__ */

		#endif /* CONFIG_KEXEC */

arch/arm/kernel/machine_kexec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ int machine_kexec_prepare(struct kimage *image)
		for (i = 0; i < image->nr_segments; i++) {
		current_segment = &image->segment[i];

		if (!memblock_is_region_memory(current_segment->mem,
		if (!memblock_is_region_memory(idmap_to_phys(current_segment->mem),
		current_segment->memsz))
		return -EINVAL;

Admin message