From patchwork Tue Mar 8 23:59:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 8538501 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 353F6C0554 for ; Wed, 9 Mar 2016 00:02:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 44FD22020F for ; Wed, 9 Mar 2016 00:02:29 +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 EE35420165 for ; Wed, 9 Mar 2016 00:02:27 +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 1adRYU-0007IH-HE; Wed, 09 Mar 2016 00:00:46 +0000 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1adRY8-0006M8-BV for linux-arm-kernel@lists.infradead.org; Wed, 09 Mar 2016 00:00:25 +0000 Received: by mail-pf0-x241.google.com with SMTP id x188so2214588pfb.2 for ; Tue, 08 Mar 2016 16:00:03 -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=FVtus+UV88WwSzixLVeE5UJEblguCyaqvsDPZwdqR1jp6vvbC/+xeU8zh6ElMrVLmL YdAYtw5Owbxj/oIZg47nBF2R6zbvkfb2dwTCtklRkfOFSANx3E7Nn7DnuHJJ+RuXZ7MU uJuVIc/Ycrrg/sYQzP8q/LlxPpnIKTsxdzCg+HW7kaBXKrifR5bn5y6WCrOOSQXNfH3C 0z0pgaAlcbB/gFyy8FEoUGfCYw7+uo6KxbiLS6Ndcv8UGnJOz1XPD+sc7KRqRH9PjLPo 0+qbAS+f/eUrhjd0TJoSknK1TZ26erVAc/lwuc34EWjeQ0ozbYeKyOAa+kap4dGv9FT6 dxtw== 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=KlgTdX0dUOJvlqgLIaG5zvnv395E+lW7BSoL/YPRvRUGQ1cvGDoH/jLP4YFtP6XORT 956gxjx/HLb8iNtWFjerMcNOynUpIYepcU7szZTFKIxtIco5SEBFr7+NCGXvPqxY3eb+ SbLYE5M0v5Q8c1gLkoi8iLXU0IR3DkTGw9a8oORQyPFVMltGCyDHy4m0+hqQMJdH6cOT kTcS7P34ULlOjLN1ISPEuorguWaXAAs4qNPk/kNQxWPJOTwR7kKJzvv8PspKtGaMhZd4 bT6WQcTYjpsCu1hCis5hzkiJkrMmSYr2HuwDqNQJo00A3EAKfW0MJPWHA6fSkJPqHNv4 Okhw== X-Gm-Message-State: AD7BkJJDkeer5+6rHXfe8dvHNiQZrSYmzB0aa4kbCwlNaGCtFt3eHW46AJsj9sJbH1Vcgg== X-Received: by 10.98.65.203 with SMTP id g72mr46186516pfd.138.1457481603448; Tue, 08 Mar 2016 16:00:03 -0800 (PST) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id n66sm7431364pfj.39.2016.03.08.15.59.58 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 08 Mar 2016 16:00:00 -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 u28Nxvst009020; Tue, 8 Mar 2016 15:59:57 -0800 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u28NxvB9009019; Tue, 8 Mar 2016 15:59:57 -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 Subject: [PATCH v15 1/6] efi: ARM/arm64: ignore DT memory nodes instead of removing them Date: Tue, 8 Mar 2016 15:59:42 -0800 Message-Id: <1457481587-8976-2-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1457481587-8976-1-git-send-email-ddaney.cavm@gmail.com> References: <1457481587-8976-1-git-send-email-ddaney.cavm@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160308_160024_445327_F6006CBB X-CRM114-Status: GOOD ( 17.19 ) 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: devicetree@vger.kernel.org, linux-efi@vger.kernel.org, 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 Reviewed-by: Matt Fleming --- 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. */