From patchwork Tue Aug 16 08:42:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1666731 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.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=MU26v/50; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M6Pmx0Xs4z1yft for ; Tue, 16 Aug 2022 18:43:13 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 24455848C1; Tue, 16 Aug 2022 10:42:47 +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="MU26v/50"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ABADC8499E; Tue, 16 Aug 2022 10:42:41 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70049.outbound.protection.outlook.com [40.107.7.49]) (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 77819848C1 for ; Tue, 16 Aug 2022 10:42:35 +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=Py4ZR+6Xucd/8Ookw1Nr7R16+M+EpJIFZCdCgmHGni/kuNBdwBZqDYjTDEjHc1AiTyaPYdPzLLiZrPoAOqjQTrZsWQ8diCJYTgJASnJbzcVcXFRMvrBlLJj7COgMu7OshfXXZ359qTz7vI2Dz+9R5ICtWCRt8Os4nDgU2p79XkFkWzi5QRy07H6Ni4oTVf9/VYFd2gzcrqUP8OCAutBh6lOgrs1TVNKuiw/N412lLZw8mOZstmHpnW//5Q4OByelufmc+xtKTFTZLQL1S+26TKMLrmm0ZIh0+8L5lXVkL+bF/3LU3H5VsEWOZlp+pNAYWjtFdTK4QQgoWGwv9s57Rw== 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=+BZqjUnoZaYEo6C/e9hMfdIsfQyRxUW14oVqWncsOeI=; b=E8ohMyZkv+1hXZvR3IAh+nbP9fsNm9cz1qqLzMfQ8y/2N0LQMxu3eQmPRMokISiGENT65lqK7ZsnN0z0NLT/r4wnDT28OCeNccYGR9pk54WZZnVtQ52HYZ7dkp9GZs3QarUATIHsaaZczUlzd4ive0dUANwUTPQqt+7K/ngovmq9la2vUwPEbU2tGWgn/gJigMqMH5g2ytU9e+iYhbgg4GT5KcDxEhELiyfO8FhqdcSL+OXfun7AMwodDx8zAKqDmIIXYt+bCoB7b/xXNcyekVgUYuAebqpWVHon7yCaj0WnTiL+ZCyHsrze6+3EqjO5tS2QkVc1fjohDoJWsu+zvw== 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=+BZqjUnoZaYEo6C/e9hMfdIsfQyRxUW14oVqWncsOeI=; b=MU26v/50aN8+IDKEFVepS8Vr1IFEXJk/0gwWztEZ0NCzfyeI5I6jAkdurqGQ3hGo6yR0hgZPbGQSFch4IugHioSjPJsWRA9TLptjpVKoWr1fSrrokWrcU/mKYxEvOMidLmtFAbgez0Nnb5QRvGUHaGHMp2QzVaaRV8Mf8HLnwdU= 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 AM6PR08MB3096.eurprd08.prod.outlook.com (2603:10a6:209:43::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.17; Tue, 16 Aug 2022 08:42:34 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44%3]) with mapi id 15.20.5525.011; Tue, 16 Aug 2022 08:42:34 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Heiko Thiery , Simon Glass Subject: [PATCH v4 03/13] binman: Disable compressed data header Date: Tue, 16 Aug 2022 10:42:00 +0200 Message-Id: <20220816084210.14972-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220816084210.14972-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220816084210.14972-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR0P281CA0139.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::14) 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: 9fbd540e-e7c4-427d-4c64-08da7f634360 X-MS-TrafficTypeDiagnostic: AM6PR08MB3096:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zYF2fQJBEaxk8tWBflxL37PVlgLKiuODyQjwTmd/uVPMU7cmMvCdFOZbj3FOJrxpftqX8j7n1FzQCMwB91eNxG2DQul7nOw6lbEeInJsT+IrOtTcIC8c6loNLEL0GYeJNxnaSvRa0hsYyoT0FRreaE6f3nnZBZhg/rMopLcJ3hGrQ/YNvt2MdvwXOl4nRz1u8oH2NUH0FLl6AcoXppch3akENiCgIzuskP7Tns+FRAVkxGardnK9/xbxOuLbZ2/HQLIV38uOL5M074m1qBD536iI2xUmKrziFK1K5Ck1ekia+tnHs+7WzEed5Wva1OCxnOfB+FceyjxVQPPgmliA8NKehDjXPz2I0JR0ZAp/Bi6eYzEEXsn5Ei0b2EsZhCRos9aQnnfbnNaQL3BgGZ9idizwASMpOlcwjlUQkiQhhvOaf1ZkGBmEOGa3IBmJz3V8dUN47ZaCLUGxPhb33aYlpghfcpgDgrBaKpk/IcH+LpYru37nSF/+vZOzXEkNs+xzgdjNJBwT8bm0o5wEnaYd4poCwoF2LmD+6Luto4isPJ9rTQG1kMWmf7PFcZkUbeiwQl08b8qgh7pnFewcxJADG0J5TkV1pFmblArdtowE8V1wHWxSgYKqlLDnarzm1tgFOH3jg4r1ZFLbmLQtXFmVZibHZzDd/BkLfKztGH7Iw5v3pVuu+USb2sz4C58KRbniAMsKRBqgGOc1tFVeOUAQc6CZ5C6w5UcplAVVvf1vxtY1Z4TvnYg7TGHLtPmPydKCK6UX7qSf3NH9Of172kbsRnmPUbvWKcAiCQWD04cGMoaEU7V7AfbJtBtJhbRVrZLQ 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)(136003)(396003)(376002)(366004)(346002)(39860400002)(6666004)(66556008)(66476007)(38100700002)(38350700002)(478600001)(8676002)(8936002)(66946007)(6486002)(5660300002)(54906003)(4326008)(6506007)(316002)(186003)(26005)(6512007)(2616005)(36756003)(1076003)(83380400001)(86362001)(6916009)(2906002)(52116002)(41300700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ny5oVLQVvzgXPQyQNjSQxytUtglwHtxsvVMGzFqa06nVbef4pgbuBOzic6mBrSJcFdvdFRc/E4fqQrY1mh1doOIzs98zsatipkvRZggNUEvN0Zzu1XGV9cKq2QjnBGSuiIL2/GortjX5tnUFLJFAEM7p6OWdFfJ7S4kdxn4M26dhxMhrAuQ9XSui95llrEd5YFmdLeQZRZw7xr9bLRp7eqYfjYerZ8MehWAQdexVJVZ5aKkfMLJQZF1Zm26sedsJ/RwOeVlsvwxThY/97jhtioR1iuw7hZ5dz24Ltc3LES9GMWmBoc90oL2lC8tQDCl5/pDGtIFKsDi0mfgnA23LZrtME+psAQ19mZtj7vvEKyTsc5iLcj/4IURBFNQFQooFrjS/pCe8szUsY+OFuGeDjHjSUfSecxCgdwUVWzo+HEhQ5owZfm2rtvy3tGSCWjviEv65AsRsFMNPbDdrKj1Dh7Ic9rIjGfNKrMu1m89Y+SjOneqiGdoSzTYf/dFOk23HqeUetexWfa/gLMD5agP6365Tn64lQRuuwD10rKmc99jcvxCNwMS4c7ZmHrUYalv9nZiC2c2iNLAEImRW25tK7PYWrfuRmHEYlEdnZADOWDDmmrBeyPhqkW3zIVqxESdaAyU4IyARfnJEHmb02xRM5Vu3tneD+5MUsyMzrnVm23ZrVLUbHiQ1jQRyOJB5UgkGvRsnCy4d7CdKC/uEuPNfh0A+ws/xXBNHQsLQ+/LZdTwZUji9VIqzSRN23NyuvQyee+s0ceKif09lbxKnfAjcj/lTYompMWEW0c+vJX15evw6QSHEUMcvdOxbUO16IbPzWVvf+xXXJowWnXr5+VPhwWtPgJXDBAWs1yj4bYIC+R7V6WbUrbs8JsYkVd4UXzpSXMGwIxmQ6EkfR+9sPRjAELsKoPz7SEM3HujGl8Z+NKouMvRlh/4sPQi8y6zXNGrQ264jhya1Mu//OAY8MpzHMcBfcOoQ5jyfo7OTNBHBjUMqKBK4vgR9U22zkXO3/HmFw1cifMeNsMhrpSKpBUr2v478vquANcf40jbVNVwP1LWf/o7tDP13+BIXTI9E6agc46IuF5IPF7BPvp8oxoSpkJWKu+P2p9OSBkeoew0pJWArpUVmjXlb9MJjxqVWfqhVoI4kwBB13FooEo9x8dYe1EfvbtuuohqW8fmyjkmyjYei+j/mq+FT+Sq+zey9YZ2WH93hN0sQf7jgYpr0dYcumkQwsfSSW2+hD4mdJtbviVNkVkruxgmATCtCKgXdNvw03+1H2i84pCdOuQDwjlVNXOb/ebmSTfrwuEHGFmMP4VQdfN2svPyanmEtbFMaVXTasuq49vU/jcqtcI7Y2UiJ8bDQTmFKCL2rzd1CWCA/+4PokTP+ZlbzXvC/NJ5QhZjtxn5c9fyjNc4NLzz+mO3oD3cDqY7a6HyDuEQvWKR3xRCDcBYMj8ZeZ2eO0NMQ7hqPQNo1BUZaD4f16PPB4khkYzxVwR/kihc0SGGI3lHZot1I8jp91WbItuuQsoHzKa6K1t7S4FEFNo9RK6W9noMiruABZrImy+xckPKGpA6oXIzioNyH4KgmJRqbrQZdRJDsdcAUXso6IlFXsZ1dRUb/ug== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fbd540e-e7c4-427d-4c64-08da7f634360 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 08:42:33.6938 (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: cV9P9QGdz27bvcYesxt9KSkBI0wxK2wGtd8FNdHlmUe/lt5KUEl6l+YnQEeszvR4xCpoyIRruni84tGg+xpuqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3096 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 Disable the compressed data header of the utilities to compress and decompress data. The header 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 than the compressed contents. Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v3) Changes in v3: - Added tools/binman/entry.py | 2 +- tools/binman/etype/section.py | 3 ++- tools/binman/ftest.py | 18 +++++++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index e3767aefa7..a45aeeaa59 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1079,7 +1079,7 @@ features to produce new behaviours. self.uncomp_data = indata if self.compress != 'none': self.uncomp_size = len(indata) - data = comp_util.compress(indata, self.compress) + data = comp_util.compress(indata, self.compress, with_header=False) return data @classmethod diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index bd67238b91..0a92bf2386 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -777,7 +777,8 @@ class Entry_section(Entry): data = parent_data[offset:offset + child.size] if decomp: indata = data - data = comp_util.decompress(indata, child.compress) + data = comp_util.decompress(indata, child.compress, + with_header=False) if child.uncomp_size: tout.info("%s: Decompressing data size %#x with algo '%s' to data size %#x" % (child.GetPath(), len(indata), child.compress, diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 1b468d8e6d..d082442bec 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -1967,7 +1967,7 @@ class TestFunctional(unittest.TestCase): self._ResetDtbs() def _decompress(self, data): - return comp_util.decompress(data, 'lz4') + return comp_util.decompress(data, 'lz4', with_header=False) def testCompress(self): """Test compression of blobs""" @@ -4449,15 +4449,19 @@ class TestFunctional(unittest.TestCase): rest = base[len(U_BOOT_DATA):] # Check compressed data - section1 = self._decompress(rest) - expect1 = comp_util.compress(COMPRESS_DATA + U_BOOT_DATA, 'lz4') - self.assertEquals(expect1, rest[:len(expect1)]) + expect1 = comp_util.compress(COMPRESS_DATA + U_BOOT_DATA, 'lz4', + with_header=False) + data1 = rest[:len(expect1)] + section1 = self._decompress(data1) + self.assertEquals(expect1, data1) self.assertEquals(COMPRESS_DATA + U_BOOT_DATA, section1) rest1 = rest[len(expect1):] - section2 = self._decompress(rest1) - expect2 = comp_util.compress(COMPRESS_DATA + COMPRESS_DATA, 'lz4') - self.assertEquals(expect2, rest1[:len(expect2)]) + expect2 = comp_util.compress(COMPRESS_DATA + COMPRESS_DATA, 'lz4', + with_header=False) + data2 = rest1[:len(expect2)] + section2 = self._decompress(data2) + self.assertEquals(expect2, data2) self.assertEquals(COMPRESS_DATA + COMPRESS_DATA, section2) rest2 = rest1[len(expect2):]