efi_loader: comments for efi_file_from_path()

[oweals/u-boot.git] / lib / fdtdec.c

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index d28f2cbb1cf6a9aad1492bb294a3f84a02619826..09a7e133a539488bf1f01f96e4821ec362fb7a6a 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <fdt_support.h>
+#include <mapmem.h>
 #include <linux/libfdt.h>
 #include <serial.h>
 #include <asm/sections.h>
@@ -39,21 +40,14 @@ static const char * const compat_names[COMPAT_COUNT] = {
        COMPAT(NVIDIA_TEGRA210_XUSB_PADCTL, "nvidia,tegra210-xusb-padctl"),
        COMPAT(SMSC_LAN9215, "smsc,lan9215"),
        COMPAT(SAMSUNG_EXYNOS5_SROMC, "samsung,exynos-sromc"),
-       COMPAT(SAMSUNG_S3C2440_I2C, "samsung,s3c2440-i2c"),
-       COMPAT(SAMSUNG_EXYNOS5_SOUND, "samsung,exynos-sound"),
-       COMPAT(WOLFSON_WM8994_CODEC, "wolfson,wm8994-codec"),
        COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"),
        COMPAT(SAMSUNG_EXYNOS5_USB3_PHY, "samsung,exynos5250-usb3-phy"),
        COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"),
        COMPAT(SAMSUNG_EXYNOS_MIPI_DSI, "samsung,exynos-mipi-dsi"),
        COMPAT(SAMSUNG_EXYNOS_DWMMC, "samsung,exynos-dwmmc"),
-       COMPAT(SAMSUNG_EXYNOS_MMC, "samsung,exynos-mmc"),
        COMPAT(GENERIC_SPI_FLASH, "spi-flash"),
-       COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"),
-       COMPAT(SAMSUNG_EXYNOS5_I2C, "samsung,exynos5-hsi2c"),
        COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"),
        COMPAT(INTEL_MICROCODE, "intel,microcode"),
-       COMPAT(AMS_AS3722, "ams,as3722"),
        COMPAT(INTEL_QRK_MRC, "intel,quark-mrc"),
        COMPAT(ALTERA_SOCFPGA_DWMAC, "altr,socfpga-stmmac"),
        COMPAT(ALTERA_SOCFPGA_DWMMC, "altr,socfpga-dw-mshc"),
@@ -94,16 +88,6 @@ fdt_addr_t fdtdec_get_addr_size_fixed(const void *blob, int node,
 
        debug("%s: %s: ", __func__, prop_name);
 
-       if (na > (sizeof(fdt_addr_t) / sizeof(fdt32_t))) {
-               debug("(na too large for fdt_addr_t type)\n");
-               return FDT_ADDR_T_NONE;
-       }
-
-       if (ns > (sizeof(fdt_size_t) / sizeof(fdt32_t))) {
-               debug("(ns too large for fdt_size_t type)\n");
-               return FDT_ADDR_T_NONE;
-       }
-
        prop = fdt_getprop(blob, node, prop_name, &len);
        if (!prop) {
                debug("(not found)\n");
@@ -199,7 +183,7 @@ fdt_addr_t fdtdec_get_addr(const void *blob, int node, const char *prop_name)
        return fdtdec_get_addr_size(blob, node, prop_name, NULL);
 }
 
-#if defined(CONFIG_PCI) && defined(CONFIG_DM_PCI)
+#if CONFIG_IS_ENABLED(PCI) && defined(CONFIG_DM_PCI)
 int fdtdec_get_pci_addr(const void *blob, int node, enum fdt_pci_space type,
                        const char *prop_name, struct fdt_pci_addr *addr)
 {
@@ -558,6 +542,39 @@ int fdtdec_get_alias_seq(const void *blob, const char *base, int offset,
        return -ENOENT;
 }
 
+int fdtdec_get_alias_highest_id(const void *blob, const char *base)
+{
+       int base_len = strlen(base);
+       int prop_offset;
+       int aliases;
+       int max = -1;
+
+       debug("Looking for highest alias id for '%s'\n", base);
+
+       aliases = fdt_path_offset(blob, "/aliases");
+       for (prop_offset = fdt_first_property_offset(blob, aliases);
+            prop_offset > 0;
+            prop_offset = fdt_next_property_offset(blob, prop_offset)) {
+               const char *prop;
+               const char *name;
+               int len, val;
+
+               prop = fdt_getprop_by_offset(blob, prop_offset, &name, &len);
+               debug("   - %s, %s\n", name, prop);
+               if (*prop != '/' || prop[len - 1] ||
+                   strncmp(name, base, base_len))
+                       continue;
+
+               val = trailing_strtol(name);
+               if (val > max) {
+                       debug("Found seq %d\n", val);
+                       max = val;
+               }
+       }
+
+       return max;
+}
+
 const char *fdtdec_get_chosen_prop(const void *blob, const char *name)
 {
        int chosen_node;
@@ -1253,8 +1270,9 @@ int fdtdec_setup(void)
 #  if CONFIG_IS_ENABLED(OF_PRIOR_STAGE)
        gd->fdt_blob = (void *)prior_stage_fdt_address;
 #  else
-       gd->fdt_blob = (void *)env_get_ulong("fdtcontroladdr", 16,
-                                               (uintptr_t)gd->fdt_blob);
+       gd->fdt_blob = map_sysmem
+               (env_get_ulong("fdtcontroladdr", 16,
+                              (unsigned long)map_to_sysmem(gd->fdt_blob)), 0);
 #  endif
 # endif
 
@@ -1273,14 +1291,55 @@ int fdtdec_setup(void)
         * If so, pick the most relevant
         */
        fdt_blob = locate_dtb_in_fit(gd->fdt_blob);
-       if (fdt_blob)
+       if (fdt_blob) {
+               gd->multi_dtb_fit = gd->fdt_blob;
                gd->fdt_blob = fdt_blob;
+       }
+
 # endif
 #endif
 
        return fdtdec_prepare_fdt();
 }
 
+#if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
+int fdtdec_resetup(int *rescan)
+{
+       void *fdt_blob;
+
+       /*
+        * If the current DTB is part of a compressed FIT image,
+        * try to locate the best match from the uncompressed
+        * FIT image stillpresent there. Save the time and space
+        * required to uncompress it again.
+        */
+       if (gd->multi_dtb_fit) {
+               fdt_blob = locate_dtb_in_fit(gd->multi_dtb_fit);
+
+               if (fdt_blob == gd->fdt_blob) {
+                       /*
+                        * The best match did not change. no need to tear down
+                        * the DM and rescan the fdt.
+                        */
+                       *rescan = 0;
+                       return 0;
+               }
+
+               *rescan = 1;
+               gd->fdt_blob = fdt_blob;
+               return fdtdec_prepare_fdt();
+       }
+
+       /*
+        * If multi_dtb_fit is NULL, it means that blob appended to u-boot is
+        * not a FIT image containings DTB, but a single DTB. There is no need
+        * to teard down DM and rescan the DT in this case.
+        */
+       *rescan = 0;
+       return 0;
+}
+#endif
+
 #ifdef CONFIG_NR_DRAM_BANKS
 int fdtdec_decode_ram_size(const void *blob, const char *area, int board_id,
                           phys_addr_t *basep, phys_size_t *sizep, bd_t *bd)