spl: dra7xx: Add support to decompress lzop compressed images

Lzop compressed image reduce  the binary size by ~75% subsequently decreasing
the time needed to load image from permanent storage. The compressed image is
read from storage as part of loading the remote-core binary and is decompressed
to the load-address specified for each core

Change-Id: I7607575f6f43480b913580b525d12573edd6be9e

6 files changed, 33 insertions, 6 deletions

diff --git a/board/ti/dra7xx/lateattach.c b/board/ti/dra7xx/lateattach.c
index b0458d62bbd1..aa9dbf8e2fa9 100644
--- a/board/ti/dra7xx/lateattach.c
+++ b/board/ti/dra7xx/lateattach.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <omap_remoteproc.h>
 #include <elf.h>
+#include <linux/lzo.h>
 
 #define DPLL_TIMEOUT                 5000
 #define L4_CFG_TARG                  0x4A000000
@@ -1176,8 +1177,9 @@ struct rproc ipu1_config = {
         .page_table_addr = DRA7_PGTBL_BASE_IPU1,
         .mmu_base_addr = {0x58882000, 0},
         .load_addr = IPU1_LOAD_ADDR,
+        .comp_addr = IPU1_COMP_ADDR,
         .core_name = "IPU1",
-        .firmware_name = "dra7-ipu1-fw.xem4",
+        .firmware_name = "dra7-ipu1-fw.lzop",
 #ifdef CONFIG_MMC_IPU1_PART_NAME
         .ptn = CONFIG_MMC_IPU1_PART_NAME,
 #else
@@ -1197,8 +1199,9 @@ struct rproc ipu2_config = {
         .page_table_addr = DRA7_PGTBL_BASE_IPU2,
         .mmu_base_addr = {0x55082000, 0},
         .load_addr = IPU2_LOAD_ADDR,
+        .comp_addr = IPU2_COMP_ADDR,
         .core_name = "IPU2",
-        .firmware_name = "dra7-ipu2-fw.xem4",
+        .firmware_name = "dra7-ipu2-fw.lzop",
 #ifdef CONFIG_MMC_IPU2_PART_NAME
         .ptn = CONFIG_MMC_IPU2_PART_NAME,
 #else
@@ -1218,8 +1221,9 @@ struct rproc dsp1_config = {
         .page_table_addr = DRA7_PGTBL_BASE_DSP1,
         .mmu_base_addr = {0x40D01000, 0x40D02000},
         .load_addr = DSP1_LOAD_ADDR,
+        .comp_addr = DSP1_COMP_ADDR,
         .core_name = "DSP1",
-        .firmware_name = "dra7-dsp1-fw.xe66",
+        .firmware_name = "dra7-dsp1-fw.lzop",
 #ifdef CONFIG_MMC_DSP1_PART_NAME
         .ptn = CONFIG_MMC_DSP1_PART_NAME,
 #else
@@ -1239,8 +1243,9 @@ struct rproc dsp2_config = {
         .page_table_addr = DRA7_PGTBL_BASE_DSP2,
         .mmu_base_addr = {0x41501000, 0x41502000},
         .load_addr = DSP2_LOAD_ADDR,
+        .comp_addr = DSP2_COMP_ADDR,
         .core_name = "DSP2",
-        .firmware_name = "dra7-dsp2-fw.xe66",
+        .firmware_name = "dra7-dsp2-fw.lzop",
 #ifdef CONFIG_MMC_DSP2_PART_NAME
         .ptn = CONFIG_MMC_DSP2_PART_NAME,
 #else
@@ -1265,6 +1270,7 @@ u32 spl_boot_core(u32 core_id)
         struct rproc *cfg = NULL;
         unsigned long load_elf_status = 0;
         int tablesz;
+        u32 decomp_len, inp_len;
 
         if ((core_id == 0) || (core_id >= RPROC_END_ENUMS)) {
                 debug("Invalid core id speicified: %d\n", core_id);
@@ -1272,6 +1278,13 @@ u32 spl_boot_core(u32 core_id)
         }
 
         cfg = rproc_cfg_arr[core_id];
+        /* Check if a compressed image is present */
+        decomp_len = MAX_REMOTECORE_BIN_SIZE;
+        inp_len = MAX_REMOTECORE_BIN_SIZE;
+
+        if(lzop_decompress((u8 *) cfg->comp_addr, inp_len,
+                                        (u8 *) cfg->load_addr, &decomp_len) != 0)
+                        return 1;
 
         /* Check for valid elf image */
         if (!valid_elf_image_local(cfg->load_addr))
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index c6bd1b589353..2aa0b404c931 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -571,11 +571,12 @@ u32 spl_mmc_load_core(u32 core_id, u32 boot_device)
                         err = 1;
                 }
         } else {
-                /* load the remotecore image */
+                /* load the remotecore image to compressed address defined. Once the image
+                 is loaded its decompressed to the load address defined for each core*/
                 err = spl_load_file_fat(&mmc->block_dev,
                                         CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
                                         cfg->firmware_name,
-                                        (u8 *)cfg->load_addr);
+                                        (u8 *)cfg->comp_addr);
         }
 
         if (err <= 0) {
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 8c6a7803d1ca..ff2c95cd8e7e 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -320,6 +320,8 @@
 #define CONFIG_PCF8575_GPIO
 #endif
 
+#define CONFIG_LZO
+
 /* JAMR3 board pin mux */
 #define CONFIG_DRA7XX_JAMR3
 
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 13008ec3cbf5..ff12c95916fd 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -247,6 +247,11 @@
 #define DSP1_LOAD_ADDR          (IPU2_LOAD_ADDR+MAX_REMOTECORE_BIN_SIZE)
 #define DSP2_LOAD_ADDR          (DSP1_LOAD_ADDR+MAX_REMOTECORE_BIN_SIZE)
 
+#define IPU1_COMP_ADDR         (DSP2_LOAD_ADDR+MAX_REMOTECORE_BIN_SIZE)
+#define IPU2_COMP_ADDR         (IPU1_COMP_ADDR+MAX_REMOTECORE_BIN_SIZE)
+#define DSP1_COMP_ADDR         (IPU2_COMP_ADDR+MAX_REMOTECORE_BIN_SIZE)
+#define DSP2_COMP_ADDR         (DSP1_COMP_ADDR+MAX_REMOTECORE_BIN_SIZE)
+
 /* Define the GPT partition names only when they are used.
  * This prevents warnings of invalid GPT table when loading
  * binaries from FAT partition.
diff --git a/include/omap_remoteproc.h b/include/omap_remoteproc.h
index 63bf9e282a50..463172ea773d 100644
--- a/include/omap_remoteproc.h
+++ b/include/omap_remoteproc.h
@@ -430,6 +430,10 @@ struct rproc_intmem_to_l3_mapping {
  * storage for remotecore2 via EDMA while the CPU is processing the ELF image
  * of remotecore1. This address is in the memory view of the A15.
  *
+ * @comp_addr: Address to which the bootloader loads the compressed firmware
+ * from persistent storage before decompressing it and loading it to the
+ * corresponding load_addr.
+ *
  * @firmware_name: Name of the file that is expected to contain the ELF image.
  *
  * @has_rsc_table: Flag populated after parsing the ELF binary on target.
@@ -442,6 +446,7 @@ struct rproc {
         unsigned long page_table_addr;
         unsigned long mmu_base_addr[MAX_NUM_IOMMU];
         unsigned long load_addr;
+        unsigned long comp_addr;
         unsigned long entry_point;
         char *core_name;
         char *firmware_name;
diff --git a/lib/Makefile b/lib/Makefile
index d1a4be5e42c6..5720d7926ac0 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -60,6 +60,7 @@ obj-$(CONFIG_$(SPL_)OF_CONTROL) += fdtdec.o
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o
 obj-$(CONFIG_SPL_NET_SUPPORT) += net_utils.o
+obj-$(CONFIG_LZO) += lzo/
 endif
 obj-$(CONFIG_ADDR_MAP) += addr_map.o
 obj-y += hashtable.o