From patchwork Thu Mar 3 23:55:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 63502 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp178300lbc; Thu, 3 Mar 2016 15:57:40 -0800 (PST) X-Received: by 10.98.80.206 with SMTP id g75mr7606932pfj.127.1457049459878; Thu, 03 Mar 2016 15:57:39 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n62si1296275pfa.183.2016.03.03.15.57.39; Thu, 03 Mar 2016 15:57:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@gmail.com; dmarc=pass (p=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932735AbcCCX5i (ORCPT + 30 others); Thu, 3 Mar 2016 18:57:38 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34390 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753593AbcCCXzr (ORCPT ); Thu, 3 Mar 2016 18:55:47 -0500 Received: by mail-pf0-f194.google.com with SMTP id 184so2179084pff.1; Thu, 03 Mar 2016 15:55:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=husB/HVGYq9ik5VlkC2lV3VuM7MHla4rthNU01rXM5Q=; b=XWr80PoD4qH5bhstM0igx//HdG2DsUpDOFI0dbqkSF3UrwGdWmjd3MnSlyu39HtgLt gHIe4FmTa0wV11KcVFUOJU36k1Lzz0Jam8IvVIk+4nyvi+IqB5q2esK302DGcvuAA0p5 lIZ1MITYSGFDuIt1p4kEPsZX3muVU6UrvE07Djmcc96O8Q+EIsfHHccBv8TquKKTw8ya wSWsUz2NZ4Btum5isqZNsZL5+zpY0+3M1nc7IsjsjIaDlOSGy0YqH/eXiNTFUYdO2XPL 5+QBDGBBeta6BF5BVC7O/cieIQvKbcTcBd2kWHio3wECaklfB8BHwXp/E5ruRFa7xkQn Dabg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=husB/HVGYq9ik5VlkC2lV3VuM7MHla4rthNU01rXM5Q=; b=Tv1HuZmEBbCUJ8WuO8V6odXS6Q8hZCutmp9jlxTc1BHjX+MX+fV3vvd2t21w2BaLTT KDlVV4lKUKh/IhpDTBDdHBcZ1vAT5MFp6L5mamsiBhGYnns68WQSfg49X5bsIMw5RV/7 R4ua28BTfuWlI044poWOjXgDgbFaijXwWeBxvM2gW9Rlzx4nKt308g6jtqRwHAB0GTw9 TicIeLPVTpSVIU/s/JnzUB1w7p+97Wn3gcAc5RRqAzZJe2NZwKi4aNKPJHBNfjfOShks EbL2euvxFuFIEuBur02Dm2kqHfNoW7OirbjUoUw8H7K8LeDI5/XWsXbCSujLxSqh3PjZ QuaA== X-Gm-Message-State: AD7BkJKxU5ycutoFiitC2QHLYP/pHFr0oQTUqiXXeumx3nP+17kI+4DFG3Xj+cWwe77KlQ== X-Received: by 10.98.32.150 with SMTP id m22mr7571688pfj.27.1457049346820; Thu, 03 Mar 2016 15:55:46 -0800 (PST) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id p8sm682246pfi.34.2016.03.03.15.55.42 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 03 Mar 2016 15:55:42 -0800 (PST) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id u23NtfdL023394; Thu, 3 Mar 2016 15:55:41 -0800 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u23NtffY023393; Thu, 3 Mar 2016 15:55:41 -0800 From: David Daney To: Will Deacon , linux-arm-kernel@lists.infradead.org, Rob Herring , Frank Rowand , Grant Likely , Pawel Moll , Ian Campbell , Kumar Gala , Ganapatrao Kulkarni , Robert Richter , Ard Biesheuvel , Matt Fleming , Mark Rutland , Catalin Marinas Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, David Daney Subject: [PATCH v14 1/6] efi: ARM/arm64: ignore DT memory nodes instead of removing them Date: Thu, 3 Mar 2016 15:55:34 -0800 Message-Id: <1457049339-23351-2-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1457049339-23351-1-git-send-email-ddaney.cavm@gmail.com> References: <1457049339-23351-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 1.8.3.1 diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c index 9e15d57..40c9d85 100644 --- a/drivers/firmware/efi/arm-init.c +++ b/drivers/firmware/efi/arm-init.c @@ -143,6 +143,14 @@ static __init void reserve_regions(void) if (efi_enabled(EFI_DBG)) pr_info("Processing EFI memory map:\n"); + /* + * Discard memblocks discovered so far: if there are any at this + * point, they originate from memory nodes in the DT, and UEFI + * uses its own memory map instead. + */ + memblock_dump_all(); + memblock_remove(0, ULLONG_MAX); + for_each_efi_memory_desc(&memmap, md) { paddr = md->phys_addr; npages = md->num_pages; diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index cf7b7d4..9df1560 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -24,7 +24,7 @@ efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, unsigned long map_size, unsigned long desc_size, u32 desc_ver) { - int node, prev, num_rsv; + int node, num_rsv; int status; u32 fdt_val32; u64 fdt_val64; @@ -54,28 +54,6 @@ efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, goto fdt_set_fail; /* - * Delete any memory nodes present. We must delete nodes which - * early_init_dt_scan_memory may try to use. - */ - prev = 0; - for (;;) { - const char *type; - int len; - - node = fdt_next_node(fdt, prev, NULL); - if (node < 0) - break; - - type = fdt_getprop(fdt, node, "device_type", &len); - if (type && strncmp(type, "memory", len) == 0) { - fdt_del_node(fdt, node); - continue; - } - - prev = node; - } - - /* * Delete all memory reserve map entries. When booting via UEFI, * kernel will use the UEFI memory map to find reserved regions. */