Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752015Ab3IRGNk (ORCPT ); Wed, 18 Sep 2013 02:13:40 -0400 Received: from mail-ye0-f173.google.com ([209.85.213.173]:59668 "EHLO mail-ye0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751933Ab3IRGNh (ORCPT ); Wed, 18 Sep 2013 02:13:37 -0400 From: Grant Likely Subject: Re: [PATCH 18/28] of: create default early_init_dt_add_memory_arch To: Rob Herring , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Rob Herring , Catalin Marinas , Will Deacon , James Hogan , Michal Simek , Jonas Bonn , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, linux-arm-kernel@lists.infradead.org, microblaze-uclinux@itee.uq.edu.au, linux@openrisc.net In-Reply-To: <1379372965-22359-19-git-send-email-robherring2@gmail.com> References: <1379372965-22359-1-git-send-email-robherring2@gmail.com> <1379372965-22359-19-git-send-email-robherring2@gmail.com> Date: Tue, 17 Sep 2013 22:33:58 -0500 Message-Id: <20130918033358.51CA1C42C9E@trevor.secretlab.ca> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1879 Lines: 59 On Mon, 16 Sep 2013 18:09:14 -0500, Rob Herring wrote: > From: Rob Herring > > Create a weak version of early_init_dt_add_memory_arch which uses > memblock or is an empty function when memblock is not enabled. This > will unify all architectures except ones with custom memory bank > structs. Two comments below, but otherwise: Acked-by: Grant Likely > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > index 0714dd4..a9dce7a 100644 > --- a/drivers/of/fdt.c > +++ b/drivers/of/fdt.c > @@ -688,6 +688,17 @@ u64 __init dt_mem_next_cell(int s, __be32 **cellp) > return of_read_number(p, s); > } > > +void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) > +{ > +#ifdef CONFIG_HAVE_MEMBLOCK > + base &= PAGE_MASK; > + size &= PAGE_MASK; > + memblock_add(base, size); > +#else > + pr_err("%s: ignoring memory (%llx, %llx)\n", __func__, base, size); > +#endif > +} > + Can you do it this way instead: #ifdef CONFIG_HAVE_MEMBLOCK void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) { base &= PAGE_MASK; size &= PAGE_MASK; memblock_add(base, size); } #endif If the platform doesn't provide an early_init_dt_add_memory_arch() function and it doesn't have a memblock implementation, then the build should outright fail. I don't see a scenario where we would want to successfully build the kernel without a working add memory function. Also, can you group this function with the common __weak early_init_dt_alloc_memory_arch() implementation? It would be good to group all the memblock specific functions together. g. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/