Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b68239ee authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Don't overwrite flat device tree with kdump kernel 



It's possible for prom_init to allocate the flat device tree inside the
kdump crash kernel region. If this happens, when we load the kdump kernel we
overwrite the flattened device tree, which is bad.

We could make prom_init try and avoid allocating inside the crash kernel
region, but then we run into issues if the crash kernel region uses all the
space inside the RMO. The easiest solution is to move the flat device tree
once we're running in the kernel.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b4fd884a

arch/powerpc/kernel/prom.c

+27 −0
Original line number Diff line number Diff line
@@ -1922,3 +1922,30 @@ int prom_update_property(struct device_node *np, 


	return 0;

}



#ifdef CONFIG_KEXEC

/* We may have allocated the flat device tree inside the crash kernel region

 * in prom_init. If so we need to move it out into regular memory. */

void kdump_move_device_tree(void)

{

	unsigned long start, end;

	struct boot_param_header *new;



	start = __pa((unsigned long)initial_boot_params);

	end = start + initial_boot_params->totalsize;



	if (end < crashk_res.start || start > crashk_res.end)

		return;



	new = (struct boot_param_header*)

		__va(lmb_alloc(initial_boot_params->totalsize, PAGE_SIZE));



	memcpy(new, initial_boot_params, initial_boot_params->totalsize);



	initial_boot_params = new;



	DBG("Flat device tree blob moved to %p\n", initial_boot_params);



	/* XXX should we unreserve the old DT? */

}

#endif /* CONFIG_KEXEC */

arch/powerpc/kernel/setup_64.c

+3 −0
Original line number Diff line number Diff line
@@ -398,6 +398,9 @@ void __init setup_system(void) 
{

	DBG(" -> setup_system()\n");



#ifdef CONFIG_KEXEC

	kdump_move_device_tree();

#endif

	/*

	 * Unflatten the device-tree passed by prom_init or kexec

	 */

include/asm-powerpc/prom.h

+2 −0
Original line number Diff line number Diff line
@@ -222,5 +222,7 @@ extern int of_address_to_resource(struct device_node *dev, int index, 
extern int of_pci_address_to_resource(struct device_node *dev, int bar,

				      struct resource *r);



extern void kdump_move_device_tree(void);



#endif /* __KERNEL__ */

#endif /* _POWERPC_PROM_H */