From mboxrd@z Thu Jan 1 00:00:00 1970 From: khilman@linaro.org (Kevin Hilman) Date: Thu, 13 Mar 2014 14:51:56 -0700 Subject: [PATCH v5 09/11] arm: add support for reserved memory defined by device tree In-Reply-To: <20140313213636.GR18529@joshc.qualcomm.com> (Josh Cartwright's message of "Thu, 13 Mar 2014 16:36:36 -0500") References: <1392985527-6260-1-git-send-email-m.szyprowski@samsung.com> <1392985527-6260-10-git-send-email-m.szyprowski@samsung.com> <20140313213636.GR18529@joshc.qualcomm.com> Message-ID: <7h8usdlqbn.fsf@paris.lan> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Josh Cartwright writes: > On Thu, Mar 13, 2014 at 01:46:50PM -0700, Kevin Hilman wrote: >> On Fri, Feb 21, 2014 at 4:25 AM, Marek Szyprowski >> wrote: >> > Enable reserved memory initialization from device tree. >> > >> > Signed-off-by: Marek Szyprowski >> >> This patch has hit -next and several legacy (non-DT) boot failures >> were detected and bisected down to this patch. A quick scan looks >> like there needs to be some sanity checking whether a DT is even >> present. > > Hmm. Yes, the code unconditionally calls of_flat_dt_scan(), which will > gladly touch initial_boot_params, even though it may be uninitialized. > The below patch should allow these boards to boot... > > However, I'm wondering if there is a good reason why we don't parse the > /reserved-memory nodes at the right after we parse the /memory nodes as > part of early_init_dt_scan()... > > Thanks, > Josh > > --8<-- > Subject: [PATCH] drivers: of: only scan for reserved mem when fdt present > > Reported-by: Kevin Hilman > Signed-off-by: Josh Cartwright This gets legacy boot working again. Thanks. Tested-by: Kevin Hilman Kevin > --- > drivers/of/fdt.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > index 510c0d8..501bc83 100644 > --- a/drivers/of/fdt.c > +++ b/drivers/of/fdt.c > @@ -557,6 +557,9 @@ static int __init __fdt_scan_reserved_mem(unsigned long node, const char *uname, > */ > void __init early_init_fdt_scan_reserved_mem(void) > { > + if (!initial_boot_params) > + return; > + > of_scan_flat_dt(__fdt_scan_reserved_mem, NULL); > fdt_init_reserved_mem(); > } From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [PATCH v5 09/11] arm: add support for reserved memory defined by device tree Date: Thu, 13 Mar 2014 14:51:56 -0700 Message-ID: <7h8usdlqbn.fsf@paris.lan> References: <1392985527-6260-1-git-send-email-m.szyprowski@samsung.com> <1392985527-6260-10-git-send-email-m.szyprowski@samsung.com> <20140313213636.GR18529@joshc.qualcomm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20140313213636.GR18529@joshc.qualcomm.com> (Josh Cartwright's message of "Thu, 13 Mar 2014 16:36:36 -0500") List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Josh Cartwright Cc: Mark Rutland , linux-doc@vger.kernel.org, Benjamin Herrenschmidt , Tomasz Figa , Will Deacon , Tomasz Figa , Paul Mackerras , Marek Szyprowski , Arnd Bergmann , Catalin Marinas , Grant Likely , "devicetree@vger.kernel.org" , Laura Abbott , Ian Campbell , Pawel Moll , Stephen Warren , Sascha Hauer , Michal Nazarewicz , linaro-mm-sig@lists.linaro.org, Marc , Nishanth Peethambaran , Rob Herring , linux-arm-kernel List-Id: devicetree@vger.kernel.org Josh Cartwright writes: > On Thu, Mar 13, 2014 at 01:46:50PM -0700, Kevin Hilman wrote: >> On Fri, Feb 21, 2014 at 4:25 AM, Marek Szyprowski >> wrote: >> > Enable reserved memory initialization from device tree. >> > >> > Signed-off-by: Marek Szyprowski >> >> This patch has hit -next and several legacy (non-DT) boot failures >> were detected and bisected down to this patch. A quick scan looks >> like there needs to be some sanity checking whether a DT is even >> present. > > Hmm. Yes, the code unconditionally calls of_flat_dt_scan(), which will > gladly touch initial_boot_params, even though it may be uninitialized. > The below patch should allow these boards to boot... > > However, I'm wondering if there is a good reason why we don't parse the > /reserved-memory nodes at the right after we parse the /memory nodes as > part of early_init_dt_scan()... > > Thanks, > Josh > > --8<-- > Subject: [PATCH] drivers: of: only scan for reserved mem when fdt present > > Reported-by: Kevin Hilman > Signed-off-by: Josh Cartwright This gets legacy boot working again. Thanks. Tested-by: Kevin Hilman Kevin > --- > drivers/of/fdt.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > index 510c0d8..501bc83 100644 > --- a/drivers/of/fdt.c > +++ b/drivers/of/fdt.c > @@ -557,6 +557,9 @@ static int __init __fdt_scan_reserved_mem(unsigned long node, const char *uname, > */ > void __init early_init_fdt_scan_reserved_mem(void) > { > + if (!initial_boot_params) > + return; > + > of_scan_flat_dt(__fdt_scan_reserved_mem, NULL); > fdt_init_reserved_mem(); > }