public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: "Pali Rohár" <pali@kernel.org>
To: u-boot@lists.denx.de, "Marek Behún" <kabel@kernel.org>,
	"Peng Fan" <peng.fan@oss.nxp.com>,
	"Tom Rini" <trini@konsulko.com>
Subject: [PATCH 6/9] ddr: fsl: Fix fsl_ddr_sdram_size() for 4GB modules with 32-bit phys_size_t
Date: Fri,  9 Sep 2022 17:32:43 +0200	[thread overview]
Message-ID: <20220909153246.8455-7-pali@kernel.org> (raw)
In-Reply-To: <20220909153246.8455-1-pali@kernel.org>

Function fsl_ddr_compute() always return size in unsigned long long type,
but function fsl_ddr_sdram_size() returns size in phys_size_t type.

When 36-bit addressing mode is not enabled then phys_size_t type is only
32-bit and thus it cannot store value 4GB (0x100000000). Function
fsl_ddr_sdram_size() in this case returns truncated value 0x0.

Fix this issue by returning the highest representable value, which is
0xffffffff (4GB - 1 byte).

This change fixes crashing of proper U-Boot because it detected 4 GB module
as RAM with zero size.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 drivers/ddr/fsl/main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index ec040f265da2..dd55e61a7a73 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -949,5 +949,9 @@ fsl_ddr_sdram_size(void)
 	/* Compute it once normally. */
 	total_memory = fsl_ddr_compute(&info, STEP_GET_SPD, 1);
 
+	/* Ensure that total_memory does not overflow on return */
+	if (total_memory > (phys_size_t)~0ULL)
+		total_memory = (phys_size_t)~0ULL;
+
 	return total_memory;
 }
-- 
2.20.1


  parent reply	other threads:[~2022-09-09 15:33 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-09 15:32 [PATCH 0/9] Support for 4 GB DDR modules for 32-bit U-Boot builds Pali Rohár
2022-09-09 15:32 ` [PATCH 1/9] common/memsize.c: Fix get_effective_memsize() to always check for CONFIG_MAX_MEM_MAPPED Pali Rohár
2022-09-23 22:48   ` Tom Rini
2022-09-09 15:32 ` [PATCH 2/9] common/memsize.c: Fix get_effective_memsize() to check for overflow Pali Rohár
2022-09-09 15:32 ` [PATCH 3/9] board_f: Fix types for board_get_usable_ram_top() Pali Rohár
2022-09-09 18:21   ` Simon Glass
2022-09-09 15:32 ` [PATCH 4/9] board_f: Fix printing gd->ram_size and gd->ram_top Pali Rohár
2022-09-09 18:20   ` Simon Glass
2022-09-09 21:46     ` Pali Rohár
2022-09-12 13:33       ` Simon Glass
2022-09-09 15:32 ` [PATCH 5/9] ddr: fsl: Fix checking for maximal mappable memory Pali Rohár
2022-09-09 15:32 ` Pali Rohár [this message]
2022-09-09 15:32 ` [PATCH 7/9] ddr: fsl: Allow to detect 4 GB DDR modules in 32-bit mode Pali Rohár
2022-09-09 15:32 ` [PATCH 8/9] ddr: fsl: Fix re-align of verbose DRAM information for non-SPL builds Pali Rohár
2022-09-09 18:21   ` Simon Glass
2022-09-09 19:08     ` Tom Rini
2022-09-09 19:39       ` Simon Glass
2022-09-09 21:05         ` Tom Rini
2022-09-09 15:32 ` [PATCH 9/9] powerpc/mpc85xx: Explain TLB unmapped memory message Pali Rohár
2022-09-11  9:29 ` [PATCH 10/9] powerpc/mpc85xx: Fix re-align of unmapped DDR memory message for non-SPL builds Pali Rohár

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220909153246.8455-7-pali@kernel.org \
    --to=pali@kernel.org \
    --cc=kabel@kernel.org \
    --cc=peng.fan@oss.nxp.com \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox