public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Subject: [PATCH 21/26 v6] spl: spl_legacy: Add lzma decompression support for legacy image
Date: Wed,  8 Apr 2020 10:09:37 +0200	[thread overview]
Message-ID: <20200408080942.7694-22-sr@denx.de> (raw)
In-Reply-To: <20200408080942.7694-1-sr@denx.de>

From: Weijie Gao <weijie.gao@mediatek.com>

This patch adds support for decompressing LZMA compressed u-boot payload
in legacy uImage format.

Using this patch together with u-boot-lzma.img may be useful for some
platforms as they can reduce the size and load time of u-boot payload.

Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Weijie Gao <weijie.gao@mediatek.com>
Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---
Changes in v6:
- New patch

 common/spl/spl_legacy.c | 48 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c
index d0fc4b111e..2cd2a74a4c 100644
--- a/common/spl/spl_legacy.c
+++ b/common/spl/spl_legacy.c
@@ -4,8 +4,15 @@
  */
 
 #include <common.h>
+#include <malloc.h>
 #include <spl.h>
 
+#include <lzma/LzmaTypes.h>
+#include <lzma/LzmaDec.h>
+#include <lzma/LzmaTools.h>
+
+#define LZMA_LEN	(1 << 20)
+
 int spl_parse_legacy_header(struct spl_image_info *spl_image,
 			    const struct image_header *header)
 {
@@ -56,15 +63,50 @@ int spl_load_legacy_img(struct spl_image_info *spl_image,
 			const struct image_header *header,
 			uintptr_t dataptr, struct spl_load_info *info)
 {
+	__maybe_unused SizeT lzma_len;
+	__maybe_unused void *src;
 	int ret;
 
 	ret = spl_parse_image_header(spl_image, header);
 	if (ret)
 		return ret;
 
-	dataptr = (uintptr_t)header + sizeof(struct image_header);
-	info->read(info, dataptr, spl_image->size,
-		   (void *)(unsigned long)spl_image->load_addr);
+	switch (image_get_comp(header)) {
+	case IH_COMP_NONE:
+		info->read(info, dataptr, spl_image->size,
+			   (void *)(unsigned long)spl_image->load_addr);
+		break;
+
+#if IS_ENABLED(CONFIG_SPL_LZMA)
+	case IH_COMP_LZMA:
+		lzma_len = LZMA_LEN;
+
+		debug("LZMA: Decompressing %08lx to %08lx\n",
+		      dataptr, spl_image->load_addr);
+		src = malloc(spl_image->size);
+		if (!src) {
+			printf("Unable to allocate %d bytes for LZMA\n",
+			       spl_image->size);
+			return -ENOMEM;
+		}
+
+		info->read(info, dataptr, spl_image->size, src);
+		ret = lzmaBuffToBuffDecompress((void *)spl_image->load_addr,
+					       &lzma_len, src, spl_image->size);
+		if (ret) {
+			printf("LZMA decompression error: %d\n", ret);
+			return ret;
+		}
+
+		spl_image->size = lzma_len;
+		break;
+#endif
+
+	default:
+		debug("Compression method %s is not supported\n",
+		      genimg_get_comp_short_name(image_get_comp(header)));
+		return -EINVAL;
+	}
 
 	return 0;
 }
-- 
2.26.0

  parent reply	other threads:[~2020-04-08  8:09 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-08  8:09 [PATCH 00/26 v6] Refactor the architecture parts of mt7628 Stefan Roese
2020-04-08  8:09 ` [PATCH 01/26 v6] mips: add support to restore exception vector base before booting linux Stefan Roese
2020-04-08  8:09 ` [PATCH 02/26 v6] mips: mtmips: add predefined i-cache/d-cache size and linesize Stefan Roese
2020-04-08  8:09 ` [PATCH 03/26 v6] mips: add an option to support initialize SRAM for initial stack Stefan Roese
2020-04-08  8:09 ` [PATCH 04/26 v6] mips: start.S: avoid overwriting outside gd when clearing global data in stack Stefan Roese
2020-04-08  8:09 ` [PATCH 05/26 v6] sysreset: add reset controller based reboot driver Stefan Roese
2020-04-08  8:09 ` [PATCH 06/26 v6] mips: mtmips: make use of sysreset-resetctrl for mt7628 soc Stefan Roese
2020-04-08  8:09 ` [PATCH 07/26 v6] configs: enable CONFIG_RESTORE_EXCEPTION_VECTOR_BASE for all mtmips boards Stefan Roese
2020-04-08  8:09 ` [PATCH 08/26 v6] mips: add a mtmips-specific field to architecture-specific global data Stefan Roese
2020-04-08  8:09 ` [PATCH 09/26 v6] mips: add a option to support not reserving malloc space on initial stack Stefan Roese
2020-04-08  8:09 ` [PATCH 10/26 v6] mips: mtmips: rewrite lowlevel codes of mt7628 Stefan Roese
2020-04-08  8:09 ` [PATCH 11/26 v6] dts: mtmips: add alternative pinmux node for uart2 Stefan Roese
2020-04-08  8:09 ` [PATCH 12/26 v6] mips: enable support for appending dtb to spl binary Stefan Roese
2020-04-08  8:09 ` [PATCH 13/26 v6] mips: add an option to enable u_boot_list section for SPL loaders in u-boot-spl.lds Stefan Roese
2020-04-08  8:09 ` [PATCH 14/26 v6] lib: enable lzma decompression support for SPL build Stefan Roese
2020-04-08  8:09 ` [PATCH 15/26 v6] Makefile: add support to generate LZMA compressed u-boot image Stefan Roese
2020-04-08  8:09 ` [PATCH 16/26 v6] tools: binman: add etype file for u-boot-lzma-img Stefan Roese
2020-04-08  8:09 ` [PATCH 17/26 v6] spl: Extract legacy image handling into separate file Stefan Roese
2020-04-08  8:09 ` [PATCH 18/26 v6] spl: spl_legacy: Use IS_ENABLED() to remove #ifdef Stefan Roese
2020-04-08  8:09 ` [PATCH 19/26 v6] spl: spl_nor: Copy image header to local struct Stefan Roese
2020-04-09  7:24   ` Simon Goldschmidt
2020-04-08  8:09 ` [PATCH 20/26 v6] spl: spl_nor: Move legacy image loading into spl_legacy.c Stefan Roese
2020-04-09 18:51   ` Daniel Schwierzeck
2020-04-10  8:02     ` Stefan Roese
2020-04-08  8:09 ` Stefan Roese [this message]
2020-04-08  8:09 ` [PATCH 22/26 v6] spl: spl_legacy: Add cache flush after reading U-Boot image Stefan Roese
2020-04-09  7:29   ` Simon Goldschmidt
2020-04-09  7:43     ` Stefan Roese
2020-04-09 16:47       ` Daniel Schwierzeck
2020-04-10  7:50         ` Stefan Roese
2020-04-09 18:15       ` Simon Goldschmidt
2020-04-08  8:09 ` [PATCH 23/26 v6] mips: mtmips: add SPL support Stefan Roese
2020-04-08  8:09 ` [PATCH 24/26 v6] mips: mtmips: enable SPL for all boards Stefan Roese
2020-04-08  8:09 ` [PATCH 25/26 v6] mips: mtmips: add support for mt7628-rfb Stefan Roese
2020-04-08  8:09 ` [PATCH 26/26 v6] mips: mtmips: Increase CONFIG_SPL_SYS_MALLOC_F_LEN Stefan Roese

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200408080942.7694-22-sr@denx.de \
    --to=sr@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox