lkml.org 
[lkml]   [2016]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:efi/core] x86/efi: Show actual ending addresses in efi_print_memmap
    Commit-ID:  1e82b94790709fb2a22d16d53bb04d751fb3878d
    Gitweb: http://git.kernel.org/tip/1e82b94790709fb2a22d16d53bb04d751fb3878d
    Author: Robert Elliott <elliott@hpe.com>
    AuthorDate: Mon, 1 Feb 2016 22:07:05 +0000
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Wed, 3 Feb 2016 11:41:20 +0100

    x86/efi: Show actual ending addresses in efi_print_memmap

    Adjust efi_print_memmap to print the real end address of each
    range, not 1 byte beyond. This matches other prints like those
    for SRAT and nosave memory.

    While investigating grub persistent memory corruption issues, it
    was helpful to make this table match the ending address
    convention used by:
    * the kernel's e820 table prints
    BIOS-e820: [mem 0x0000001680000000-0x0000001c7fffffff] reserved
    * the kernel's nosave memory prints
    PM: Registered nosave memory: [mem 0x880000000-0xc7fffffff]
    * the kernel's ACPI System Resource Affinity Table prints
    SRAT: Node 1 PXM 1 [mem 0x480000000-0x87fffffff]
    * grub's lsmmap and lsefimmap commands
    reserved 0000001680000000-0000001c7fffffff 00600000 24GiB UC WC WT WB NV
    * the UEFI shell's memmap command
    Reserved 000000007FC00000-000000007FFFFFFF 0000000000000400 0000000000000001

    For example, if you grep all the various logs for c7fffffff, you
    won't find the kernel's line if it uses c80000000.

    Also, change the closing ) to ] to match the opening [.

    old:
    efi: mem61: [Persistent Memory | | | | | | | |WB|WT|WC|UC] range=[0x0000000880000000-0x0000000c80000000) (16384MB)

    new:
    efi: mem61: [Persistent Memory | | | | | | | |WB|WT|WC|UC] range=[0x0000000880000000-0x0000000c7fffffff] (16384MB)

    Signed-off-by: Robert Elliott <elliott@hpe.com>
    Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
    Reviewed-by: Laszlo Ersek <lersek@redhat.com>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Brian Gerst <brgerst@gmail.com>
    Cc: Denys Vlasenko <dvlasenk@redhat.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Leif Lindholm <leif.lindholm@linaro.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: linux-efi@vger.kernel.org
    Link: http://lkml.kernel.org/r/1454364428-494-12-git-send-email-matt@codeblueprint.co.uk
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/platform/efi/efi.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
    index bdd9477..e80826e 100644
    --- a/arch/x86/platform/efi/efi.c
    +++ b/arch/x86/platform/efi/efi.c
    @@ -235,10 +235,10 @@ void __init efi_print_memmap(void)
    char buf[64];

    md = p;
    - pr_info("mem%02u: %s range=[0x%016llx-0x%016llx) (%lluMB)\n",
    + pr_info("mem%02u: %s range=[0x%016llx-0x%016llx] (%lluMB)\n",
    i, efi_md_typeattr_format(buf, sizeof(buf), md),
    md->phys_addr,
    - md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),
    + md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1,
    (md->num_pages >> (20 - EFI_PAGE_SHIFT)));
    }
    #endif /* EFI_DEBUG */
    \
     
     \ /
      Last update: 2016-02-03 13:01    [W:5.606 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site