lkml.org 
[lkml]   [2021]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 299/425] Revert "of/fdt: Make sure no-map does not remove already reserved regions"
    Date
    From: Quentin Perret <qperret@google.com>

    This reverts commit 74f2678aab60c9915daa83e6e23d31a896932d9d.
    It is not really a fix, and the backport misses dependencies, which
    breaks existing platforms.

    Reported-by: Alexandre TORGUE <alexandre.torgue@foss.st.com>
    Signed-off-by: Quentin Perret <qperret@google.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/of/fdt.c | 10 +---------
    1 file changed, 1 insertion(+), 9 deletions(-)

    --- a/drivers/of/fdt.c
    +++ b/drivers/of/fdt.c
    @@ -1172,16 +1172,8 @@ int __init __weak early_init_dt_mark_hot
    int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
    phys_addr_t size, bool nomap)
    {
    - if (nomap) {
    - /*
    - * If the memory is already reserved (by another region), we
    - * should not allow it to be marked nomap.
    - */
    - if (memblock_is_region_reserved(base, size))
    - return -EBUSY;
    -
    + if (nomap)
    return memblock_mark_nomap(base, size);
    - }
    return memblock_reserve(base, size);
    }


    \
     
     \ /
      Last update: 2021-05-20 12:09    [W:4.124 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site