{"id":814724,"url":"http://patchwork.ozlabs.org/api/patches/814724/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170917225927.117917-7-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170917225927.117917-7-sjg@chromium.org>","list_archive_url":null,"date":"2017-09-17T22:59:17","name":"[U-Boot,06/16] efi: sandbox: Adjust memory setup for sandbox","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"cea4569bea6a2986c827595cfadf64182389773b","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":{"id":3400,"url":"http://patchwork.ozlabs.org/api/users/3400/?format=json","username":"agraf","first_name":"Alexander","last_name":"Graf","email":"agraf@suse.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170917225927.117917-7-sjg@chromium.org/mbox/","series":[{"id":3549,"url":"http://patchwork.ozlabs.org/api/series/3549/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=3549","date":"2017-09-17T22:59:11","name":"efi: Enable basic sandbox support for EFI loader","version":1,"mbox":"http://patchwork.ozlabs.org/series/3549/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814724/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814724/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=google.com header.i=@google.com\n\theader.b=\"GIITYG90\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwR2z2rjzz9s7h\n\tfor ;\n\tMon, 18 Sep 2017 10:00:11 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 0300CC21EA9; Mon, 18 Sep 2017 00:00:09 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 77B56C21EE6;\n\tSun, 17 Sep 2017 23:02:01 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 271B5C21EDE; Sun, 17 Sep 2017 23:02:00 +0000 (UTC)","from mail-io0-f182.google.com (mail-io0-f182.google.com\n\t[209.85.223.182])\n\tby lists.denx.de (Postfix) with ESMTPS id 12071C21EA9\n\tfor ; Sun, 17 Sep 2017 22:59:38 +0000 (UTC)","by mail-io0-f182.google.com with SMTP id g32so14832685ioj.2\n\tfor ; Sun, 17 Sep 2017 15:59:38 -0700 (PDT)","from kiwi.bld.corp.google.com ([100.101.164.89])\n\tby smtp.gmail.com with ESMTPSA id\n\td95sm2300915oic.3.2017.09.17.15.59.35\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 17 Sep 2017 15:59:35 -0700 (PDT)","by kiwi.bld.corp.google.com (Postfix, from userid 121222)\n\tid B5A8E141802; Sun, 17 Sep 2017 16:59:34 -0600 (MDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,\n\tRCVD_IN_MSPIKE_H2,\n\tT_DKIM_INVALID autolearn=unavailable autolearn_force=no\n\tversion=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\n\ts=20161025; \n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=U+h68iJuqISN4reKx/koJVrEFsw+71SZsuIDUAknCCY=;\n\tb=GIITYG90Zdkv/GLvRzPnbl3THqRRXmUJwqnMffzTOcO6TQNyHsWI3kUAsHFTAy3V4Y\n\tN9qc64QE4GPo9xNZw8+p0Yi/g2ndl8DDWRHM6H4k2iHR9W/PWxV6zdAHkKJf0Uqv8wTK\n\tBZ+NRe2UOgisazbBk4OlOBcl19YWcRCcfImNmd7Sitrm44AWzJINnZSaW0LPF1d+GX+z\n\tRagtAue8SiDKYjgI+141ZqodYoa7vSLwokzhM14mnX6Tka+YzgkhcrC/HUNcb+2lWrwt\n\tuvEp+AsjFlIqGNjsyZX8AlebIa0Kv5NhJnP/ReYi8eRi8BKL2U6zUnxcbeMWs6i994bd\n\tn1CA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references;\n\tbh=U+h68iJuqISN4reKx/koJVrEFsw+71SZsuIDUAknCCY=;\n\tb=W1AgkIOzyveNUY+E3QLJD+wX70w0b0XxuOkbiGkIYNWcqBdic0cXbd1rYK3+ZYJ11w\n\tnJOFQQ2KJkNpQs7HiUBO1QBvOcSs989L/A3+hwiTSngt3zINvLJs4/fLZHaY95U0Fzqb\n\twva3q4wMQN7cFrno+IHCzMb4ken57ruQ350LqFeSCPDqjZdXO0/rAxWuYCrTG6x/yqZd\n\tMa8g0dCX4JuUF8mMQFbGtklTs6/GhaooJm/s2pkcaZnZhVAj3ktpVD8KvfeN05yKlNJh\n\tbVJEFSHDtTC+ta2NJbhAz3iksvBcYdkjZsim4crXA0FK2q0JdXeFhufOmF15MeTFlt4M\n\teTIQ==","X-Gm-Message-State":"AHPjjUgSZ78Bgz10xV3g3QETZmWfhrNxUVxuFKhText6u5G2c9dO095q\n\tsMiHqmwmY/ZY+lhL","X-Google-Smtp-Source":"AOwi7QAHXm6BGLuSny26dXHkSQoh//TdA0nSW4nWrnAem2XzfA8AP9zTtiXIeNhyLbL4awCHOkj3Mg==","X-Received":"by 10.202.73.65 with SMTP id w62mr11490140oia.163.1505689176675; \n\tSun, 17 Sep 2017 15:59:36 -0700 (PDT)","From":"Simon Glass ","To":"U-Boot Mailing List ","Date":"Sun, 17 Sep 2017 16:59:17 -0600","Message-Id":"<20170917225927.117917-7-sjg@chromium.org>","X-Mailer":"git-send-email 2.14.1.690.gbb1197296e-goog","In-Reply-To":"<20170917225927.117917-1-sjg@chromium.org>","References":"<20170917225927.117917-1-sjg@chromium.org>","Cc":"Andy Shevchenko ,\n\tHeinrich Schuchardt ","Subject":"[U-Boot] [PATCH 06/16] efi: sandbox: Adjust memory setup for sandbox","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"With sandbox the U-Boot code is not mapped into the sandbox memory range\nso does not need to be excluded when allocating EFI memory. Update the EFI\nmemory init code to take account of that.\n\nSigned-off-by: Simon Glass \n---\n\n lib/efi_loader/efi_memory.c | 28 ++++++++++++++++------------\n 1 file changed, 16 insertions(+), 12 deletions(-)","diff":"diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c\nindex ad3d277be6..c1a080e2e9 100644\n--- a/lib/efi_loader/efi_memory.c\n+++ b/lib/efi_loader/efi_memory.c\n@@ -459,18 +459,22 @@ int efi_memory_init(void)\n \n \tefi_add_known_memory();\n \n-\t/* Add U-Boot */\n-\tuboot_start = (gd->start_addr_sp - uboot_stack_size) & ~EFI_PAGE_MASK;\n-\tuboot_pages = (gd->ram_top - uboot_start) >> EFI_PAGE_SHIFT;\n-\tefi_add_memory_map(uboot_start, uboot_pages, EFI_LOADER_DATA, false);\n-\n-\t/* Add Runtime Services */\n-\truntime_start = (ulong)&__efi_runtime_start & ~EFI_PAGE_MASK;\n-\truntime_end = (ulong)&__efi_runtime_stop;\n-\truntime_end = (runtime_end + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;\n-\truntime_pages = (runtime_end - runtime_start) >> EFI_PAGE_SHIFT;\n-\tefi_add_memory_map(runtime_start, runtime_pages,\n-\t\t\t EFI_RUNTIME_SERVICES_CODE, false);\n+\tif (!IS_ENABLED(CONFIG_SANDBOX)) {\n+\t\t/* Add U-Boot */\n+\t\tuboot_start = (gd->start_addr_sp - uboot_stack_size) &\n+\t\t\t\t~EFI_PAGE_MASK;\n+\t\tuboot_pages = (gd->ram_top - uboot_start) >> EFI_PAGE_SHIFT;\n+\t\tefi_add_memory_map(uboot_start, uboot_pages, EFI_LOADER_DATA,\n+\t\t\t\t false);\n+\n+\t\t/* Add Runtime Services */\n+\t\truntime_start = (ulong)&__efi_runtime_start & ~EFI_PAGE_MASK;\n+\t\truntime_end = (ulong)&__efi_runtime_stop;\n+\t\truntime_end = (runtime_end + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;\n+\t\truntime_pages = (runtime_end - runtime_start) >> EFI_PAGE_SHIFT;\n+\t\tefi_add_memory_map(runtime_start, runtime_pages,\n+\t\t\t\t EFI_RUNTIME_SERVICES_CODE, false);\n+\t}\n \n #ifdef CONFIG_EFI_LOADER_BOUNCE_BUFFER\n \t/* Request a 32bit 64MB bounce buffer region */\n","prefixes":["U-Boot","06/16"]}