From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2D24BECAAA1 for ; Sun, 11 Sep 2022 09:39:58 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2CC58841F8; Sun, 11 Sep 2022 11:39:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="DnBSmE8E"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C19F384382; Sun, 11 Sep 2022 11:39:54 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5365184133 for ; Sun, 11 Sep 2022 11:39:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2565960F2A; Sun, 11 Sep 2022 09:39:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CDC2C433C1; Sun, 11 Sep 2022 09:39:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662889190; bh=1DM72EMjOJxRADEthoR80Vpa9bmG0iNMMztUC7KnQRk=; h=From:To:Cc:Subject:Date:From; b=DnBSmE8ELLYY7oMAhr7QLJCRHZCGWu6mroI1NrN4fzFGaFRqk3sWM0vESDE6FjuF0 3e4RbXZU6t/aHretdfpzEvVrcpqlgaIhLHRq0hhAYS42XTqUqlNFFkQJOnGd+qOTUH RHMT06y8+hIwQCDpPq7+G3J9EFVXgtN46jgom3hOdvrsuTsqc5vZW8cpxHZ3MI33HZ e8JCpBBPG4y+EwMbcbWohvY3Bud8m2G67mZnd9eyyFVWQocuAHjCe4YW/Rc70I02+w EvznmRn0uYTC4I/8WohXuOljJO8ZofFhXqhz+hWBhAcqOfamFhMszxnepBQbwl7OT4 sdUhp3+SoTINA== Received: by pali.im (Postfix) id B2B28878; Sun, 11 Sep 2022 11:39:47 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: u-boot@lists.denx.de Cc: Simon Glass Subject: [PATCH] board_f: show_dram_config: Print also real DRAM size Date: Sun, 11 Sep 2022 11:39:42 +0200 Message-Id: <20220911093942.9570-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean 32-bit U-Boot builds cannot use more than around 2 GB of DDR memory. But on some platforms/boards it is possible to connect also 4 GB SODIMM DDR memory. U-Boot currently prints only effective size of RAM which can use, which may be misleading as somebody would expect that this line prints total size of connected DDR modules. So change show_dram_config code to prints both real and effective DRAM size if they are different. If they are same then print just one number like before. It is possible that effective size is just few bytes smaller than the real size, so print both numbers only in case function print_size() prints formats them differently. Signed-off-by: Pali Rohár --- common/board_f.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/common/board_f.c b/common/board_f.c index 9e34fbee147e..3131a06db940 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -54,6 +54,7 @@ #include #include #include +#include /* * Pointer to initial global data area @@ -213,6 +214,30 @@ static int announce_dram_init(void) return 0; } +/* + * Check if the sizes in their natural units written in decimal format with + * one fraction number are same. + */ +static int sizes_near(unsigned long long size1, unsigned long long size2) +{ + unsigned int size1_scale = ilog2(size1) / 10 * 10; + unsigned int size1_val = (10 * size1 + ((1ULL << size1_scale) >> 1)) >> size1_scale; + unsigned int size2_scale = ilog2(size2) / 10 * 10; + unsigned int size2_val = (10 * size2 + ((1ULL << size2_scale) >> 1)) >> size2_scale; + + if (size1_val == 10240) { + size1_val = 10; + size1_scale += 10; + } + + if (size2_val == 10240) { + size2_val = 10; + size2_scale += 10; + } + + return size1_scale == size2_scale && size1_val == size2_val; +} + static int show_dram_config(void) { unsigned long long size; @@ -229,7 +254,11 @@ static int show_dram_config(void) } debug("\nDRAM: "); - print_size(size, ""); + print_size(gd->ram_size, ""); + if (!sizes_near(gd->ram_size, size)) { + printf(" (effective "); + print_size(size, ")"); + } board_add_ram_info(0); putc('\n'); -- 2.20.1