lkml.org 
[lkml]   [2018]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v4 1/4] x86/devicetree: Initialize device tree before using it
    Commit 08d53aa58cb162e6 ("of/fdt: export fdt blob as /sys/firmware/fdt")
    adds CRC32 calculation in early_init_dt_verify() and checking in late
    initcall of_fdt_raw_init(), making early_init_dt_verify() mandatory.
    Required call to early_init_dt_verify() was not added to the x86-specific
    implementation, causing failure to create sysfs entry in of_fdt_raw_init().

    Signed-off-by: Ivan Gorinov <ivan.gorinov@intel.com>
    ---
    arch/x86/kernel/devicetree.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
    index 25de5f6..63d2ebc 100644
    --- a/arch/x86/kernel/devicetree.c
    +++ b/arch/x86/kernel/devicetree.c
    @@ -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);
    }
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-03-07 20:54    [W:2.381 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site