From patchwork Sun Jun 7 16:47:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1304772 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=aXncns5b; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49g2PQ5RqKz9sRN for ; Mon, 8 Jun 2020 02:47:54 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3D30B801CA; Sun, 7 Jun 2020 18:47:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="aXncns5b"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B7E7A80462; Sun, 7 Jun 2020 18:47:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E8D25800A9 for ; Sun, 7 Jun 2020 18:47:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1591548460; bh=yU7Ei/bvg1ulvdjxVqH+V4nGGYzwhrudZDcaqbg+eoc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=aXncns5bur5gZGSs5FR/cy+k2yJ4byt2RfOcVFXjcJybkaELX3X5Z6ZUSzNoLIeXN tO2v0z0zswbRt5GtaCql/PEfHR6k601nSQXgbHzdny8XSpvVhGfGjl3Tlv5HUKeRww U54MNVsIRtndLE8+ytZcYRdLpp0vwnscjt4wpFos= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([88.152.145.75]) by mail.gmx.com (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MrQEx-1jCVeV1bLL-00oaTb; Sun, 07 Jun 2020 18:47:40 +0200 From: Heinrich Schuchardt To: Simon Glass Cc: Mario Six , Bin Meng , Anatolij Gustschin , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] sandbox: make RAM size configurable Date: Sun, 7 Jun 2020 18:47:35 +0200 Message-Id: <20200607164735.206310-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:h/jafgpnVc+RTMfslVk0D00j/1Pdy90JFsP2F1rQe62tlzK70L0 /+d/OkuqcJQ4yqyQ1WJapxZ4j9kSDvadD9ug5MTMwe1pdFAWqK9in8lK5A+wg0RNmGuDqGJ CVJOzRFmAjED2VPG0K2I1/xrgTpxleu1hg1xeeA8PvxnkP7kPTpaymRdyakySu5WirEvG4o 6GNt3PoGN6+U+Fgzo1BEw== X-UI-Out-Filterresults: notjunk:1;V03:K0:uD6kJmlWDaQ=:aeGBvKXBNPXEzrWZ3VYd9s ngAm4A+r9xNzPNSjhwrWyEhzxqbME918C2vHCfJ2BGj2uzVlBgq7evm7AFXB+i+ndxsTq4MQt BZckOr1YtLV/Ec+UEMbriay2HUzOjUTFPgVheQ8JL40cOU9WSEQ4iM9ximj+p6XO/FB2EoB/o yK5lfnY/NuTMB++7yNpn6wpnAuYcRz78ncZvmqpAlZkIUouijeINvgkpX6cdU/qqUEtYCnCmt aXOgNyyA+L0Yo9coEFw60QU/44F5z6nJ+tgDTwGpk+4vsrST+eVgee+55huJHODU7X6dbtg/m SgXS9LJo3ZV9WP90aFnZ/xAk+5MGR/Wl0S8fP4Ax4nXrH7CedeSWkB4LlAG1SIIh7FLrE+XMS RnLE5I0hfzBzGMsftkqWqA0f/2Ur9bqO9O3C0lJtZuQaTHx61sFjvc3e3uGfTDC+tJs82+hvt 0s40ehl6/MORMbisDwAUzt5cuzelVGuAa+KJOZd1yxrVJyQdyACyf4mFXlrotrKfoQxYEjVOG GqbLCUxhHmFNzE3xCPhK8fAZu50c5yRyBNAThDzwwscZpFmZC0AzgwMCtSHb/JzFrfh8v3ql1 +SDbLWnVVk6yA/9JbGtnaa5lD9DbtliOxKEaiPhaaI51zVzc1TjD/r67j1LEwIrlFbo7zlnUK YvakYhBb0qdeJTtk/jqkYJCDNmZhu4F5yv/7yeBs5gf+cBhn3msd3jTG2Za4haVafwDW7SMDH NXI3JfKAnlz4Ut3a0RPAD+Ad1cZ5ONKgx78hX6aPbdjfP7ow6ReqGtOHVpUuOAtoBWD8WXO6G r4D9YjejRiMUeeb4vioYki52Le6MUPaqYGEllbXr1mwGMySBLy+y3CwDgzsySWWleTA+nL9LG 43766q4GIm5TErMPgnFfEucDBB91s2oFDMz4Y9inzC9y3vdZCftml+A1Wh8gEJ6Wm8ImIPh4b H1hZYXF1VszlopCIU+CAh0Hs+pAzjn5GMX/UzOK6fLh/S2pCkmBNgsj4cVK6GvmI4u9fK0mqS XHYbkYCSIbu0LiPlq/TOj9Mqgk34eLZDUhnY/6bacCNrOBgtjxKfhyBPp5nxyux3C6JrST9c2 CzYWtpiqF5UWTzYkVAwHYz34ZuQbEw0geQ5RbZL6KkfgM/xFhkXCywyzNARvvetI2NQDR9BXA SekAn3jBcZmctAem5Bw5fG8OIsmLJzsJ7tosXSaOpzIxY1tZiTzBOkdfiOm9BEJ7/8fMeOgug Pb8Wfz9QuSHMoGhHF X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean Up to now the RAM size of the sandbox is hard coded as 128 MiB. This does not allow testing the correct handling of addresses outside the 32bit range. 128 MiB is also rather small when tracing functions where the trace is written to RAM. Provide configuration variable CONFIG_SANDBOX_RAM_SIZE_MB to set the RAM size in MiB. It defaults to 128 MiB with a minimum of 64 MiB. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- arch/sandbox/Kconfig | 10 ++++++++++ arch/sandbox/include/asm/state.h | 2 +- include/configs/sandbox.h | 5 ++++- 3 files changed, 15 insertions(+), 2 deletions(-) -- 2.26.2 diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index 2a08533c4b..65f988e736 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -15,6 +15,16 @@ config SANDBOX64 select PHYS_64BIT select HOST_64BIT +config SANDBOX_RAM_SIZE_MB + int "RAM size in MiB" + default 128 + range 64 4095 if !SANDBOX64 + range 64 268435456 if SANDBOX64 + help + Memory size of the sandbox in MiB. The default value is 128 MiB. + The minimum value is 64 MiB. The maximum value is 4095 MiB for the + 32bit sandbox. + config SANDBOX_SPL bool "Enable SPL for sandbox" select SUPPORT_SPL diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h index 705645d714..1bfad305f1 100644 --- a/arch/sandbox/include/asm/state.h +++ b/arch/sandbox/include/asm/state.h @@ -73,7 +73,7 @@ struct sandbox_state { char **argv; /* Command line arguments */ const char *jumped_fname; /* Jumped from previous U_Boot */ uint8_t *ram_buf; /* Emulated RAM buffer */ - unsigned int ram_size; /* Size of RAM buffer */ + unsigned long ram_size; /* Size of RAM buffer */ const char *ram_buf_fname; /* Filename to use for RAM buffer */ bool ram_buf_rm; /* Remove RAM buffer file after read */ bool write_ram_buf; /* Write RAM buffer on exit */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 2a81f3a9bc..3d46ee0d46 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -47,8 +47,11 @@ #define CONFIG_PHYSMEM /* Size of our emulated memory */ +#define SB_CONCAT(x, y) x ## y +#define SB_TO_UL(s) SB_CONCAT(s, UL) #define CONFIG_SYS_SDRAM_BASE 0 -#define CONFIG_SYS_SDRAM_SIZE (128 << 20) +#define CONFIG_SYS_SDRAM_SIZE \ + (SB_TO_UL(CONFIG_SANDBOX_RAM_SIZE_MB) << 20) #define CONFIG_SYS_MONITOR_BASE 0 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\