commit e253f78d5657d2111d45be0e5a30a49f9fe5f412 Author: Andre Przywara Date: Fri Jul 1 00:02:01 2016 +0100 SPL: refactor FDT FIT loading Split the spl_fit_select_fdt() function that determines the right configuration _and_ finds the matching DTB into: 1) a function that just returns the node for the matching configuration 2) a function that returns the image data for a given property in that configuration node, additionally using a certain index into a list of arguments (spl_fit_select_index()). This function is a generalized version of the existing spl_fit_select_fdt() function. This patch introduces no functional changes, it just refactors the code to allow reusing it later. (diff is overly clever here and produces a hard-to-read patch, so I recommend to throw a look at the result instead). Signed-off-by: Andre Przywara second rework part FIT loading: factor out spl_load_image sunxi SPL SPI loading: support FIT image diff --git a/u-boot/common/spl/spl_fit.c b/u-boot/common/spl/spl_fit.c index a5d903b..fac5620 100644 --- a/u-boot/common/spl/spl_fit.c +++ b/u-boot/common/spl/spl_fit.c @@ -22,13 +22,11 @@ static ulong fdt_getprop_u32(const void *fdt, int node, const char *prop) return fdt32_to_cpu(*cell); } -static int spl_fit_select_fdt(const void *fdt, int images, int *fdt_offsetp) +static int spl_fit_find_config_node(const void *fdt) { - const char *name, *fdt_name; - int conf, node, fdt_node; - int len; + const char *name; + int conf, node, len; - *fdt_offsetp = 0; conf = fdt_path_offset(fdt, FIT_CONFS_PATH); if (conf < 0) { debug("%s: Cannot find /configurations node: %d\n", __func__, @@ -50,39 +48,56 @@ static int spl_fit_select_fdt(const void *fdt, int images, int *fdt_offsetp) continue; debug("Selecting config '%s'", name); - fdt_name = fdt_getprop(fdt, node, FIT_FDT_PROP, &len); - if (!fdt_name) { - debug("%s: Cannot find fdt name property: %d\n", - __func__, len); - return -EINVAL; - } - debug(", fdt '%s'\n", fdt_name); - fdt_node = fdt_subnode_offset(fdt, images, fdt_name); - if (fdt_node < 0) { - debug("%s: Cannot find fdt node '%s': %d\n", - __func__, fdt_name, fdt_node); - return -EINVAL; + return node; + } + + return -1; +} + +static int spl_fit_get_image_node(const void *fit, int images, + const char *type, int index) +{ + const char *name, *img_name; + int node, conf_node; + int len, i; + + conf_node = spl_fit_find_config_node(fit); + if (conf_node < 0) { +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + printf("No matching DT out of these options:\n"); + for (node = fdt_first_subnode(fit, conf_node); + node >= 0; + node = fdt_next_subnode(fit, node)) { + name = fdt_getprop(fit, node, "description", &len); + printf(" %s\n", name); } +#endif + return -ENOENT; + } - *fdt_offsetp = fdt_getprop_u32(fdt, fdt_node, "data-offset"); - len = fdt_getprop_u32(fdt, fdt_node, "data-size"); - debug("FIT: Selected '%s'\n", name); + img_name = fdt_getprop(fit, conf_node, type, &len); + if (!img_name) { + debug("cannot find property '%s': %d\n", type, len); + return -EINVAL; + } - return len; + for (i = 0; i < index; i++) { + img_name = strchr(img_name, '\0') + 1; + if (*img_name == '\0') { + debug("no string for index %d\n", index); + return -E2BIG; + } } -#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT - printf("No matching DT out of these options:\n"); - for (node = fdt_first_subnode(fdt, conf); - node >= 0; - node = fdt_next_subnode(fdt, node)) { - name = fdt_getprop(fdt, node, "description", &len); - printf(" %s\n", name); + debug("%s: '%s'\n", type, img_name); + node = fdt_subnode_offset(fit, images, img_name); + if (node < 0) { + debug("cannot find image node '%s': %d\n", img_name, node); + return -EINVAL; } -#endif - return -ENOENT; + return node; } static int get_aligned_image_offset(struct spl_load_info *info, int offset) @@ -128,20 +143,62 @@ __weak u8 spl_genimg_get_arch_id(const char *arch_str) return IH_ARCH_DEFAULT; } +static int spl_load_fit_image(struct spl_load_info *info, ulong sector, + void *fit, ulong base_offset, int node, + struct spl_image_info *image_info) +{ + ulong offset; + size_t length; + ulong load, entry; + void *src; + ulong overhead; + const char *arch_str; + int nr_sectors; + + offset = fdt_getprop_u32(fit, node, "data-offset") + base_offset; + length = fdt_getprop_u32(fit, node, "data-size"); + load = fdt_getprop_u32(fit, node, "load"); + if (load == -1UL && image_info) + load = image_info->load_addr; + entry = fdt_getprop_u32(fit, node, "entry"); + arch_str = fdt_getprop(fit, node, "arch", NULL); + + overhead = get_aligned_image_overhead(info, offset); + nr_sectors = get_aligned_image_size(info, overhead + length, offset); + + if (info->read(info, sector + get_aligned_image_offset(info, offset), + nr_sectors, (void*)load) != nr_sectors) + return -EIO; + debug("image: dst=%lx, offset=%lx, size=%lx\n", load, offset, + (unsigned long)length); + + src = (void *)load + overhead; +#ifdef CONFIG_SPL_FIT_IMAGE_POST_PROCESS + board_fit_image_post_process(&src, &length); +#endif + + memcpy((void*)load, src, length); + + if (image_info) { + image_info->load_addr = load; + image_info->size = length; + image_info->entry_point = entry; + image_info->arch = spl_genimg_get_arch_id(arch_str); + } + + return 0; +} + int spl_load_simple_fit(struct spl_image_info *spl_image, struct spl_load_info *info, ulong sector, void *fit) { int sectors; - ulong size, load; + ulong size; unsigned long count; + struct spl_image_info image_info; int node, images; - void *load_ptr; - int fdt_offset, fdt_len; - int data_offset, data_size; int base_offset, align_len = ARCH_DMA_MINALIGN - 1; - int src_sector; - void *dst, *src; - const char *arch_str; + int i; /* * Figure out where the external images start. This is the base for the @@ -174,92 +231,52 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, if (count == 0) return -EIO; - /* find the firmware image to load */ + /* find the node holding the images information */ images = fdt_path_offset(fit, FIT_IMAGES_PATH); if (images < 0) { debug("%s: Cannot find /images node: %d\n", __func__, images); return -1; } - node = fdt_first_subnode(fit, images); + + /* find the U-Boot image */ + node = spl_fit_get_image_node(fit, images, "uboot", 0); + if (node < 0) { + debug("could not find uboot image, trying loadables...\n"); + node = spl_fit_get_image_node(fit, images, "loadables", 0); + } if (node < 0) { - debug("%s: Cannot find first image node: %d\n", __func__, node); + debug("%s: Cannot find u-boot image node: %d\n", + __func__, node); return -1; } - /* Get its information and set up the spl_image structure */ - data_offset = fdt_getprop_u32(fit, node, "data-offset"); - data_size = fdt_getprop_u32(fit, node, "data-size"); - load = fdt_getprop_u32(fit, node, "load"); - arch_str = fdt_getprop(fit, node, "arch", NULL); - debug("data_offset=%x, data_size=%x\n", data_offset, data_size); - spl_image->load_addr = load; - spl_image->entry_point = load; + /* Load the image and set up the spl_image structure */ + spl_load_fit_image(info, sector, fit, base_offset, node, spl_image); spl_image->os = IH_OS_U_BOOT; - spl_image->arch = spl_genimg_get_arch_id(arch_str); - - /* - * Work out where to place the image. We read it so that the first - * byte will be at 'load'. This may mean we need to load it starting - * before then, since we can only read whole blocks. - */ - data_offset += base_offset; - sectors = get_aligned_image_size(info, data_size, data_offset); - load_ptr = (void *)load; - debug("U-Boot size %x, data %p\n", data_size, load_ptr); - dst = load_ptr; - - /* Read the image */ - src_sector = sector + get_aligned_image_offset(info, data_offset); - debug("Aligned image read: dst=%p, src_sector=%x, sectors=%x\n", - dst, src_sector, sectors); - count = info->read(info, src_sector, sectors, dst); - if (count != sectors) - return -EIO; - debug("image: dst=%p, data_offset=%x, size=%x\n", dst, data_offset, - data_size); - src = dst + get_aligned_image_overhead(info, data_offset); - -#ifdef CONFIG_SPL_FIT_IMAGE_POST_PROCESS - board_fit_image_post_process((void **)&src, (size_t *)&data_size); -#endif - - memcpy(dst, src, data_size); /* Figure out which device tree the board wants to use */ - fdt_len = spl_fit_select_fdt(fit, images, &fdt_offset); - if (fdt_len < 0) - return fdt_len; - - /* - * Read the device tree and place it after the image. There may be - * some extra data before it since we can only read entire blocks. - * And also align the destination address to ARCH_DMA_MINALIGN. - */ - dst = (void *)((load + data_size + align_len) & ~align_len); - fdt_offset += base_offset; - sectors = get_aligned_image_size(info, fdt_len, fdt_offset); - src_sector = sector + get_aligned_image_offset(info, fdt_offset); - count = info->read(info, src_sector, sectors, dst); - debug("Aligned fdt read: dst %p, src_sector = %x, sectors %x\n", - dst, src_sector, sectors); - if (count != sectors) - return -EIO; + node = spl_fit_get_image_node(fit, images, FIT_FDT_PROP, 0); + if (node < 0) { + debug("%s: cannot find FDT node\n", __func__); + return node; + } /* - * Copy the device tree so that it starts immediately after the image. - * After this we will have the U-Boot image and its device tree ready - * for us to start. + * Read the device tree and place it after the image. + * Align the destination address to ARCH_DMA_MINALIGN. */ - debug("fdt: dst=%p, data_offset=%x, size=%x\n", dst, fdt_offset, - fdt_len); - src = dst + get_aligned_image_overhead(info, fdt_offset); - dst = load_ptr + data_size; + image_info.load_addr = spl_image->load_addr + spl_image->size; + image_info.load_addr = (image_info.load_addr + align_len) & ~align_len; + spl_load_fit_image(info, sector, fit, base_offset, node, &image_info); -#ifdef CONFIG_SPL_FIT_IMAGE_POST_PROCESS - board_fit_image_post_process((void **)&src, (size_t *)&fdt_len); -#endif + /* Now check if there are more images for us to load */ + for (i = 1; ; i++) { + node = spl_fit_get_image_node(fit, images, "loadables", i); + if (node < 0) + break; - memcpy(dst, src, fdt_len); + spl_load_fit_image(info, sector, fit, base_offset, node, NULL); + } return 0; } diff --git a/u-boot/drivers/mtd/spi/sunxi_spi_spl.c b/u-boot/drivers/mtd/spi/sunxi_spi_spl.c index e70064c..789c2fe 100644 --- a/u-boot/drivers/mtd/spi/sunxi_spi_spl.c +++ b/u-boot/drivers/mtd/spi/sunxi_spi_spl.c @@ -8,6 +8,7 @@ #include #include #include +#include #ifdef CONFIG_SPL_OS_BOOT #error CONFIG_SPL_OS_BOOT is not supported yet @@ -261,27 +262,51 @@ static void spi0_read_data(void *buf, u32 addr, u32 len) } } +static ulong spi_load_read(struct spl_load_info *load, ulong sector, + ulong count, void *buf) +{ + spi0_read_data(buf, sector, count); + + return count; +} + /*****************************************************************************/ static int spl_spi_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { - int err; + int ret = 0; struct image_header *header; header = (struct image_header *)(CONFIG_SYS_TEXT_BASE); spi0_init(); spi0_read_data((void *)header, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40); - err = spl_parse_image_header(spl_image, header); - if (err) - return err; - spi0_read_data((void *)spl_image->load_addr, CONFIG_SYS_SPI_U_BOOT_OFFS, - spl_image->size); + if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && + image_get_magic(header) == FDT_MAGIC) { + struct spl_load_info load; + + debug("Found FIT\n"); + load.dev = NULL; + load.priv = NULL; + load.filename = NULL; + load.bl_len = 1; + load.read = spi_load_read; + ret = spl_load_simple_fit(spl_image, &load, CONFIG_SYS_SPI_U_BOOT_OFFS, + header); + } else { + ret = spl_parse_image_header(spl_image, header); + if (ret) + return ret; + + spi0_read_data((void *)spl_image->load_addr, + CONFIG_SYS_SPI_U_BOOT_OFFS, spl_image->size); + } spi0_deinit(); - return 0; + + return ret; } /* Use priorty 0 to override the default if it happens to be linked in */ -SPL_LOAD_IMAGE_METHOD("sunxi SPI" 0, BOOT_DEVICE_SPI, spl_spi_load_image); +SPL_LOAD_IMAGE_METHOD("sunxi SPI", 0, BOOT_DEVICE_SPI, spl_spi_load_image);