From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753792AbcAVPLH (ORCPT ); Fri, 22 Jan 2016 10:11:07 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:35857 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753344AbcAVPLF (ORCPT ); Fri, 22 Jan 2016 10:11:05 -0500 Date: Fri, 22 Jan 2016 15:11:00 +0000 From: Matt Fleming To: Andy Shevchenko Cc: Andrew Morton , Andy Shevchenko , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , linux-efi@vger.kernel.org, Rasmus Villemoes , "linux-kernel@vger.kernel.org" , Robert Elliott Subject: Re: [PATCH v2 3/4] x86/efi: print size and base in binary units in efi_print_memmap Message-ID: <20160122151100.GA3747@codeblueprint.co.uk> References: <1453389752-68175-1-git-send-email-andriy.shevchenko@linux.intel.com> <1453389752-68175-3-git-send-email-andriy.shevchenko@linux.intel.com> <20160121143558.2ae43ccf550e1693cd05834f@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24+41 (02bc14ed1569) (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 22 Jan, at 09:08:00AM, Andy Shevchenko wrote: > On Fri, Jan 22, 2016 at 12:35 AM, Andrew Morton > wrote: > > On Thu, 21 Jan 2016 17:22:31 +0200 Andy Shevchenko wrote: > > > >> 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) > > > > hm, > > > >> @@ -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, > > > > Where did this " - 1" come from? I can't find a tree which has this. > > http://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/commit/?h=next&id=b324ee15566d9de933e7926c37a4d091904a513b > > > > >> - (md->num_pages >> (20 - EFI_PAGE_SHIFT))); > >> + md->phys_addr, md->phys_addr + size - 1, > > > > So I did s/ - 1// here, but worried. > > I'm pretty sure the series should go via efi tree. Right, because of the prerequisite patches sat in my tree it makes sense for them to all be grouped together. Andrew, would you mind dropping these from your tree and I'll take everything through the EFI tree? Additionally, if you and Rasmus wanted to throw a couple of Acked-by or Reviewed-by tags my way, I'd feel better about the string_helpers patches.