From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: Re: [PATCH v3 1/3] of/fdt: Absorb ARM64's __early_init_dt_declare_initrd() Date: Thu, 25 Oct 2018 08:25:04 -0500 Message-ID: References: <20181025001742.6510-1-f.fainelli@gmail.com> <20181025001742.6510-2-f.fainelli@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: <20181025001742.6510-2-f.fainelli@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: Florian Fainelli Cc: "linux-kernel@vger.kernel.org" , bcm-kernel-feedback-list@broadcom.com, Catalin Marinas , Will Deacon , Frank Rowand , Andrew Morton , Marc Zyngier , Masahiro Yamada , christoffer.dall@arm.com, andreyknvl@google.com, "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , devicetree@vger.kernel.org, Arnd Bergmann List-Id: devicetree@vger.kernel.org On Wed, Oct 24, 2018 at 7:17 PM Florian Fainelli wrote: > > ARM64 is the only architecture that requires a re-definition of > __early_init_dt_declare_initrd(), absorb its custom implemention in > drivers/of/fdt.c. > > Suggested-by: Rob Herring Signed-off-by: Florian Fainelli > --- > drivers/of/fdt.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > index 800ad252cf9c..7d316f008f22 100644 > --- a/drivers/of/fdt.c > +++ b/drivers/of/fdt.c > @@ -896,9 +896,14 @@ const void * __init of_flat_dt_match_machine(const void *default_match, > static void __early_init_dt_declare_initrd(unsigned long start, > unsigned long end) > { > +#if IS_ENABLED(CONFIG_ARM64) C code, not preprocessor please. > + initrd_start = start; > + initrd_end = end; Thinking some more about this, perhaps it is better to just add the *_phys variants now along side the VA variants and set them here. Then the arm64 code can override the initrd_start, initrd_end, and initrd_below_start_ok values. > +#else > initrd_start = (unsigned long)__va(start); > initrd_end = (unsigned long)__va(end); > initrd_below_start_ok = 1; > +#endif > } > #endif > > -- > 2.17.1 >