lkml.org 
[lkml]   [2017]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 077/156] efi/esrt: Cleanup bad memory map log messages
    Date
    From: Daniel Drake <drake@endlessm.com>

    [ Upstream commit 822f5845f710e57d7e2df1fd1ee00d6e19d334fe ]

    The Intel Compute Stick STCK1A8LFC and Weibu F3C platforms both
    log 2 error messages during boot:

    efi: requested map not found.
    esrt: ESRT header is not in the memory map.

    Searching the web, this seems to affect many other platforms too.
    Since these messages are logged as errors, they appear on-screen during
    the boot process even when using the "quiet" boot parameter used by
    distros.

    Demote the ESRT error to a warning so that it does not appear on-screen,
    and delete the error logging from efi_mem_desc_lookup; both callsites
    of that function log more specific messages upon failure.

    Out of curiosity I looked closer at the Weibu F3C. There is no entry in
    the UEFI-provided memory map which corresponds to the ESRT pointer, but
    hacking the code to map it anyway, the ESRT does appear to be valid with
    2 entries.

    Signed-off-by: Daniel Drake <drake@endlessm.com>
    Cc: Matt Fleming <matt@codeblueprint.co.uk>
    Acked-by: Peter Jones <pjones@redhat.com>
    Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    ---
    drivers/firmware/efi/efi.c | 1 -
    drivers/firmware/efi/esrt.c | 2 +-
    2 files changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
    index a4944e22f294..96c3e43439b6 100644
    --- a/drivers/firmware/efi/efi.c
    +++ b/drivers/firmware/efi/efi.c
    @@ -385,7 +385,6 @@ int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md)
    return 0;
    }
    }
    - pr_err_once("requested map not found.\n");
    return -ENOENT;
    }

    diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
    index 14914074f716..d81560f12437 100644
    --- a/drivers/firmware/efi/esrt.c
    +++ b/drivers/firmware/efi/esrt.c
    @@ -254,7 +254,7 @@ void __init efi_esrt_init(void)

    rc = efi_mem_desc_lookup(efi.esrt, &md);
    if (rc < 0) {
    - pr_err("ESRT header is not in the memory map.\n");
    + pr_warn("ESRT header is not in the memory map.\n");
    return;
    }

    --
    2.11.0
    \
     
     \ /
      Last update: 2017-12-07 18:27    [W:5.319 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site