From patchwork Tue Feb 23 01:58:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 8386181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D4723C0553 for ; Tue, 23 Feb 2016 02:00:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F2CEA20656 for ; Tue, 23 Feb 2016 02:00:39 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0F31120619 for ; Tue, 23 Feb 2016 02:00:39 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aY2Fj-0003lW-8z; Tue, 23 Feb 2016 01:59:03 +0000 Received: from mail-pf0-x22c.google.com ([2607:f8b0:400e:c00::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aY2FX-0003fr-Pa for linux-arm-kernel@lists.infradead.org; Tue, 23 Feb 2016 01:58:52 +0000 Received: by mail-pf0-x22c.google.com with SMTP id c10so106002534pfc.2 for ; Mon, 22 Feb 2016 17:58:30 -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=BrRAq8vrpg388Rge0WH1yZ/OQ9+RbH/ZqSrvR7pQzaApL1vYtfnDNUpRU1ffkc++kF Gp/BNYVgHM5K/CIudvI1enG1scoIv7YB/Z7YrwU5O8Oovt8UJGN4SOTYad2o0AdZedCS z/MR6NlrugX7uZsDsP8naIvGpAQMgadodC5ieBv/WvyDM88wwyUiGPSfHWaXPa0YZK5M xSHbwCW+1xwCKbTlyG4+lQE18bZAioOCIwIidcg+op/9jR8eXdEM0RcYjLHQc0cjOFZV ysa67D8JRaO6Hw8R3Waz8LiAjwxrgFRBQMoIqL7mm3VAkL7jy33+AzqxLKHkrd2eCLxP nJsQ== 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=M7mB3VfGDOPHw3I+5bpb5fAKXrQPE/T2OLBmiQSmJPqpeXJ593DUgmXjTL0poNblMl NUeI+EbijF6oVuld4yOStECkCUKGa60vyGOsrWzrZWanTKWZaw3hfVBfwuyRPGQTm5F1 atElENYehF9lN0PGK6ZLU7KV4c0nkyM7UZrFLB4LLm9GKMLzbZEB56PU7QGv4VtCTbK9 GoTrE02gUN1yqGcRP0Sz+UkPkqaRFk7S2a/gii698yv7rJWsYWMPgK1hPBXBdx8lAJMu hbd63yEV67nVr3kS6F/z7F2hrYEP9XUdHc+Jw6MJNLYGTvmiOpswrrfL0vMSyKpB3SIf JefQ== X-Gm-Message-State: AG10YOTNXMXVOUfEv/5bY8gbUEIXMnY8s/2nsJy4FllJ5TSGv9uEdCv05f+8GO/K2e2Kng== X-Received: by 10.98.32.5 with SMTP id g5mr42719749pfg.74.1456192709934; Mon, 22 Feb 2016 17:58:29 -0800 (PST) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id r62sm39671920pfr.26.2016.02.22.17.58.26 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 22 Feb 2016 17:58:26 -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 u1N1wPtx002316; Mon, 22 Feb 2016 17:58:25 -0800 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u1N1wPWn002315; Mon, 22 Feb 2016 17:58:25 -0800 From: David Daney To: Will Deacon , linux-arm-kernel@lists.infradead.org, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , devicetree@vger.kernel.org, Ard Biesheuvel , Frank Rowand , Grant Likely , Catalin Marinas , Matt Fleming , linux-efi@vger.kernel.org, Ganapatrao Kulkarni , Robert Richter Subject: [PATCH v12 1/5] efi: ARM/arm64: ignore DT memory nodes instead of removing them Date: Mon, 22 Feb 2016 17:58:19 -0800 Message-Id: <1456192703-2274-2-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1456192703-2274-1-git-send-email-ddaney.cavm@gmail.com> References: <1456192703-2274-1-git-send-email-ddaney.cavm@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160222_175851_882229_5E39B82A X-CRM114-Status: GOOD ( 16.89 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, David Daney MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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. */