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

Commit 628df9dc authored by Ivan Gorinov's avatar Ivan Gorinov Committed by Thomas Gleixner
Browse files

x86/devicetree: Initialize device tree before using it 



Commit 08d53aa5 added CRC32 calculation in early_init_dt_verify() and
checking in late initcall of_fdt_raw_init(), making early_init_dt_verify()
mandatory.

The required call to early_init_dt_verify() was not added to the
x86-specific implementation, causing failure to create the sysfs entry in
of_fdt_raw_init().

Fixes: 08d53aa5 ("of/fdt: export fdt blob as /sys/firmware/fdt")
Signed-off-by: default avatarIvan Gorinov <ivan.gorinov@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Rob Herring <robh+dt@kernel.org>
Link: https://lkml.kernel.org/r/c8c7e941efc63b5d25ebf9b6350b0f3df38f6098.1520450752.git.ivan.gorinov@intel.com
parent ac95090a

arch/x86/kernel/devicetree.c

+5 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/of_irq.h>

#include <linux/libfdt.h>

#include <linux/slab.h>

#include <linux/pci.h>

#include <linux/of_pci.h>
@@ -270,14 +271,15 @@ static void __init x86_flattree_get_config(void) 


	map_len = max(PAGE_SIZE - (initial_dtb & ~PAGE_MASK), (u64)128);



	initial_boot_params = dt = early_memremap(initial_dtb, map_len);

	size = of_get_flat_dt_size();

	dt = early_memremap(initial_dtb, map_len);

	size = fdt_totalsize(dt);

	if (map_len < size) {

		early_memunmap(dt, map_len);

		initial_boot_params = dt = early_memremap(initial_dtb, size);

		dt = early_memremap(initial_dtb, size);

		map_len = size;

	}



	early_init_dt_verify(dt);

	unflatten_and_copy_device_tree();

	early_memunmap(dt, map_len);

}