From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1750964AbcDOOIX (ORCPT <rfc822;w@1wt.eu>);
	Fri, 15 Apr 2016 10:08:23 -0400
Received: from mail-wm0-f48.google.com ([74.125.82.48]:37901 "EHLO
	mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750773AbcDOOIW (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 15 Apr 2016 10:08:22 -0400
Date: Fri, 15 Apr 2016 15:08:18 +0100
From: Matt Fleming <matt@codeblueprint.co.uk>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>, David Daney <ddaney.cavm@gmail.com>,
        "linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>,
        Rob Herring <robh+dt@kernel.org>,
        Frank Rowand <frowand.list@gmail.com>,
        Grant Likely <grant.likely@linaro.org>,
        Pawel Moll <pawel.moll@arm.com>,
        Ian Campbell <ijc+devicetree@hellion.org.uk>,
        Kumar Gala <galak@codeaurora.org>,
        Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>,
        Robert Richter <rrichter@cavium.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        "linux-efi@vger.kernel.org" <linux-efi@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
        David Daney <david.daney@cavium.com>
Subject: Re: [PATCH v16 1/6] efi: ARM/arm64: ignore DT memory nodes instead
 of removing them
Message-ID: <20160415140818.GT2829@codeblueprint.co.uk>
References: <1460155828-8690-1-git-send-email-ddaney.cavm@gmail.com>
 <1460155828-8690-2-git-send-email-ddaney.cavm@gmail.com>
 <20160415140357.GK22906@arm.com>
 <CAKv+Gu_7m0FH5CHLOEPu8uwUKOVMLANGYMd8pvqvp7r+q2Mk4g@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAKv+Gu_7m0FH5CHLOEPu8uwUKOVMLANGYMd8pvqvp7r+q2Mk4g@mail.gmail.com>
User-Agent: Mutt/1.5.24+41 (02bc14ed1569) (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, 15 Apr, at 04:06:08PM, Ard Biesheuvel wrote:
> On 15 April 2016 at 16:03, Will Deacon <will.deacon@arm.com> wrote:
> > On Fri, Apr 08, 2016 at 03:50:23PM -0700, David Daney wrote:
> >> From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >>
> >> There are two problems with the UEFI stub DT memory node removal
> >> routine:
> >> - it deletes nodes as it traverses the tree, which happens to work
> >>   but is not supported, as deletion invalidates the node iterator;
> >> - deleting memory nodes entirely may discard annotations in the form
> >>   of additional properties on the nodes.
> >>
> >> Since the discovery of DT memory nodes occurs strictly before the
> >> UEFI init sequence, we can simply clear the memblock memory table
> >> before parsing the UEFI memory map. This way, it is no longer
> >> necessary to remove the nodes, so we can remove that logic from the
> >> stub as well.
> >>
> >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >> Signed-off-by: David Daney <david.daney@cavium.com>
> >> ---
> >>  drivers/firmware/efi/arm-init.c    |  8 ++++++++
> >>  drivers/firmware/efi/libstub/fdt.c | 24 +-----------------------
> >>  2 files changed, 9 insertions(+), 23 deletions(-)
> >
> > Matt, are you ok with me taking this through the arm64 tree? (since the
> > NUMA patches depend on it). If so, please can I have your ack?
> >
> 
> Matt gave his Reviewed-by for v15
> 
> http://www.gossamer-threads.com/lists/linux/kernel/2390242

Heh, you beat me to it!

Will, go ahead and take this through the arm64 tree.