• Serge Semin's avatar
    Revert "mips: Manually call fdt_init_reserved_mem() method" · 40880243
    Serge Semin authored
    This reverts commit 3751cbda.
    
    Originally the patch was created to fix the reserved-memory DT-node
    parsing failure on the early stages of the platform memory initialization.
    That happened due to the two early memory allocators utilization that
    time: bootmem and memblock. At first the platform-specific memory mapping
    array was initialized. Then the early_init_fdt_scan_reserved_mem() was
    called, which couldn't fully parse the "reserved-memory" DT-node since
    neither memblock nor bootmem allocators hadn't been initialized at that
    stage, so the fdt_init_reserved_mem() method failed on the memory
    allocation calls. Only after that the platform-specific memory mapping
    were used to create proper bootmem and memblock structures and let the
    early memory allocations work.  That's why we had to call the
    fdt_init_reserved_mem() method one more time to retry the initialization
    of the features like CMA.
    
    The necessity to have that fix was disappeared after the full memblock
    support had been added to the MIPS kernel and all plat_mem_setup() had
    been fixed to add the memory regions right into the memblock memory pool.
    Let's revert that patch then especially after having Paul reported that
    the second fdt_init_reserved_mem() call causes the reserved memory pool
    being created twice bigger than implied.
    
    Fixes: a94e4f24 ("MIPS: init: Drop boot_mem_map")
    Reported-by: default avatarPaul Cercueil <paul@crapouillou.net>
    Signed-off-by: default avatarSerge Semin <Sergey.Semin@baikalelectronics.ru>
    Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
    40880243
setup.c 20.4 KB