From patchwork Tue Feb 9 13:53:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 61532 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2057424lbl; Tue, 9 Feb 2016 05:57:16 -0800 (PST) X-Received: by 10.98.80.80 with SMTP id e77mr50533661pfb.126.1455026236109; Tue, 09 Feb 2016 05:57:16 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id af6si54296798pad.226.2016.02.09.05.57.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2016 05:57:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org 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 1aT8m7-0006fY-Uv; Tue, 09 Feb 2016 13:56:15 +0000 Received: from mail-bn1on0669.outbound.protection.outlook.com ([2a01:111:f400:fc10::669] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aT8kw-0004gt-Nj for linux-arm-kernel@lists.infradead.org; Tue, 09 Feb 2016 13:55:04 +0000 Authentication-Results: linaro.org; dkim=none (message not signed) header.d=none;linaro.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from rric.localdomain (92.224.192.127) by CY1PR0701MB1614.namprd07.prod.outlook.com (10.163.20.151) with Microsoft SMTP Server (TLS) id 15.1.403.16; Tue, 9 Feb 2016 13:54:45 +0000 From: Robert Richter To: Ard Biesheuvel , Will Deacon , Matt Fleming , Catalin Marinas Subject: [PATCH v4 5/6] arm64/efi: ignore DT memory nodes instead of removing them Date: Tue, 9 Feb 2016 14:53:45 +0100 Message-ID: <1455026026-11571-6-git-send-email-rrichter@caviumnetworks.com> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1455026026-11571-1-git-send-email-rrichter@caviumnetworks.com> References: <1455026026-11571-1-git-send-email-rrichter@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [92.224.192.127] X-ClientProxiedBy: AM2PR09CA0006.eurprd09.prod.outlook.com (25.161.22.144) To CY1PR0701MB1614.namprd07.prod.outlook.com (25.163.20.151) X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1614; 2:TjPCzCZ1DNP+D0PbpSCLTYybbwZ7dtIq5lhX5P+O3cGUCRmC+RMS68RVLCgwYCSChlwqydk8h6fClKldpMNmBFwUVzMUn7bgwheBNhDwVH2K9A+IEChmMNrYEDpQ1M54Bxov6lAxclWzEZSZbiCgWQ==; 3:cvpgaz60jUNTzeSqmVYRjLLch7Cs3UGpQYgGHrxdDJVxw1ji5z0GjzAXhKPqZLtdRiHbyT0pZo8pLIlTjbR4Au33TscpYn47DmYnSPoarvoxqlyFGfjNv0n9xL5EqzmE; 25:tBR2qPmIrHWfgJ3lLKXPwWPxKYwfnGuKFNQeNv9Pa7US3mSEDk2Qi++cIgB5j/IoCVJMX4VpfLtKwx6wWkPyDumPQUIPUKKa7dnGQm4tbC/MEOi+mXVYGBea+L+fEw9Dg3QhJIeYs0dkCGlRK8rAY1hODacmPs4Qqjp6YmeoZxNRfffQKFjfvHnag1K50Fu/RQ1HsPxePpWkCgFTVBG/j6b7/iBsbJRMsgbZtj5gA89//B/ITWMF/SsPDt9tcfJ2rvrOq9kzTlEir1IMHn9uaxaJZDHviMxUpYaQEiLtBMZMz2rKtvsp2haELNlxMr5l X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0701MB1614; X-MS-Office365-Filtering-Correlation-Id: 6abccad8-fefd-4760-6cf4-08d3315892be X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1614; 20:HZEEhHrTHomg+NG9cecheevWSsikMw8CfPNJFdcc4p9IH1Ax7duFhkM65kCErksqsY7rYDtyQHTgGlvvAMtpNqY2Asqhct19Xiq8FpCJIz/aspfsi/BWPeSpw3JJVmPRpbjiL3gyQbs/DQp9EVp+YRbsptDS3USOHd9t+6yutrMLLTyRvV09GsydsP9TF0mdKNhrTXCPc5xpZyGuSLBRYd1r8eRY7PUtjfqjfcyJjhboFmYM0h2cYWgjE77f7iU8euEUM50Gc5k15ofbSv4JrLbUafEQ3WOIcR2bQREYxgN0eIzK0o8mMlsQ1Ga7NiLM71cyKU/Itm9IOnyHhRBDUhp/37RxtRAPbXQJmjgTQmXGI4f4Xjtfegt2pR6UWtbMca29ypmMrUx288itixcwBvGGXLAe8nxsSKRidq9FrMByVLGy2vaq0DgS7d/WmIb/jvxY0qvgXwMBuO3X0ZnZ9Owkex2bZHn/4Ve8jaaV7W3nj/u+YEmfY6Ss7b9xGOn8zXRolLsnbT4GNjiZKA1Ropi/2iJV5T8oBoBzSjcKLMGoQX0+PK28yx7wUSZ1nqRJeoe11/kisrAZ8N5gh6KrIkrYDFtdkDylVlJvxNp/d9I= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046); SRVR:CY1PR0701MB1614; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0701MB1614; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1614; 4:kgTtTrm61lSOw3i8KX6j2cYZkXzPQKKEkwNhdLlry86S384uwy22pW5mHNngKKvFBdKesBMaO/0VTN2+Osq5FTdEDN1r/mdfTnJ8l2GQMh9MfmCyFMKMs0PpGRKtdPMZkXJFo0Ft3rjxmagDwmY89xooNB1sEIj/cfYTw363A7TP+HlkNLoSgR4e0aVblNSMVTPb4ApYAoW5SmES6YH2u/OcoaTgJpWl3vJruIwSA2Yr6BeB/z0Vj6djnwsaPfDRGVrs8XWA/0sQcI6FWWhOb+5kKsLSPrYOYeiTaSVwSNygjGWHHRBCXiUdIe75DEDf+FqiE0XusNJ6z/8w5nXMlHZghMcl8+1y7NWg/GyCRw6U2TMtY3+KrNwj5i22XRqN X-Forefront-PRVS: 08476BC6EF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(40100003)(229853001)(48376002)(33646002)(5001770100001)(5001960100002)(5003940100001)(36756003)(122386002)(76176999)(50986999)(42186005)(50466002)(92566002)(50226001)(2950100001)(4326007)(2906002)(189998001)(5008740100001)(5004730100002)(19580395003)(77096005)(66066001)(19580405001)(1096002)(47776003)(6116002)(87976001)(586003)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB1614; H:rric.localdomain; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1614; 23:lbz4t4E1V6UvwcImDwGhSbMDCE8NR54yCQPgYrYMmHXILz444iVQjAoNA9dEhlPoc63OyOZtiLhxpbncS630a4cdD1QjqwLAtVhpyHvJXxZKpI5YLSZxSliWRP/PLWC+J8/31LpmF2CvVHNLUXviHgLJD6sqDGg6/VxyVvqax0/TQQvdHJ28O0kjbTFrp5xFHJchA6bqqoJ10EKMCBOR8511og94UxF41Dggy9Bw4CuZlX3knwxnPR46Wm0imH7na7rFYnluJH5pghk5OouIXdf1OByfg4HPm/m9nQcBEyzfabc3vlxn+9TTnEnWDWbuYyhMwU0L27t6Xfv6gRnW6Lp/RO38+xHjG6xNSxlnS4ZKOMJ8S9jhqUUIYwMP1gntLVMMvueD52M7070FwQlaWVIjcHFll7Lm7bHXDUVBNLlJyZq33IekEQ/6BBp0na1JAnlKDuEtwQ/8AV4HRqtfiVBH2EQn6VwS/dRfI59VtOv3fFzhAPtQy6fuVwvw7o3POTdy+c69dIkeQ1t3fR1t6VwsfPVAMjdmTBdUIH3zf4FkVEUaGmY37gI/irmpfb+fEfg+oITyMTthqSI7NOmNUTX4YjNVkXzmZpHkBKrnZ1TlgMVhnrtLC5hXNKgZVyCQzOmgZz3pahb7ehYIdZZmHR7A3OuV04N7gW/Z0s8J/1AQqDUbVGZvD+z4+ptXjx2Bqye3WxIrb6BvaEfEG3rUQlBUSoLHfCDETyJXKNir4O3Dsjh5y29YbAwBNtbv1Sdg+Qk380SHICGSh84eub7iBCppykl8yYApIaiotdqzHpKGB9/qcZiD+CokO7GxpLYYxU7JB2uwV8aurbAt76gGdlYho4+Kq+spK6T68yeZCnbdXfMukJDjTRc6RXenOSUi+W9IRjP+0IhRNO6FGJrwYg== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1614; 5:WEfgOx2yhEDzGVie6sZPz9PdJGR9dngjySSM1EL5X7UrCkeSYcp8iQnD+pV/jD8Y31koKlg+SRJZGTSh8aIEHYGytDS/SUTnPk1G/bw3DWHPk0HjO30x/IyP5FIS6Dd4aTRMkGRoziAtInLt6FeOiQ==; 24:LQblXloS8dJU/BhY5k5x15hec8mmB9IcVbjQ/bxpL9DsC+e0ZBdVUuHvTv8upadiMjQ0RMzHFTo1TIj9vUX3Sx+mm9hiDo2YUmVVfQYLTUc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2016 13:54:45.3206 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0701MB1614 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160209_055503_072350_D7A465BC X-CRM114-Status: GOOD ( 11.41 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fc10:0:0:0:669 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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: Mark Rutland , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Leif Lindholm , Robert Richter , Mark Salter , Ganapatrao Kulkarni , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.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. Now that the UEFI initialization has moved to an earlier stage, we can actually just ignore any memblocks that are installed after we have processed 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. Acked-by: Leif Lindholm Signed-off-by: Ard Biesheuvel Message-Id: <1442881288-13962-6-git-send-email-ard.biesheuvel@linaro.org> [ rric: Ported to v4.5-rc1 ] Signed-off-by: Robert Richter --- arch/arm64/mm/init.c | 6 +++++- drivers/firmware/efi/arm-init.c | 2 +- drivers/firmware/efi/libstub/fdt.c | 24 +----------------------- 3 files changed, 7 insertions(+), 25 deletions(-) -- 2.7.0.rc3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 208c1d359018..eda226e85c71 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -383,5 +383,9 @@ __setup("keepinitrd", keepinitrd_setup); void __init early_init_dt_add_memory_arch(u64 base, u64 size) { - early_init_dt_add_memory(base, size); + /* + * Ignore DT memory nodes if we are booting via UEFI. + */ + if (!efi_enabled(EFI_MEMMAP)) + early_init_dt_add_memory(base, size); } diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c index 9fe04648d4d3..ded895706633 100644 --- a/drivers/firmware/efi/arm-init.c +++ b/drivers/firmware/efi/arm-init.c @@ -159,7 +159,7 @@ static __init void reserve_regions(void) size = npages << PAGE_SHIFT; if (is_normal_ram(md)) - early_init_dt_add_memory_arch(paddr, size); + early_init_dt_add_memory(paddr, size); if (is_reserve_region(md)) { memblock_mark_nomap(paddr, size); diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index cf7b7d46302a..9df1560d57bc 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. */