From patchwork Tue Aug 2 12:27:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1663001 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=q7Bl0tX5; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LxvSN5S7kz9s5W for ; Tue, 2 Aug 2022 22:29:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CC93F8456D; Tue, 2 Aug 2022 14:29:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="q7Bl0tX5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1368784547; Tue, 2 Aug 2022 14:29:07 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70074.outbound.protection.outlook.com [40.107.7.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CE26684560 for ; Tue, 2 Aug 2022 14:29:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hjSoM2EHEU+Al5M8lbZBZMBL304PiUkYdjmMoEk25oqyyfI2KE0UqtUmIoViv8o2X06rHR1Y8E7f8VeIv1W/7zezmy/Z65wq4CZXCS9EjDb7iKrosA/eM++PWudR2PnYiiQPes4tYYgEaTecdl4MAJXgyYKNaX2Nd9rhEJmAHSC0v78KLU0hobZ71+5SwaO24zG52RPfVPS+V3RByCOahTKTcOPOT+lOruD9Zw2CTCqbkgtNAzd99EB2HE+RhN43H9jOsFajZcJnPZRudWbK3fgG8f2KEiM0ROILryB6iNnPW32/yB5RuXGpX1NsL1ZTkcDaVnD74ga68bR2m/Ae1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9ypOC/sbpXpVEE70gqLzA8MhU3sMjBZMar0zOl7yyRo=; b=fFZW9cyVW5FYR+FQJfevbSN/RbSPE9w6bk9Cj7X99if0tN+UnzAJE1NrCRya43IgwHeKJm3jT4s3W5TRsMtkMc7VfC051XU5qskMz9eiIiVzyGMN0qMAURHqkcU2Ca4i1kV/LZleL8Lu+eUIr5jIe1jW6M0I0TdSvydzsiEfydBqwlIr5Dq4YdFZU+HVUc/jt0FDUKMrlCnbnpZEw2RFuSW81NyWrRGAwRXRz4bI+kofwZVatLYl5XgxQON2N15ipEyEnl+4lTN4r23DuW9iM/trtXc+rJLS/RnpKpuTcDWZrCipwRZTj7iy5sRMA4b3DurRHoCKo4cLTUcRo43qaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9ypOC/sbpXpVEE70gqLzA8MhU3sMjBZMar0zOl7yyRo=; b=q7Bl0tX5sbstDEpcZupKrUctzQGPj51i/b7wbB5ftoozWAkfHgHcC2f3e1vkyQmcjMAEVJ12Yk2XI6SN2+qkLMowho9XGPJhWXdLB0+/cLNUf4JgEXgx3WmHLQEO8gOpkd0l81Mg6amnmuriMMRzrvNwFK/cj5YGZNxf5vVIXNU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by VI1PR08MB4447.eurprd08.prod.outlook.com (2603:10a6:803:f3::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.12; Tue, 2 Aug 2022 12:28:57 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::49a6:e5ff:7f94:8787]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::49a6:e5ff:7f94:8787%7]) with mapi id 15.20.5482.016; Tue, 2 Aug 2022 12:28:57 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH 2/3] binman: Remove header from compressed data Date: Tue, 2 Aug 2022 14:27:57 +0200 Message-Id: <20220802122758.20155-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220802122758.20155-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220802122758.20155-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR0P281CA0073.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::13) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ad632ff0-13cd-4868-8401-08da7482925d X-MS-TrafficTypeDiagnostic: VI1PR08MB4447:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RMyZ5uLTtzwVgGPqBq3iglhDK1RyoevwpUSVIYtXyi1i0kC/FVOxkG7IZqerXZDbwdX6Y84TPC+gxThHHQ0VRtNKn2r5XQ2eI+EBxvwTTtvuzM1hKpjTUpbn5buCyL6P09rrc3HYuIimQG1xJN5mqio37Arit6TGj5D3JD+6qIXCCF/XD2pstYnJcmq0PDoQUylxyY7Spb14az7HhUGWXJbLjG9ab0kiGqv5+rOQ3WYapuk/7SvSqxYAbw7715ezYQ0wwAraAxr4QZTU8hW6oJ3Nq5Z7pN3hjWRtRP5K/3I/uEV2YT3POrZuZ0NtGV5qbB+7Cx5S4VI0pFQq89e5R/Rgf/INLAOysQe9ILvE2jUhlYjjRV/QMfU4RPphDJqhfvtzImq6pygXIKVtDo7uUz4PezbHToN6hQBQmWM6y1fzCd8nhlQgBlvR63wL5Pc6Tf/il65l5PhG2olMj0/jOknDgYhSg3CcHTnSiHv30fWYmxzj9AU00NczgULY+hE8Ms+sTOb+yHn/vL3Hh+SNvWSaqbrEvv4NoJkscpww5MQSdyEZLzyogR4tzDgoF+0MxqZuFh10TzDPSstWxpiCzrMtEfb6gHzIhQr+TTTMMbORz5O87EmAkXYBanQBLhqIcIDpoCWmSn0s9lymLWJF0oZqmu8AdZgDq96qQQTriXE49u0NjB9Nv/7iW26YEUsNcPzwQvem3PLUyCZJ/XzOFlrQNDZDqNeEUHzkDgcMlSzzMVeXeRYJI2fefDZHsZuleh5If2yXfooCNDrOz3Iv9GSGvvr2KOWpoORkuRvhH7Y= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(376002)(39860400002)(346002)(366004)(136003)(396003)(1076003)(186003)(86362001)(2616005)(83380400001)(8936002)(5660300002)(8676002)(66556008)(66946007)(66476007)(4326008)(36756003)(2906002)(38100700002)(6486002)(41300700001)(478600001)(6916009)(316002)(6506007)(6512007)(26005)(52116002)(54906003)(38350700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ro7Oq3BbQnahjLfsh1qKzCDfOpQeL9ts4IvZdImBv0zt9YtuRHVR7yzHsx9gB2KhKU9EvG/CiLMBHdsM1Ix8S50HSLz+93ML8pyq1okwT4KXQf9FjnSenWgShU7mLEZB5b1md9X1dqYkxXkOthS5MUizgPwVUWbSaDvNUcEMdJZUB9wl9qjSHvXKgw3mfbJE6+R0PQHSGEngA0MkBDbsw6qae34/Dc7QcPPnRdYKOa2/ZuUVAtL6Ub9/gxfQ8ssF/5CejacgQQ5Z1YzpUIbIqqlYRHDsG2DUvmfEwSWSVD1xj2kCLA062B+cgDRLWKdeRky++TnZvK/EpWEnkw3boZWDfIqweWUuvjwJam15PCzm5gVsCRp1agYTF8Lq/posxnkMzjgvS5sLhvRlkWpyLbAUaRU+joi48VHRWAs83qDV6bifW9qSN5vhd9+9hvxUhzHP5CPUPDXdAcv81yd5WCit5NOAoDsN8qA6bqCzhyB6TzcWAdW39QKkO6cm1tkGIb1WhJ6uo5nAXGFhFmfwGSYDSzbJ3wdKhuv1a475sbyER653isDRW2mXdOAtXbKhTjy/FnSPTfTNbkwk3ucLXxYH9728uUXAFxWYY8uYzqDIR2MMSesysc0uQV+HwXrFGZAmqKW/4diG2OEaC/JGxeKh64IkcQV05Szr7vUKye9BCIB8kdMnJG04wZlV6hEjrwZCQ2fSxiVALHjXpjDYoCwEaqbb7ybPShShiulfhsAsm1intte5upFmlWV0uRYpgRzSdewnyUrrLAnxCC45ImK9PqNbBVITia6eIVYVb5FMGvLUwH3mpgaHQozOk/He+bhrc/uEZC7L81cdGva9hg2z77WRBTl45eQM2YqTN0zyO72KqcXCKRTG1yF+ekHkrF8fcCD5AirmzkkzPduGEqfzIo6ukBMx3R0MztkmYu5fiD8Dg5QxncLv7Kj6sVGbZwT89oKACnqUWzrRb48TLqHxnGJixsx2yj01NvodQSBckxNxbSzWkXJFu4wAZRcEzkIHMv0s8YCWSoUFCbUlw/SR42AJy61TNE1NPuSzS+pdGHMjGzodxTsqa7y88tVIReTs/NvNkFZm55rTwjokVjpTsYfx00BDz9PPfHG2y1ocRCiWg38FIjHqc52IRyKvDfnAIDacHSxcz6veN8gdgSAOe536+sCxR5PP3IMFW5ZUXdi7OT6fcHmd/Lp7QTFKSNF+Bv10443lZtNdpHufncLMNVffYY4LsYg/4ckOZ6bTZzFUqgIqtylQzmNUSlxSfONptk2mETlDu5ip7m7mF94WFAk9NSZ7wIHsP+URumoQZQN/i7Z+Uv9trnNOnteOik///xcowIAPOWiifdTfQtQVtPxmrrhusRU88afyN9hi05K6H1E+C+CmsmmwB8i20gsLo/P9bhALhlFul6WbTSPzir/G9tgrfdcs3T0qJI36CSaUIZcO4yhAZC5hZ+GynqScMSTUpL1U1j4NfRxGQ19u79NvindhZnM02tmNzRXtqYGw67pTFWwVJNGNbbS/n7FYZZkqzWdQTtR+NnZFKN1otF+2MVBnzfJPI0vHVHByR4syhsB/bVOYXD6HNcPKztcHnp9zCZKikRHyxK5N7w== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad632ff0-13cd-4868-8401-08da7482925d X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2022 12:28:57.7612 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NJAYm0ODfYS+CjCowQXbi50CIFrOf/RfOzCFqBfMqeabqq+c11HELd18JbwiRUHnLDZMdbwNqLmyKMYWrtU/mg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4447 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Stefan Herbrechtsmeier Remove header from compressed data because this is uncommon, not supported by U-Boot and incompatible with external compressed artifacts. The header was introduced as part of commit eb0f4a4cb402 ("binman: Support replacing data in a cbfs") to allow device tree entries to be larger that the compressed contents. Regarding the commit "this is necessary to cope with a compressed device tree being updated in such a way that it shrinks after the entry size is already set (an obscure case)". This case need to be fixed without influence the compressed data by itself. Signed-off-by: Stefan Herbrechtsmeier --- tools/binman/cbfs_util.py | 8 ++++---- tools/binman/comp_util.py | 11 ++--------- tools/binman/entry.py | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/tools/binman/cbfs_util.py b/tools/binman/cbfs_util.py index 9cad03886f..a1836f4ad3 100644 --- a/tools/binman/cbfs_util.py +++ b/tools/binman/cbfs_util.py @@ -241,9 +241,9 @@ class CbfsFile(object): """Handle decompressing data if necessary""" indata = self.data if self.compress == COMPRESS_LZ4: - data = comp_util.decompress(indata, 'lz4', with_header=False) + data = comp_util.decompress(indata, 'lz4') elif self.compress == COMPRESS_LZMA: - data = comp_util.decompress(indata, 'lzma', with_header=False) + data = comp_util.decompress(indata, 'lzma') else: data = indata self.memlen = len(data) @@ -362,9 +362,9 @@ class CbfsFile(object): elif self.ftype == TYPE_RAW: orig_data = data if self.compress == COMPRESS_LZ4: - data = comp_util.compress(orig_data, 'lz4', with_header=False) + data = comp_util.compress(orig_data, 'lz4') elif self.compress == COMPRESS_LZMA: - data = comp_util.compress(orig_data, 'lzma', with_header=False) + data = comp_util.compress(orig_data, 'lzma') self.memlen = len(orig_data) self.data_len = len(data) attr = struct.pack(ATTR_COMPRESSION_FORMAT, diff --git a/tools/binman/comp_util.py b/tools/binman/comp_util.py index dc76adab35..269bbf7975 100644 --- a/tools/binman/comp_util.py +++ b/tools/binman/comp_util.py @@ -3,7 +3,6 @@ # """Utilities to compress and decompress data""" -import struct import tempfile from binman import bintool @@ -16,7 +15,7 @@ LZMA_ALONE = bintool.Bintool.create('lzma_alone') HAVE_LZMA_ALONE = LZMA_ALONE.is_present() -def compress(indata, algo, with_header=True): +def compress(indata, algo): """Compress some data using a given algorithm Note that for lzma this uses an old version of the algorithm, not that @@ -41,12 +40,9 @@ def compress(indata, algo, with_header=True): data = LZMA_ALONE.compress(indata) else: raise ValueError("Unknown algorithm '%s'" % algo) - if with_header: - hdr = struct.pack('