From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965432AbcAUPXM (ORCPT ); Thu, 21 Jan 2016 10:23:12 -0500 Received: from mga11.intel.com ([192.55.52.93]:4796 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965348AbcAUPXH (ORCPT ); Thu, 21 Jan 2016 10:23:07 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,325,1449561600"; d="scan'208";a="895432023" From: Andy Shevchenko To: Matt Fleming , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , linux-efi@vger.kernel.org, Rasmus Villemoes , Andrew Morton , linux-kernel@vger.kernel.org Cc: Robert Elliott , Andy Shevchenko Subject: [PATCH v2 3/4] x86/efi: print size and base in binary units in efi_print_memmap Date: Thu, 21 Jan 2016 17:22:31 +0200 Message-Id: <1453389752-68175-3-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1453389752-68175-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1453389752-68175-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 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) Signed-off-by: Robert Elliott Signed-off-by: Andy Shevchenko --- arch/x86/platform/efi/efi.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index e0846b5..3badc8a 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -35,10 +35,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -117,6 +119,14 @@ void efi_get_time(struct timespec *now) now->tv_nsec = 0; } +static char * __init efi_size_format(char *buf, size_t size, u64 bytes) +{ + unsigned long i = bytes ? __ffs64(bytes) / 10 : 0; + + snprintf(buf, size, "%llu %s", bytes >> (i * 10), string_units_2[i]); + return buf; +} + void __init efi_find_mirror(void) { void *p; @@ -225,21 +235,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++) { - char buf[64]; + efi_memory_desc_t *md = p; + u64 size = md->num_pages << EFI_PAGE_SHIFT; + char buf[64], buf3[32]; - md = p; - pr_info("mem%02u: %s range=[0x%016llx-0x%016llx] (%lluMB)\n", + pr_info("mem%02u: %s range=[0x%016llx-0x%016llx] (%s)\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, + efi_size_format(buf3, sizeof(buf3), size)); } #endif /* EFI_DEBUG */ } -- 2.7.0.rc3