From patchwork Wed Nov 6 22:15:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atish Patra X-Patchwork-Id: 1190728 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="EibTTMwA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 477gqD2F54z9sPF for ; Thu, 7 Nov 2019 09:16:24 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 012A8C21DD4; Wed, 6 Nov 2019 22:15:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E2F2DC21BE5; Wed, 6 Nov 2019 22:15:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CBE19C21C3F; Wed, 6 Nov 2019 22:15:42 +0000 (UTC) Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by lists.denx.de (Postfix) with ESMTPS id C3A24C21C3F for ; Wed, 6 Nov 2019 22:15:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1573078542; x=1604614542; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6n3iMReeTwIc54HyE9OsLjG4SBeNL7bV32mEjN9k/nA=; b=EibTTMwAiEuXFzAKBDL4YbZk/8inQ/irRTpnku65nkgGhezmNbagA8VC oNkezI6j7j/l3cGyMYALf/5KNeUnz4MkW0GSxXssCYDzL6eDB7nx10tN9 hXGFrLS63R1FwZqecZHidFqaAyxtnMn+MHoUz18PZzC90nbYk5viKL46Q BynnWJAcfuqOWebODRhDup3sH3K0kexX8xTH613BuoZ9sukCCae6A75vc JCeBfDbpYP8Wgpr6nGWKVE2TkKVVywYXLdLzv9mF0I4w5TyUCZVgaI2IH ug0+kzl8wPTZCcKaMdd0eh8ayfCZsM/0jWkPKxvPDCmWTRrPiB1nGzu9d A==; IronPort-SDR: vdJ/0sxtOqRwr7o44btMy5VCWSbwOpjag+8F4wlsgx3qXbWX2QbLS8q5GX5yZz9jiXnX8i+Ewy OBKsMzJa89jUCBkDsXnw/hp0jMd+arJm9sqwigGSXRGEH0VMIFnarAPdGnjiyfAjKbuMwGZ13L N8pctQtM8j81pzM5KpTNNecgQcYfsn63KEu5XSNf9zT76gQsWwsqzWdDcTW0o5nffeTgX1jiGC lWdLJUpBnS0RWxBhd60qv8kUSdwwG3a28ikUXvyhhJz+sidEke2lWENRcnBDwsR9jiVFC2PcCe k4w= X-IronPort-AV: E=Sophos;i="5.68,275,1569254400"; d="scan'208";a="229562747" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 07 Nov 2019 06:15:39 +0800 IronPort-SDR: R3F2PatknQ1/2gXszG9hd7dnr2yTD2OqlHDezPNmA1cZKDcv01wNZiLwWsN7pStyYInSLLIDld itpVmQ8LcrjJR+FMxVf9omspsD2FoMGeEmA0Gjnj0xDN3ja+iwyJbNOMc4yaT8p2qT1NQKOMAU Qiz8e+NOYw8w66kbD2Qa8AyOZabciiiJ1t2b2AfIU19RUEDKgWDKWms0PuIPja3KjhIKsLseBV RpnbFIwSijeKsfXEzIqurugZ10Wlwc86nm3u/XHMiWzU1nMU1BS7vaaAIawbCksxI0ZMIowjSo yPJThUM76SkgepzBYSwfDyMQ Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2019 14:10:50 -0800 IronPort-SDR: OcEU8rX2duDGWDm/mB7BInxsKIxYm4957yMTfHCavZi1S9ii6hKQT8tHJEHakvJf2ISf9WeqRi nRmoTMCDJy7nPml7CmBUYBRkZGw6kX/uzOIPQaeeSSM+c4OkM5pUXIQKei9BcbK27WuRZj6HdM YUgn4Joph0dqxn25Rq5Bd363pKlK3k8X2+moIvEA9M+MCZ+xFjoVCOakyXglTc0x4J8uw/DM94 B4szpve5kj9WlYQJEPdeWAlbs8ZYbzG3s0DY9jDFTECPQUMCJV1QHiHAEbzukgmv/VMwRp2oOc dCE= WDCIronportException: Internal Received: from jedi-01.sdcorp.global.sandisk.com (HELO jedi-01.int.fusionio.com) ([10.11.143.218]) by uls-op-cesaip01.wdc.com with ESMTP; 06 Nov 2019 14:15:39 -0800 From: Atish Patra To: u-boot@lists.denx.de Date: Wed, 6 Nov 2019 14:15:20 -0800 Message-Id: <20191106221522.28246-2-atish.patra@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191106221522.28246-1-atish.patra@wdc.com> References: <20191106221522.28246-1-atish.patra@wdc.com> MIME-Version: 1.0 Cc: Thierry Reding , Loic Pallardy , Joe Hershberger , Alexander Graf , trini@konsulko.com Subject: [U-Boot] [RFC/RFT PATCH v3 1/3] lib: kconfig: Add option to set BZIP2 compression method X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" There is no way to select BZIP2 compression method. Add it under library/compression config where all other compression related configs are present. Signed-off-by: Atish Patra Reviewed-by: Tom Rini --- lib/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/Kconfig b/lib/Kconfig index 3da45a5ec322..b5dcdba23014 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -385,6 +385,11 @@ config GZIP help This enables support for GZIP compression algorithm. +config BZIP2 + bool "Enable bzip2 decompression support" + help + This enables support for BZIP2 compression algorithm. + config ZLIB bool default y From patchwork Wed Nov 6 22:15:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atish Patra X-Patchwork-Id: 1190730 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="cxfP22gO"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 477gqm5Jrvz9sP7 for ; Thu, 7 Nov 2019 09:16:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6B8EAC21BE5; Wed, 6 Nov 2019 22:16:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 61857C21DB5; Wed, 6 Nov 2019 22:15:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8380FC21C51; Wed, 6 Nov 2019 22:15:43 +0000 (UTC) Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by lists.denx.de (Postfix) with ESMTPS id BB234C21BE5 for ; Wed, 6 Nov 2019 22:15:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1573078542; x=1604614542; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PAqmwK0qnaIwLc6oeUSWMsGB1Oqx1/hQlXleBeng3fQ=; b=cxfP22gOYf/l1QTrN9j766K8L4DCA3gRjQ/2M1LyCJ2ttSpSm48KKOId O8csgDysNSUrPyNbj9NyRhGeuNsAAyJfYuNgxQJZQ70lOdgzjH/vWHqtJ 1ULH55HADr/5DXP1BVxwmULumBy633Lrt/7SOkUbAfk3WaVH0actymKXe u4ovMwUrYAX3qvGo+gnWb+gx33h0jzPH+lT8QRK/dn8n8r307woweFzo+ EaYfJV3zNxPc5vIsQmmPyjBvCbSgzorAOfQJfHFPOKx7GuRhzjzyarGLQ AD8w4J5QPeSW8Qb00ApYTXLQOxOq+BpSCpIRt3hEHNzgS8pWUaDO5cPXx A==; IronPort-SDR: n42EqB7NZmneiMf2BR+fX3anbAUw6SJjxqfo9DS6Ni7iBDyrkcGb3YA5/1+t5K0NM1ufa81GAz 2fGb+qyMNF/GAepLjn1xkP4Lllh6+BMaIajNSjbK2CztpeBqL7nx4rq0dagsY4rdRx69VuPKdF FSy70YQcxGgR2tcoQ5yCmQ0DFNUWgsHaRLhMa8NIs6PY2ivkznMUICrEDFK1FanrAj4kKKkQLG /4jfgGtXhIeVKWI9XbdE17T3VAD2o6VgIB2gWsprhd3pIaTCa47Wymw/K2YxsSBHoSCgEuefzR 2M4= X-IronPort-AV: E=Sophos;i="5.68,275,1569254400"; d="scan'208";a="229562749" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 07 Nov 2019 06:15:39 +0800 IronPort-SDR: Z4q67VJ0NKl0q8QcaR7UQFHV/up9zcB+uZu+pZhv8XydHSSbjgTRZaZFxr6+Kx5uH6J+CJwmGN dCK5y33s7VuGXItk96dMLMpB4+CMlCiI4uxvXuF6OjdzZhurrwFzfSeFhGNzXdzq9ZSIbsa+gG ngl7T43zIzW7EL7uYu2dHs6xQozo2C7dpGXCWt+he4Q+Ndjs1hfkuEVj6ZLhX8cEd7pgmSmyMn my7ixbyzpsDy9cePfNBrdxDd/faJqQNq74/P7XF7uT9BI4V08Zj3L1qp83V8aivOw1kX0pNAYw BJXmHahySfwm5oO4rvMxU1oU Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2019 14:10:51 -0800 IronPort-SDR: q7ZqITimi+TDD+2erbj9AY1hUVgeNaFIFfvPcsjhV+UQTKullNY2wmLvu9N5IBS3+IpJu+bSGM L6GPLRznVclYjN9zcwWwr4cSU8GSYYQ1R6C6oQGP3odxjnHmS+p0SwjzekV8wjRkfCSbxvTSFa MBGQufEOIbAcaMz0risXVFk6U1RnF10k9OUIm4kQ+5wqmYghuFQFp3ydrzEjIFdU4XHMu3CPCP asdwKSY1znKh2LIcRL2Pev7XT2T9sbNiIer5YxKirh8HLDS4FmQb3q1fW7pFb1+2ZITsCmr2RB QXc= WDCIronportException: Internal Received: from jedi-01.sdcorp.global.sandisk.com (HELO jedi-01.int.fusionio.com) ([10.11.143.218]) by uls-op-cesaip01.wdc.com with ESMTP; 06 Nov 2019 14:15:39 -0800 From: Atish Patra To: u-boot@lists.denx.de Date: Wed, 6 Nov 2019 14:15:21 -0800 Message-Id: <20191106221522.28246-3-atish.patra@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191106221522.28246-1-atish.patra@wdc.com> References: <20191106221522.28246-1-atish.patra@wdc.com> MIME-Version: 1.0 Cc: Thierry Reding , Loic Pallardy , Joe Hershberger , Alexander Graf , trini@konsulko.com Subject: [U-Boot] [RFC/RFT PATCH v3 2/3] image: Add a common compression type detection function. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Currently, there is no method that can detect compression types given a file. This is very useful where a compressed kernel image is loaded directly to the memory. Inspect initial few bytes to figure out compression type of the image. It will be used in booti method for now but can be reused any other function in future as well. Signed-off-by: Atish Patra Reviewed-by: Tom Rini --- common/image.c | 23 +++++++++++++++++++++++ include/image.h | 21 +++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/common/image.c b/common/image.c index 179eef0bd2dc..3043f0a1c2fc 100644 --- a/common/image.c +++ b/common/image.c @@ -196,6 +196,14 @@ struct table_info { const table_entry_t *table; }; +static const struct comp_magic_map image_comp[] = { + { IH_COMP_BZIP2, "bzip2", {0x42, 0x5a},}, + { IH_COMP_GZIP, "gzip", {0x1f, 0x8b},}, + { IH_COMP_LZMA, "lzma", {0x5d, 0x00},}, + { IH_COMP_LZO, "lzo", {0x89, 0x4c},}, + { IH_COMP_NONE, "none", {}, }, +}; + static const struct table_info table_info[IH_COUNT] = { { "architecture", IH_ARCH_COUNT, uimage_arch }, { "compression", IH_COMP_COUNT, uimage_comp }, @@ -401,6 +409,21 @@ static void print_decomp_msg(int comp_type, int type, bool is_xip) printf(" Uncompressing %s\n", name); } +int image_decomp_type(const unsigned char *buf, ulong len) +{ + const struct comp_magic_map *cmagic = image_comp; + + if (len < 2) + return -EINVAL; + + for (; cmagic->comp_id > 0; cmagic++) { + if (!memcmp(buf, cmagic->magic, 2)) + break; + } + + return cmagic->comp_id; +} + int image_decomp(int comp, ulong load, ulong image_start, int type, void *load_buf, void *image_buf, ulong image_len, uint unc_len, ulong *load_end) diff --git a/include/image.h b/include/image.h index c1065c06f9bd..733a6a107da8 100644 --- a/include/image.h +++ b/include/image.h @@ -447,6 +447,15 @@ typedef struct table_entry { char *lname; /* long (output) name to print for messages */ } table_entry_t; +/* + * Compression type and magic number mapping table. + */ +struct comp_magic_map { + int comp_id; + const char *name; + unsigned char magic[2]; +}; + /* * get_table_entry_id() scans the translation table trying to find an * entry that matches the given short name. If a matching entry is @@ -851,6 +860,18 @@ static inline int image_check_target_arch(const image_header_t *hdr) } #endif /* USE_HOSTCC */ +/** + * image_decomp_type() - Find out compression type of an image + * + * @buf: Address in U-Boot memory where image is loaded. + * @len: Length of the compressed image. + * @return compression type or IH_COMP_NONE if not compressed. + * + * Note: Only following compression types are supported now. + * lzo, lzma, gzip, bzip2 + */ +int image_decomp_type(const unsigned char *buf, ulong len); + /** * image_decomp() - decompress an image * From patchwork Wed Nov 6 22:15:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atish Patra X-Patchwork-Id: 1190729 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="ly+vlhTT"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 477gqc0Z0gz9sP7 for ; Thu, 7 Nov 2019 09:16:43 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 69B5AC21D72; Wed, 6 Nov 2019 22:16:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0975AC21DB6; Wed, 6 Nov 2019 22:15:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C24D1C21BE5; Wed, 6 Nov 2019 22:15:43 +0000 (UTC) Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by lists.denx.de (Postfix) with ESMTPS id 00814C21C3F for ; Wed, 6 Nov 2019 22:15:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1573078543; x=1604614543; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HNcClMr/t4RA/K4xiT3x6jYZXLdCQugS/d8GytmZN5w=; b=ly+vlhTTCI0V/WRL+hhR2goAhoTJgkGy+B0DC4kpPsvj9xGA0FvWGwfc +atoc3Ye1f43vKv/9JpbWWgqDOSH2UaC+WK2OOFRfn9RstAvMj4tluYX+ x3wg+9iqjLPxYa/5cCsFJLaNK4JW1M5vEyvM2GeJwFY6LF9ocxsRLTHSX tRJ2ptX1obDnc9bBFFJyep96lNTVQby0dsdp8zAJ+F0WVnV12B5nYIC/G cVxGPmnbcYPP/2gAmFiayhVO/+2e/eEZjLbpo6XKAUsRxHEZJ6TOxQFAB HQs7SkC4AKb40yVGneIF0GAUR4kr90rvfq9R8eqoBcenLiQe1tKSUhMTo g==; IronPort-SDR: HZk/XbD46FcnMRojpn73m2KXyv4RUADxPJ5devnIB0bo8xzHF5DAE2E0lnEhCTuV0Fda5pXslN mL/KT8tc+qAC8enrCS26l1oKMox01E4QJ1gS9mfgUTM5yThYxE3gXkMgbqtwW2ERjFIEnx8Eul 1tjiocmam3BQpNvjTrw83sVNclzMYk5DRvqMBqvglWtYPOG77Mvnoc6TtKMm3+GQRY0ogQBZ3W WjW97AAIdNxsChVqyH2E8A74+Ww/5UVjldfG5AGbxQKP0BkjApuwgifvZZz7STARYlDfFIaxCE qss= X-IronPort-AV: E=Sophos;i="5.68,275,1569254400"; d="scan'208";a="229562751" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 07 Nov 2019 06:15:39 +0800 IronPort-SDR: Eg/5ua8IwHeukeV+AOThtf70EHBhTUMXIgj09EHn0QreL4U/WIoVaX9dz+F1Uh8U+5GA/Jr21W N2azba4Ht5g3YvTLtRi6Qyg3gcGGk1tlwsqabmqzPyt8dlmRUoAs/tntczo/i2hO0fflDYuBro V3Hv+zkntztiyBhKfjY3ptHhVVDJ22WfPSWUtJB/H6osYpW+2LhINTmMHeN8WfjEiea15lxBoC i+bS04dYidaBKaGQ2v79piTb7A7p45GXMib99KnT3l/0LnrB9MYLMWq7STekGcfXzjzIusaOO9 MiFWOHT/BrJ7cs7CHMjfw1o5 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2019 14:10:51 -0800 IronPort-SDR: rciDLnN0970DVMMrIgotJMXR/mQfiFIINf+CjGkVoFgnK6CdfhOrdrJOKK/LCeqnUmx7fyxU3s /Pr+uiWkDLw5LoLASUEham1EQMb7o9L2UaGvX6XbRzjT/xQyl13LDYOiKceSkChQ8TY4yBG7Ip Jx3iXx53FO1E6VhxqJGBk+LL7aZKU3MkShqVPOy8vcSui+EsSaPdJvQtWjsIoIMzAm9F2vQcO+ GaUvFbm7p92RFeNo98d0ZE84rvdMNbpHRwaGj8zGHE4PrpxcE/OtpehOLxohd5eutBihW0+7U8 cPg= WDCIronportException: Internal Received: from jedi-01.sdcorp.global.sandisk.com (HELO jedi-01.int.fusionio.com) ([10.11.143.218]) by uls-op-cesaip01.wdc.com with ESMTP; 06 Nov 2019 14:15:39 -0800 From: Atish Patra To: u-boot@lists.denx.de Date: Wed, 6 Nov 2019 14:15:22 -0800 Message-Id: <20191106221522.28246-4-atish.patra@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191106221522.28246-1-atish.patra@wdc.com> References: <20191106221522.28246-1-atish.patra@wdc.com> MIME-Version: 1.0 Cc: Thierry Reding , Loic Pallardy , Joe Hershberger , Alexander Graf , trini@konsulko.com Subject: [U-Boot] [RFC/RFT PATCH v3 3/3] image: Add compressed Image parsing support in booti. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add compressed Image parsing support so that booti can parse both flat and compressed Image to boot Linux. Currently, it is difficult to calculate a safe address for every board where the compressed image can be decompressed. It is also not possible to figure out the size of the compressed file as well. Thus, user need to set two additional environment variables kernel_comp_addr_r and filesize to make this work. Following compression methods are supported for now. lzma, lzo, bzip2, gzip. lz4 support is not added as ARM64 kernel generates a lz4 compressed image with legacy header which U-Boot doesn't know how to parse and decompress. Tested on HiFive Unleashed and Qemu for RISC-V. Tested on Qemu for ARM64. Signed-off-by: Atish Patra Reviewed-by: Tom Rini --- I could not test this patch on any ARM64 boards due to lack of access to any ARM64 board. If anybody can test it on ARM64, that would be great. --- cmd/booti.c | 39 ++++++++++++++++++++++++++- doc/README.distro | 12 +++++++++ doc/board/sifive/fu540.rst | 55 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 1 deletion(-) diff --git a/cmd/booti.c b/cmd/booti.c index c36b0235df8c..531de507149c 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -13,6 +13,7 @@ #include #include +DECLARE_GLOBAL_DATA_PTR; /* * Image booting support */ @@ -23,6 +24,11 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc, ulong ld; ulong relocated_addr; ulong image_size; + uint8_t *temp; + ulong dest; + ulong dest_end; + unsigned long comp_len; + int ctype; ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START, images, 1); @@ -37,6 +43,33 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc, debug("* kernel: cmdline image address = 0x%08lx\n", ld); } + temp = map_sysmem(ld, 0); + ctype = image_decomp_type(temp, 2); + if (ctype > 0) { + dest = env_get_ulong("kernel_comp_addr_r", 16, 0); + comp_len = env_get_ulong("filesize", 16, 0); + if (!dest || !comp_len) { + puts("kernel_comp_addr_r or filesize is not provided!\n"); + return -EINVAL; + } + if (dest < gd->ram_base || dest > gd->ram_top) { + puts("kernel_comp_addr_r is outside of DRAM range!\n"); + return -EINVAL; + } + + debug("kernel image compression type %d size = 0x%08lx address = 0x%08lx\n", + ctype, comp_len, (ulong)dest); + + ret = image_decomp(ctype, 0, ld, IH_TYPE_KERNEL, + (void *)dest, (void *)ld, comp_len, + CONFIG_SYS_BOOTM_LEN, &dest_end); + if (ret) + return ret; + /* dest_end contains the uncompressed Image size */ + memmove((void *) ld, (void *)dest, dest_end); + } + unmap_sysmem((void *)ld); + ret = booti_setup(ld, &relocated_addr, &image_size, false); if (ret != 0) return 1; @@ -96,10 +129,14 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef CONFIG_SYS_LONGHELP static char booti_help_text[] = "[addr [initrd[:size]] [fdt]]\n" - " - boot Linux 'Image' stored at 'addr'\n" + " - boot Linux flat or compressed 'Image' stored at 'addr'\n" "\tThe argument 'initrd' is optional and specifies the address\n" "\tof an initrd in memory. The optional parameter ':size' allows\n" "\tspecifying the size of a RAW initrd.\n" + "\tCurrently only booting from gz, bz2, lzma and lz4 compression\n" + "\ttypes are supported. In order to boot from any of these compressed\n" + "\timages, user have to set kernel_comp_addr_r and filesize enviornment\n" + "\tvariables beforehand.\n" #if defined(CONFIG_OF_LIBFDT) "\tSince booting a Linux kernel requires a flat device-tree, a\n" "\tthird argument providing the address of the device-tree blob\n" diff --git a/doc/README.distro b/doc/README.distro index ab6e6f4e74be..67b49e1e4b6a 100644 --- a/doc/README.distro +++ b/doc/README.distro @@ -246,6 +246,18 @@ kernel_addr_r: A size of 16MB for the kernel is likely adequate. +kernel_comp_addr_r: + Optional. This is only required if user wants to boot Linux from a compressed + Image(.gz, .bz2, .lzma, .lzo) using booti command. It represents the location + in RAM where the compressed Image will be decompressed temporarily. Once the + decompression is complete, decompressed data will be moved kernel_addr_r for + booting. + +filesize: + Optional. This is only required if user wants to boot Linux from a compressed + Image using booti command. It represents the size of the compressed file. The + size has to at least the size of loaded image for decompression to succeed. + pxefile_addr_r: Mandatory. The location in RAM where extlinux.conf will be loaded to prior diff --git a/doc/board/sifive/fu540.rst b/doc/board/sifive/fu540.rst index 7807f5b2c128..df2c5ad8d3e3 100644 --- a/doc/board/sifive/fu540.rst +++ b/doc/board/sifive/fu540.rst @@ -138,6 +138,10 @@ load uImage. => setenv netmask 255.255.252.0 => setenv serverip 10.206.4.143 => setenv gateway 10.206.4.1 + +If you want to use a flat kernel image such as Image file + +.. code-block:: none => tftpboot ${kernel_addr_r} /sifive/fu540/Image ethernet@10090000: PHY present at 0 ethernet@10090000: Starting autonegotiation... @@ -177,6 +181,57 @@ load uImage. 1.2 MiB/s done Bytes transferred = 8867100 (874d1c hex) + +Or if you want to use a compressed kernel image file such as Image.gz + +.. code-block:: none + => tftpboot ${kernel_addr_r} /sifive/fu540/Image.gz + ethernet@10090000: PHY present at 0 + ethernet@10090000: Starting autonegotiation... + ethernet@10090000: Autonegotiation complete + ethernet@10090000: link up, 1000Mbps full-duplex (lpa: 0x3c00) + Using ethernet@10090000 device + TFTP from server 10.206.4.143; our IP address is 10.206.7.133 + Filename '/sifive/fu540/Image.gz'. + Load address: 0x84000000 + Loading: ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ################################################################# + ########################################## + 1.2 MiB/s + done + Bytes transferred = 4809458 (4962f2 hex) + =>setenv kernel_comp_addr_r 0x90000000 + =>setenv filesize 0x500000 + +By this time, correct kernel image is loaded and required enviornment variables +are set. You can proceed to load the ramdisk and device tree from the tftp server +as well. + +.. code-block:: none => tftpboot ${ramdisk_addr_r} /sifive/fu540/uRamdisk ethernet@10090000: PHY present at 0 ethernet@10090000: Starting autonegotiation...