From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751710AbcBCLfb (ORCPT ); Wed, 3 Feb 2016 06:35:31 -0500 Received: from terminus.zytor.com ([198.137.202.10]:55726 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750871AbcBCLfW (ORCPT ); Wed, 3 Feb 2016 06:35:22 -0500 Date: Wed, 3 Feb 2016 03:33:57 -0800 From: tip-bot for Robert Elliott Message-ID: Cc: torvalds@linux-foundation.org, bp@alien8.de, brgerst@gmail.com, tglx@linutronix.de, dvlasenk@redhat.com, peterz@infradead.org, leif.lindholm@linaro.org, matt@codeblueprint.co.uk, elliott@hpe.com, mingo@kernel.org, ard.biesheuvel@linaro.org, linux-kernel@vger.kernel.org, lersek@redhat.com, luto@amacapital.net, hpa@zytor.com Reply-To: peterz@infradead.org, leif.lindholm@linaro.org, torvalds@linux-foundation.org, bp@alien8.de, tglx@linutronix.de, brgerst@gmail.com, dvlasenk@redhat.com, lersek@redhat.com, hpa@zytor.com, luto@amacapital.net, elliott@hpe.com, matt@codeblueprint.co.uk, mingo@kernel.org, ard.biesheuvel@linaro.org, linux-kernel@vger.kernel.org In-Reply-To: <1454364428-494-12-git-send-email-matt@codeblueprint.co.uk> References: <1454364428-494-12-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] x86/efi: Show actual ending addresses in efi_print_memmap Git-Commit-ID: 1e82b94790709fb2a22d16d53bb04d751fb3878d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1e82b94790709fb2a22d16d53bb04d751fb3878d Gitweb: http://git.kernel.org/tip/1e82b94790709fb2a22d16d53bb04d751fb3878d Author: Robert Elliott AuthorDate: Mon, 1 Feb 2016 22:07:05 +0000 Committer: Ingo Molnar 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 Signed-off-by: Matt Fleming Reviewed-by: Laszlo Ersek Cc: Andy Lutomirski Cc: Ard Biesheuvel Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Leif Lindholm Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner 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 --- 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 */