Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 11:55:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

boot: fdt: Change type of env_get_bootm_low() to phys_addr_t

Browse source 
Change type of ulong env_get_bootm_low() to phys_addr_t env_get_bootm_low().
The PPC/LS systems already treat env_get_bootm_low() result as phys_addr_t,
while the function itself still returns ulong. This is potentially dangerous
on 64bit systems, where ulong might not be large enough to hold the content
of "bootm_low" environment variable. Fix it by using phys_addr_t, similar to
what env_get_bootm_size() does, which returns phys_size_t .

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
Marek Vasut 2024-03-26 23:13:11 +01:00 • committed by Tom Rini
parent d545fe3b82
commit a4df06e41f
4 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot/bootm.c
View file

@ -242,13 +242,13 @@ static int boot_get_kernel(const char *addr_fit, struct bootm_headers *images,
#ifdef CONFIG_LMB #ifdef CONFIG_LMB
static void boot_start_lmb(struct bootm_headers *images) static void boot_start_lmb(struct bootm_headers *images)
{ {
ulong mem_start; phys_addr_t mem_start;
phys_size_t mem_size; phys_size_t mem_size;
mem_start = env_get_bootm_low(); mem_start = env_get_bootm_low();
mem_size = env_get_bootm_size(); mem_size = env_get_bootm_size();
lmb_init_and_reserve_range(&images->lmb, (phys_addr_t)mem_start, lmb_init_and_reserve_range(&images->lmb, mem_start,
mem_size, NULL); mem_size, NULL);
} }
#else #else

14
boot/image-board.c
View file

@ -107,14 +107,12 @@ static int on_loadaddr(const char *name, const char *value, enum env_op op,
} }
U_BOOT_ENV_CALLBACK(loadaddr, on_loadaddr); U_BOOT_ENV_CALLBACK(loadaddr, on_loadaddr);
ulong env_get_bootm_low(void) phys_addr_t env_get_bootm_low(void)
{ {
char *s = env_get("bootm_low"); char *s = env_get("bootm_low");
if (s) { if (s)
ulong tmp = hextoul(s, NULL); return simple_strtoull(s, NULL, 16);
return tmp;
}
#if defined(CFG_SYS_SDRAM_BASE) #if defined(CFG_SYS_SDRAM_BASE)
return CFG_SYS_SDRAM_BASE; return CFG_SYS_SDRAM_BASE;
@ -538,7 +536,7 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len,
ulong *initrd_start, ulong *initrd_end) ulong *initrd_start, ulong *initrd_end)
{ {
char *s; char *s;
ulong initrd_high; phys_addr_t initrd_high;
int initrd_copy_to_ram = 1; int initrd_copy_to_ram = 1;
s = env_get("initrd_high"); s = env_get("initrd_high");
@ -553,8 +551,8 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len,
initrd_high = env_get_bootm_mapsize() + env_get_bootm_low(); initrd_high = env_get_bootm_mapsize() + env_get_bootm_low();
} }
debug("## initrd_high = 0x%08lx, copy_to_ram = %d\n", debug("## initrd_high = 0x%llx, copy_to_ram = %d\n",
initrd_high, initrd_copy_to_ram); (u64)initrd_high, initrd_copy_to_ram);
if (rd_data) { if (rd_data) {
if (!initrd_copy_to_ram) { /* zero-copy ramdisk support */ if (!initrd_copy_to_ram) { /* zero-copy ramdisk support */

9
boot/image-fdt.c
View file

@ -160,9 +160,10 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
{ {
void *fdt_blob = *of_flat_tree; void *fdt_blob = *of_flat_tree;
void *of_start = NULL; void *of_start = NULL;
u64 start, size, usable; phys_addr_t start, size, usable;
char *fdt_high; char *fdt_high;
ulong mapsize, low; phys_addr_t low;
phys_size_t mapsize;
ulong of_len = 0; ulong of_len = 0;
int bank; int bank;
int err; int err;
@ -217,7 +218,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
if (start + size < low) if (start + size < low)
continue; continue;
usable = min(start + size, (u64)(low + mapsize)); usable = min(start + size, low + mapsize);
/* /*
* At least part of this DRAM bank is usable, try * At least part of this DRAM bank is usable, try
@ -233,7 +234,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
* Reduce the mapping size in the next bank * Reduce the mapping size in the next bank
* by the size of attempt in current bank. * by the size of attempt in current bank.
*/ */
mapsize -= usable - max(start, (u64)low); mapsize -= usable - max(start, low);
if (!mapsize) if (!mapsize)
break; break;
} }

2
include/image.h
View file

@ -946,7 +946,7 @@ static inline void image_set_name(struct legacy_img_hdr *hdr, const char *name)
int image_check_hcrc(const struct legacy_img_hdr *hdr); int image_check_hcrc(const struct legacy_img_hdr *hdr);
int image_check_dcrc(const struct legacy_img_hdr *hdr); int image_check_dcrc(const struct legacy_img_hdr *hdr);
#ifndef USE_HOSTCC #ifndef USE_HOSTCC
ulong env_get_bootm_low(void); phys_addr_t env_get_bootm_low(void);
phys_size_t env_get_bootm_size(void); phys_size_t env_get_bootm_size(void);
phys_size_t env_get_bootm_mapsize(void); phys_size_t env_get_bootm_mapsize(void);
#endif #endif