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 7182FC53210 for ; Thu, 5 Jan 2023 01:22:46 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2347885580; Thu, 5 Jan 2023 02:22:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1672881764; bh=WFFr4ea3nSZCZs1uJPf0N+oRGHfQczL1WbUHOJuZRTQ=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=i94ZIK/6vEc/jD3hnr75XcDRJWcTJpn/4O5C04nzsYqZSyJev/87LiN9rTKKYfGS6 VYb4LFHmH+7HeXLHhhva2tsAWbbwAx+8ApiYjt58giC9pLFpJSK+TQGA8fASTdyPT8 ihE8o7UGZeJsM/vkcqrJz3Fsrg43AgnY4AZaq910HdIrj3Es7wNugroztpHSq9s5hO t+x+D7LNyfFlZbmKx0Ewz3FzWCu5shRBLQJcZaEFaqWNtq/F+9OR/na121scdtmdGq osxskvGOsLeRM7wlSfAPEoYj2njoy7WceKVNz7O5xjJjqBwrTvQf5kRk3eA21Cuppx mt7TSpKn2xPlA== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 3563D851DF; Thu, 5 Jan 2023 02:22:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1672881761; bh=WFFr4ea3nSZCZs1uJPf0N+oRGHfQczL1WbUHOJuZRTQ=; h=From:To:Cc:Subject:Date:From; b=TPFEmoXcUqzcmWfssrS1SBhiKotp1qlmL+T6lDkzwkKeoCnK3qvcx28sz6p27bHtC qGbldbiugSXWgeBK0jw8wX8b8OX+0+OYKDS9kb98QPTUQnKtZdOSae8Fxx4A9jr05l 4uvOOrxOrXJt6Nn0+PCqCc7UlA51ALy5Bpk9+XuC8DMMto9jm+JNU7bUtXRsspGgc5 fzkNC1NyJA60nqALeBGa8OeDJqNGo8N1mB0rlHCcoQfC0Jt1pmYxs04CGl6QavCwYr sIT0bu2z16KXv+8bDEOJf/8D3KVGQITihBWW0c+2NixwQFT3GXocJ2qrQ87xhbmRVY UWOfEHIqP/XJg== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Pali Rohar , Patrice Chotard , Patrick Delaunay , Tom Rini Subject: [PATCH] arm: stm32mp: Fix board_get_usable_ram_top() again Date: Thu, 5 Jan 2023 02:22:22 +0100 Message-Id: <20230105012222.238075-1-marex@denx.de> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 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 Do not access gd->ram_size and assume this is actual valid RAM size. Since commit 777aaaa706b ("common/memsize.c: Fix get_effective_memsize() to check for overflow") the RAM size may be less than gd->ram_size , call get_effective_memsize() to get the limited value instead. The aforementioned commit makes STM32MP15xx boards with 1 GiB of DRAM at 0xc0000000 hang on boot, which is a grave defect. Signed-off-by: Marek Vasut --- Cc: Pali Rohar Cc: Patrice Chotard Cc: Patrick Delaunay Cc: Tom Rini --- arch/arm/mach-stm32mp/dram_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c index 9346fa8546d..80ba5c27741 100644 --- a/arch/arm/mach-stm32mp/dram_init.c +++ b/arch/arm/mach-stm32mp/dram_init.c @@ -51,7 +51,7 @@ phys_size_t board_get_usable_ram_top(phys_size_t total_size) /* found enough not-reserved memory to relocated U-Boot */ lmb_init(&lmb); - lmb_add(&lmb, gd->ram_base, gd->ram_size); + lmb_add(&lmb, gd->ram_base, get_effective_memsize()); boot_fdt_add_mem_rsv_regions(&lmb, (void *)gd->fdt_blob); /* add 8M for reserved memory for display, fdt, gd,... */ size = ALIGN(SZ_8M + CONFIG_SYS_MALLOC_LEN + total_size, MMU_SECTION_SIZE), -- 2.39.0