From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756931AbcANWYu (ORCPT ); Thu, 14 Jan 2016 17:24:50 -0500 Received: from mga09.intel.com ([134.134.136.24]:57144 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756510AbcANWY0 (ORCPT ); Thu, 14 Jan 2016 17:24:26 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,296,1449561600"; d="scan'208";a="860771608" From: Andy Shevchenko To: Robert Elliott , Matt Fleming , Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , linux-kernel@vger.kernel.org, Rasmus Villemoes , Brian Norris , Hariprasad S Cc: Andy Shevchenko Subject: [PATCH v2 07/11] x86/efi: print size and base in binary units in efi_print_memmap Date: Fri, 15 Jan 2016 00:23:37 +0200 Message-Id: <1452810221-116505-8-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452810221-116505-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1452810221-116505-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robert Elliott Print the base address for each range in decimal alongside the size. Use a "(size @ base)" format similar to the fake_memmap kernel parameter. Print the range and base in the best-fit B, KiB, MiB, etc. units rather than always MiB. This avoids rounding, which can be misleading. Use proper IEC binary units (KiB, MiB, etc.) rather than misuse SI decimal units (KB, MB, etc.). old: efi: mem61: [Persistent Memory | | | | | | | |WB|WT|WC|UC] range=[0x0000000880000000-0x0000000c7fffffff) (16384MB) new: efi: mem61: [Persistent Memory | | | | | | | |WB|WT|WC|UC] range=[0x0000000880000000-0x0000000c7fffffff] (16 GiB @ 34 GiB) Signed-off-by: Robert Elliott Signed-off-by: Andy Shevchenko --- arch/x86/platform/efi/efi.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index e0846b5..f219e9f 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -225,21 +225,20 @@ int __init efi_memblock_x86_reserve_range(void) void __init efi_print_memmap(void) { #ifdef EFI_DEBUG - efi_memory_desc_t *md; void *p; int i; for (p = memmap.map, i = 0; p < memmap.map_end; p += memmap.desc_size, i++) { + efi_memory_desc_t *md = p; + u64 size = md->num_pages << EFI_PAGE_SHIFT; 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] (%pl @ %pl)\n", i, efi_md_typeattr_format(buf, sizeof(buf), md), - md->phys_addr, - md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1, - (md->num_pages >> (20 - EFI_PAGE_SHIFT))); + md->phys_addr, md->phys_addr + size - 1, + &size, &md->phys_addr); } #endif /* EFI_DEBUG */ } -- 2.6.4