Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 07:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

spl: Use map_sysmem where appropriate

Browse source 
All "physical" addresses in SPL must be converted to virtual addresses
before access in order for sandbox to work. Add some calls to map_sysmem in
appropriate places. We do not generally call unmap_sysmem, since we need
the image memory to still be mapped when we jump to the image. This doesn't
matter at the moment since unmap_sysmem is a no-op.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Sean Anderson 2023-10-14 16:47:55 -04:00 committed by Tom Rini
parent 93caa3efe2
commit b02c4e941c
11 changed files with 69 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/spl/spl.c
View file

@ -653,7 +653,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
spl_set_bd();
if (IS_ENABLED(CONFIG_SPL_SYS_MALLOC)) {
mem_malloc_init(SPL_SYS_MALLOC_START, SPL_SYS_MALLOC_SIZE);
mem_malloc_init((ulong)map_sysmem(SPL_SYS_MALLOC_START,
SPL_SYS_MALLOC_SIZE),
SPL_SYS_MALLOC_SIZE);
gd->flags |= GD_FLG_FULL_MALLOC_INIT;
}
if (!(gd->flags & GD_FLG_SPL_INIT)) {

6
common/spl/spl_blk_fs.c
View file

@ -9,6 +9,7 @@
#include <spl.h>
#include <image.h>
#include <fs.h>
#include <asm/io.h>
struct blk_dev {
const char *ifname;
@ -29,7 +30,8 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
return ret;
}
ret = fs_read(load->filename, (ulong)buf, file_offset, size, &actlen);
ret = fs_read(load->filename, virt_to_phys(buf), file_offset, size,
&actlen);
if (ret < 0) {
printf("spl: error reading image %s. Err - %d\n",
load->filename, ret);
@ -69,7 +71,7 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
goto out;
}
ret = fs_read(filename, (ulong)header, 0,
ret = fs_read(filename, virt_to_phys(header), 0,
sizeof(struct legacy_img_hdr), &actlen);
if (ret) {
printf("spl: unable to read file %s. Err - %d\n", filename,

4
common/spl/spl_ext.c
View file

@ -2,6 +2,7 @@
#include <common.h>
#include <env.h>
#include <mapmem.h>
#include <part.h>
#include <spl.h>
#include <asm/u-boot.h>
@ -53,7 +54,8 @@ int spl_load_image_ext(struct spl_image_info *spl_image,
goto end;
}
err = ext4fs_read((char *)spl_image->load_addr, 0, filelen, &actlen);
err = ext4fs_read(map_sysmem(spl_image->load_addr, filelen), 0, filelen,
&actlen);
end:
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT

11
common/spl/spl_fat.c
View file

@ -11,6 +11,7 @@
#include <common.h>
#include <env.h>
#include <log.h>
#include <mapmem.h>
#include <spl.h>
#include <asm/u-boot.h>
#include <fat.h>
@ -79,11 +80,13 @@ int spl_load_image_fat(struct spl_image_info *spl_image,
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) &&
image_get_magic(header) == FDT_MAGIC) {
err = file_fat_read(filename, (void *)CONFIG_SYS_LOAD_ADDR, 0);
err = file_fat_read(filename,
map_sysmem(CONFIG_SYS_LOAD_ADDR, 0), 0);
if (err <= 0)
goto end;
err = spl_parse_image_header(spl_image, bootdev,
(struct legacy_img_hdr *)CONFIG_SYS_LOAD_ADDR);
map_sysmem(CONFIG_SYS_LOAD_ADDR,
err));
if (err == -EAGAIN)
return err;
if (err == 0)
@ -104,8 +107,8 @@ int spl_load_image_fat(struct spl_image_info *spl_image,
if (err)
goto end;
err = file_fat_read(filename,
(u8 *)(uintptr_t)spl_image->load_addr, 0);
err = file_fat_read(filename, map_sysmem(spl_image->load_addr,
spl_image->size), 0);
}
end:

36
common/spl/spl_fit.c
View file

@ -16,6 +16,7 @@
#include <sysinfo.h>
#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <linux/libfdt.h>
#include <linux/printk.h>
@ -393,25 +394,32 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
/* Figure out which device tree the board wants to use */
node = spl_fit_get_image_node(ctx, FIT_FDT_PROP, index++);
if (node < 0) {
size_t size;
debug("%s: cannot find FDT node\n", __func__);
/*
* U-Boot did not find a device tree inside the FIT image. Use
* the U-Boot device tree instead.
*/
if (gd->fdt_blob)
memcpy((void *)image_info.load_addr, gd->fdt_blob,
fdt_totalsize(gd->fdt_blob));
else
if (!gd->fdt_blob)
return node;
/*
* Make the load-address of the FDT available for the SPL
* framework
*/
size = fdt_totalsize(gd->fdt_blob);
spl_image->fdt_addr = map_sysmem(image_info.load_addr, size);
memcpy(spl_image->fdt_addr, gd->fdt_blob, size);
} else {
ret = load_simple_fit(info, sector, ctx, node, &image_info);
if (ret < 0)
return ret;
spl_image->fdt_addr = phys_to_virt(image_info.load_addr);
}
/* Make the load-address of the FDT available for the SPL framework */
spl_image->fdt_addr = map_sysmem(image_info.load_addr, 0);
if (CONFIG_IS_ENABLED(FIT_IMAGE_TINY))
return 0;
@ -876,7 +884,7 @@ int spl_load_fit_image(struct spl_image_info *spl_image,
#ifdef CONFIG_SPL_FIT_SIGNATURE
images.verify = 1;
#endif
ret = fit_image_load(&images, (ulong)header,
ret = fit_image_load(&images, virt_to_phys((void *)header),
NULL, &fit_uname_config,
IH_ARCH_DEFAULT, IH_TYPE_STANDALONE, -1,
FIT_LOAD_OPTIONAL, &fw_data, &fw_len);
@ -884,15 +892,15 @@ int spl_load_fit_image(struct spl_image_info *spl_image,
printf("DEPRECATED: 'standalone = ' property.");
printf("Please use either 'firmware =' or 'kernel ='\n");
} else {
ret = fit_image_load(&images, (ulong)header, NULL,
&fit_uname_config, IH_ARCH_DEFAULT,
ret = fit_image_load(&images, virt_to_phys((void *)header),
NULL, &fit_uname_config, IH_ARCH_DEFAULT,
IH_TYPE_FIRMWARE, -1, FIT_LOAD_OPTIONAL,
&fw_data, &fw_len);
}
if (ret < 0) {
ret = fit_image_load(&images, (ulong)header, NULL,
&fit_uname_config, IH_ARCH_DEFAULT,
ret = fit_image_load(&images, virt_to_phys((void *)header),
NULL, &fit_uname_config, IH_ARCH_DEFAULT,
IH_TYPE_KERNEL, -1, FIT_LOAD_OPTIONAL,
&fw_data, &fw_len);
}
@ -914,9 +922,9 @@ int spl_load_fit_image(struct spl_image_info *spl_image,
#ifdef CONFIG_SPL_FIT_SIGNATURE
images.verify = 1;
#endif
ret = fit_image_load(&images, (ulong)header, NULL, &fit_uname_config,
IH_ARCH_DEFAULT, IH_TYPE_FLATDT, -1,
FIT_LOAD_OPTIONAL, &dt_data, &dt_len);
ret = fit_image_load(&images, virt_to_phys((void *)header), NULL,
&fit_uname_config, IH_ARCH_DEFAULT, IH_TYPE_FLATDT,
-1, FIT_LOAD_OPTIONAL, &dt_data, &dt_len);
if (ret >= 0) {
spl_image->fdt_addr = (void *)dt_data;

4
common/spl/spl_imx_container.c
View file

@ -9,6 +9,7 @@
#include <errno.h>
#include <imx_container.h>
#include <log.h>
#include <mapmem.h>
#include <spl.h>
#ifdef CONFIG_AHAB_BOOT
#include <asm/mach-imx/ahab.h>
@ -46,7 +47,8 @@ static struct boot_img_t *read_auth_image(struct spl_image_info *spl_image,
debug("%s: container: %p sector: %lu sectors: %u\n", __func__,
container, sector, sectors);
if (info->read(info, sector, sectors,
(void *)images[image_index].dst) != sectors) {
map_sysmem(images[image_index].dst,
images[image_index].size)) != sectors) {
printf("%s wrong\n", __func__);
return NULL;
}

6
common/spl/spl_legacy.c
View file

@ -7,6 +7,7 @@
#include <image.h>
#include <log.h>
#include <malloc.h>
#include <mapmem.h>
#include <asm/sections.h>
#include <spl.h>
@ -129,7 +130,7 @@ int spl_load_legacy_img(struct spl_image_info *spl_image,
dataptr += sizeof(*hdr);
load->read(load, dataptr, spl_image->size,
(void *)(unsigned long)spl_image->load_addr);
map_sysmem(spl_image->load_addr, spl_image->size));
break;
case IH_COMP_LZMA:
@ -148,7 +149,8 @@ int spl_load_legacy_img(struct spl_image_info *spl_image,
}
load->read(load, dataptr, spl_image->size, src);
ret = lzmaBuffToBuffDecompress((void *)spl_image->load_addr,
ret = lzmaBuffToBuffDecompress(map_sysmem(spl_image->load_addr,
spl_image->size),
&lzma_len, src, spl_image->size);
if (ret) {
printf("LZMA decompression error: %d\n", ret);

4
common/spl/spl_mmc.c
View file

@ -8,6 +8,7 @@
#include <common.h>
#include <dm.h>
#include <log.h>
#include <mapmem.h>
#include <part.h>
#include <spl.h>
#include <linux/compiler.h>
@ -46,7 +47,8 @@ static int mmc_load_legacy(struct spl_image_info *spl_image,
count = blk_dread(mmc_get_blk_desc(mmc),
sector + image_offset_sectors,
image_size_sectors,
(void *)(ulong)spl_image->load_addr);
map_sysmem(spl_image->load_addr,
image_size_sectors * mmc->read_bl_len));
debug("read %x sectors to %lx\n", image_size_sectors,
spl_image->load_addr);
if (count != image_size_sectors)

10
common/spl/spl_net.c
View file

@ -11,6 +11,7 @@
#include <errno.h>
#include <image.h>
#include <log.h>
#include <mapmem.h>
#include <spl.h>
#include <net.h>
#include <linux/libfdt.h>
@ -21,14 +22,15 @@ static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
{
debug("%s: sector %lx, count %lx, buf %lx\n",
__func__, sector, count, (ulong)buf);
memcpy(buf, (void *)(image_load_addr + sector), count);
memcpy(buf, map_sysmem(image_load_addr + sector, count), count);
return count;
}
static int spl_net_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
struct legacy_img_hdr *header = (struct legacy_img_hdr *)image_load_addr;
struct legacy_img_hdr *header = map_sysmem(image_load_addr,
sizeof(*header));
int rv;
env_init();
@ -62,7 +64,9 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
if (rv)
return rv;
memcpy((void *)spl_image->load_addr, header, spl_image->size);
memcpy(map_sysmem(spl_image->load_addr, spl_image->size),
map_sysmem(image_load_addr, spl_image->size),
spl_image->size);
}
return rv;

5
common/spl/spl_nor.c
View file

@ -7,6 +7,7 @@
#include <image.h>
#include <imx_container.h>
#include <log.h>
#include <mapmem.h>
#include <spl.h>
static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
@ -14,7 +15,7 @@ static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
{
debug("%s: sector %lx, count %lx, buf %p\n",
__func__, sector, count, buf);
memcpy(buf, (void *)sector, count);
memcpy(buf, map_sysmem(sector, count), count);
return count;
}
@ -92,7 +93,7 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
* Load real U-Boot from its location in NOR flash to its
* defined location in SDRAM
*/
header = (const struct legacy_img_hdr *)spl_nor_get_uboot_base();
header = map_sysmem(spl_nor_get_uboot_base(), sizeof(*header));
#ifdef CONFIG_SPL_LOAD_FIT
if (image_get_magic(header) == FDT_MAGIC) {
debug("Found FIT format U-Boot\n");

14
common/spl/spl_spi.c
View file

@ -12,11 +12,13 @@
#include <image.h>
#include <imx_container.h>
#include <log.h>
#include <mapmem.h>
#include <spi.h>
#include <spi_flash.h>
#include <errno.h>
#include <spl.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <dm/ofnode.h>
#if CONFIG_IS_ENABLED(OS_BOOT)
@ -134,13 +136,16 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) &&
image_get_magic(header) == FDT_MAGIC) {
u32 size = roundup(fdt_totalsize(header), 4);
err = spi_flash_read(flash, payload_offs,
roundup(fdt_totalsize(header), 4),
(void *)CONFIG_SYS_LOAD_ADDR);
size,
map_sysmem(CONFIG_SYS_LOAD_ADDR,
size));
if (err)
return err;
err = spl_parse_image_header(spl_image, bootdev,
(struct legacy_img_hdr *)CONFIG_SYS_LOAD_ADDR);
phys_to_virt(CONFIG_SYS_LOAD_ADDR));
} else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) {
struct spl_load_info load;
@ -172,7 +177,8 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
return err;
err = spi_flash_read(flash, payload_offs + spl_image->offset,
spl_image->size,
(void *)spl_image->load_addr);
map_sysmem(spl_image->load_addr,
spl_image->size));
}
if (IS_ENABLED(CONFIG_SPI_FLASH_SOFT_RESET)) {
err = spi_nor_remove(flash);