mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-23 22:14:54 +00:00

During linux build process the header size is computed including the BSS
whereas it's removed when creating the uncompressed image. Therefore the
size of the uncompressed image on filesystem will be smaller than the
size specified in the header.
This causes issues when loading the kernel image from the SPL (as in
falcon boot) with spl_load since it compares the read file size from the
FS to the header size form the image. Which leads to the following check
in `include/spl_load.h` failing to -EIO when loading kernel image:
return read < spl_image->size ? -EIO : 0;
Therefore we should return the header size back to spl_load instead of
the file size in falcon boot when not loading a FIT image.
Bug report:
https://lore.kernel.org/u-boot/20250214111656.2358748-1-anshuld@ti.com/
Fixes: 775074165d
("spl: Add generic spl_load function")
Reported-by: Anshul Dalal <anshuld@ti.com>
Reviewed-by: Sean Anderson <seanga2@gmail.com>
Signed-off-by: Anshul Dalal <anshuld@ti.com>
156 lines
3.6 KiB
C
156 lines
3.6 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
|
|
#include <env.h>
|
|
#include <part.h>
|
|
#include <spl.h>
|
|
#include <spl_load.h>
|
|
#include <ext4fs.h>
|
|
#include <errno.h>
|
|
#include <image.h>
|
|
|
|
static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
|
|
ulong size, void *buf)
|
|
{
|
|
struct legacy_img_hdr *header;
|
|
int ret;
|
|
loff_t actlen;
|
|
|
|
ret = ext4fs_read(buf, file_offset, size, &actlen);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (CONFIG_IS_ENABLED(OS_BOOT)) {
|
|
header = (struct legacy_img_hdr *)buf;
|
|
if (image_get_magic(header) != FDT_MAGIC)
|
|
return size;
|
|
}
|
|
|
|
return actlen;
|
|
}
|
|
|
|
int spl_load_image_ext(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev,
|
|
struct blk_desc *block_dev, int partition,
|
|
const char *filename)
|
|
{
|
|
s32 err;
|
|
loff_t filelen;
|
|
struct disk_partition part_info = {};
|
|
struct spl_load_info load;
|
|
|
|
if (part_get_info(block_dev, partition, &part_info)) {
|
|
printf("spl: no partition table found\n");
|
|
return -1;
|
|
}
|
|
|
|
ext4fs_set_blk_dev(block_dev, &part_info);
|
|
|
|
err = ext4fs_mount();
|
|
if (!err) {
|
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
printf("%s: ext4fs mount err - %d\n", __func__, err);
|
|
#endif
|
|
return -1;
|
|
}
|
|
|
|
err = ext4fs_open(filename, &filelen);
|
|
if (err < 0) {
|
|
puts("spl: ext4fs_open failed\n");
|
|
goto end;
|
|
}
|
|
|
|
spl_load_init(&load, spl_fit_read, NULL, 1);
|
|
err = spl_load(spl_image, bootdev, &load, filelen, 0);
|
|
|
|
end:
|
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
if (err < 0)
|
|
printf("%s: error reading image %s, err - %d\n",
|
|
__func__, filename, err);
|
|
#endif
|
|
|
|
return err < 0;
|
|
}
|
|
|
|
#if CONFIG_IS_ENABLED(OS_BOOT)
|
|
int spl_load_image_ext_os(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev,
|
|
struct blk_desc *block_dev, int partition)
|
|
{
|
|
int err;
|
|
__maybe_unused loff_t filelen, actlen;
|
|
struct disk_partition part_info = {};
|
|
__maybe_unused char *file;
|
|
|
|
if (part_get_info(block_dev, partition, &part_info)) {
|
|
printf("spl: no partition table found\n");
|
|
return -1;
|
|
}
|
|
|
|
ext4fs_set_blk_dev(block_dev, &part_info);
|
|
|
|
err = ext4fs_mount();
|
|
if (!err) {
|
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
printf("%s: ext4fs mount err - %d\n", __func__, err);
|
|
#endif
|
|
return -1;
|
|
}
|
|
#if defined(CONFIG_SPL_ENV_SUPPORT)
|
|
file = env_get("falcon_args_file");
|
|
if (file) {
|
|
err = ext4fs_open(file, &filelen);
|
|
if (err < 0) {
|
|
puts("spl: ext4fs_open failed\n");
|
|
goto defaults;
|
|
}
|
|
err = ext4fs_read((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0, filelen, &actlen);
|
|
if (err < 0) {
|
|
printf("spl: error reading image %s, err - %d, falling back to default\n",
|
|
file, err);
|
|
goto defaults;
|
|
}
|
|
file = env_get("falcon_image_file");
|
|
if (file) {
|
|
err = spl_load_image_ext(spl_image, bootdev, block_dev,
|
|
partition, file);
|
|
if (err != 0) {
|
|
puts("spl: falling back to default\n");
|
|
goto defaults;
|
|
}
|
|
|
|
return 0;
|
|
} else {
|
|
puts("spl: falcon_image_file not set in environment, falling back to default\n");
|
|
}
|
|
} else {
|
|
puts("spl: falcon_args_file not set in environment, falling back to default\n");
|
|
}
|
|
|
|
defaults:
|
|
#endif
|
|
|
|
err = ext4fs_open(CONFIG_SPL_FS_LOAD_ARGS_NAME, &filelen);
|
|
if (err < 0)
|
|
puts("spl: ext4fs_open failed\n");
|
|
|
|
err = ext4fs_read((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0, filelen, &actlen);
|
|
if (err < 0) {
|
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
printf("%s: error reading image %s, err - %d\n",
|
|
__func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);
|
|
#endif
|
|
return -1;
|
|
}
|
|
|
|
return spl_load_image_ext(spl_image, bootdev, block_dev, partition,
|
|
CONFIG_SPL_FS_LOAD_KERNEL_NAME);
|
|
}
|
|
#else
|
|
int spl_load_image_ext_os(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev,
|
|
struct blk_desc *block_dev, int partition)
|
|
{
|
|
return -ENOSYS;
|
|
}
|
|
#endif
|