Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751533AbcDOOGM (ORCPT ); Fri, 15 Apr 2016 10:06:12 -0400 Received: from mail-io0-f176.google.com ([209.85.223.176]:34032 "EHLO mail-io0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751046AbcDOOGJ (ORCPT ); Fri, 15 Apr 2016 10:06:09 -0400 MIME-Version: 1.0 In-Reply-To: <20160415140357.GK22906@arm.com> 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> Date: Fri, 15 Apr 2016 16:06:08 +0200 Message-ID: Subject: Re: [PATCH v16 1/6] efi: ARM/arm64: ignore DT memory nodes instead of removing them From: Ard Biesheuvel To: Will Deacon Cc: David Daney , "linux-arm-kernel@lists.infradead.org" , Rob Herring , Frank Rowand , Grant Likely , Pawel Moll , Ian Campbell , Kumar Gala , Ganapatrao Kulkarni , Robert Richter , Matt Fleming , Mark Rutland , Catalin Marinas , "linux-efi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "devicetree@vger.kernel.org" , David Daney Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1356 Lines: 31 On 15 April 2016 at 16:03, Will Deacon wrote: > On Fri, Apr 08, 2016 at 03:50:23PM -0700, David Daney wrote: >> From: Ard Biesheuvel >> >> 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 >> Signed-off-by: David Daney >> --- >> 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