From patchwork Fri Aug 19 14:00:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668139 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=MmYgzwY2; 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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M8Nmv08Nnz1ygd for ; Sat, 20 Aug 2022 00:05:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5B2884BC9; Fri, 19 Aug 2022 16:02:18 +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="MmYgzwY2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A938884B72; Fri, 19 Aug 2022 16:01:22 +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,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03hn2246.outbound.protection.outlook.com [52.100.13.246]) (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 92C5884ABE for ; Fri, 19 Aug 2022 16:01:05 +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=Ss7dWA70LNrWCdTh6x32WSSXIjgk/gFWvdu2XcXVnldXjpfd9P/KmbFz1aoKyYlpvz8hSipUjvP14/n3aSaaA0M4s05jF0iqHs+TjEqLJC8xLi8IouPI30x0Bp3Qqh82EtbcaI5C2XNp2QOpNQNzktUsUHWXb3roix//qRb9YrjeJW4A81mP+gza3voavkzeTYACzLInye6SEq/AVrjLC95XK7d3EG4dOLi/GnAcbYSQpu3E/lWFUYwu7f7oJp96n+djp7iGlnLySyjB5UWbiJolNor6q48V25f0H3B0Haw+U4OGljjc9KP21PUtGTN1zG3NxZ0+1pLM9mZBAyY4Vw== 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=WWSP1Fw4t+a6Fn+h4a4qcBJRGHcR1x6hL2gTMg87wac=; b=CiYjK+e4B64krcpTWVDVNZ/4kc8+dPXnMK69Auyeg1MLCJ5wS+geddHr0sexr1ALS+jDbRDruQE2LPvmCYHiiupgvYoq9iR1KaF3+iJq9x01e3TflkzqyaJHxRiVnEjsAt1/0PNUlO3itlNvXAykV9GArbguS0fzWlAlCeaJDi3Nzo6omflJzdXSitA5o2K7co5bCoVPBVLu++tgf8hlFbgw+2lo/esoBj1PolMZ7oyMU1uVhwJ+vOhtf8zJiIiEI2arkoXm38WTmhEe5z0GBi8V1Jl96GO6XweFIORxvUAQafsqj7ry/CNZCj1EH6XvxRurTsDOVfZMOdmOQsmguA== 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=WWSP1Fw4t+a6Fn+h4a4qcBJRGHcR1x6hL2gTMg87wac=; b=MmYgzwY2OuGxD8J5khRw1q+nHTgOlnd1ARZ4BV28g+bjnON5W7r/Z1OEIEdLCHTkYkkvQOrpe9BAFHBanzcA9S1mgQzqsKmrynZ0y0C1E0NiFiEMX/awVyYbK8vemYTBmgoEJwZFh4Aou3DyouUMLJ57KFaz06bpyfUHfw6Lvf8= 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 DU2PR08MB7373.eurprd08.prod.outlook.com (2603:10a6:10:2f1::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.16; Fri, 19 Aug 2022 14:00:57 +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.5546.018; Fri, 19 Aug 2022 14:00:57 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 08/21] binman: Add length header attribute to dtb entry Date: Fri, 19 Aug 2022 16:00:22 +0200 Message-Id: <20220819140035.32760-9-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220819140035.32760-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220819140035.32760-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS4P251CA0011.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::7) 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: 4417e81e-6f37-4b1e-1923-08da81eb3d8b X-MS-TrafficTypeDiagnostic: DU2PR08MB7373:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p8qXTCw5BgR8RDL1EzsLUTl/EDmkwhl6acGH1aTwB/AVvjAPr6NjnrntkrUuN18vw1vOWj9Q6URrEPUNe2quaFRmFK1ZdrT1S0J6NYupdp12nlPOlCtqo6hRugUbB+x2jTBiJzU+iPaVLCXTmuKHFpagIjx4cJUnkbypKzxSGzUU06JEbGkixKgn11LBw20bo5DoSg7cRW2IdqmiBcunx+MKurLdPvcnCT1wlcUboGJKkrJ7nLpjvND8jyEWgpc9qI/urUXYWBy7on8nkp+8rIrVmP1yU7UL483wXcDn0qNo3TMO3plHNnXOkBVZmSzj3RWt9Fl99ooYjT5RkYJdvHnLQ/eikhejPIAs014xKlraPLG3UPTXRbowSMQ+/GjhgzKVgWHxaPnzJaVVvRSLgMt7rfgzq+Zy2cwJ7PAZk1YxXT/sL5F03GmtDpNjxvhUf4p7vFJw7JvOXdiuyqZ04mDLGM07/Q4jQd5RCRUTG0aOhLsTwaofjHCWGVnjkbMVYwI/sl/ZyWTzg+RI0rMC0W+KkESBcKURFeVgG0QmlXVpYZIeaNqkEIcBSNKVhUhjzYGxiNkg0WrgFWmYs8HY1GdoNBk5jmqUl9PD1WkXe56T41rQY9sZxGW9Wvy1OaHhuT26UkYk81cm8C/kI9dWiOaqTOdrepKGQN8fVkweM+PO+DnGsPYmxtgpaDV4ShM10K7RPyjNqLIZQsE40Perx+pwZ63sdEn2YG5Ax4XUR7sQBR0YgvySf1rvMf0KbwpLAG0w26GTrQVLLexfchKN58FvZyrzH2BEOxTzdtHadIne17Ipn9E1Lrv261wf8Yv31Q8b6hZAg254lrEVFKo98ab+UEebNcdJNpGXJrDvToYVabIghItAxtcUTJi7VkhcDiLW5QY1wQ6Krn7JtNRMqEP+IOu776rCgSmhrehauFImxRoCi05uRwftt9O2qdoTm70QnykOFuC7Afi/JK3ipc05xxsqGVC9hlb71m/ScwCZ1qESg+reDeBxdQ3kwUHoW9c5jt4roekeqMt/Jfuj0N1lI02ibDGT8zW0JtcpWpb2RTvX5fq1bDK/q6groavicFUJnC7BLiyWpbNBvs+iTd7T3dNgk1a3SMwzPCS2DOMRQi3Aoal84/VePJW+6f5vxXlD5odhwCqfYluajE4umFA4rcnBMSdHW2MtC7cPuYM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:5; SRV:; IPV:NLI; SFV:SPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:OSPM; SFS:(13230016)(4636009)(39860400002)(346002)(366004)(136003)(396003)(376002)(4326008)(41300700001)(52116002)(6506007)(6666004)(186003)(38100700002)(36756003)(54906003)(6916009)(5660300002)(38350700002)(8936002)(316002)(2906002)(26005)(1076003)(83380400001)(8676002)(6486002)(86362001)(478600001)(6512007)(66946007)(66556008)(66476007)(2616005)(59833002); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nVNrm/FhJNH6GSCrgiscl52AkKFNe5stVDCCQc7gOIIN/g/l8HzvMDB7fGxrWOv4QNLuQivCsyr29GZMTFPOwPb9zOm0AnRlk4M3Fi8PFn9aaciCW+7/IHKo/QIHXZ/OuijdAfzK0HKH2TCtWwbRprc5Rc7ckTbXdj/HJ3RokHLJxo9QQ88lAeCBeIMmDW8TQTNdrQA/e1xC/pJpcynH3cg20y6sR0IXW8UMK8A117zrNu/dSFSlLArpgU1g6pTrgYPxTN9fyIVNciyUtwLZr30+YVIeQpuefG8gpr5JGcZ86+eVJOmveDwqk8eEwXQiz6aer0lwd+CrPWF9aySsdPUlEv1FVA7CGCZyv3c5aJenekV2vsFTX2NogMJYDkiFZy7hw+H7RiHeasxFesM+n4vAhiP/fMthFk8gHXgE1fjv+iP+FXCdNWUJzq612bCu0kK7+eS8gta8qmlpZVjSrPKcmodLn4Xw7+wFhq5Y6+2sgJi8aQCKu3QPgsSNVVPGUyCsyOYMFYOyMvZTCM4PX3OOLcER5tDlH2vq+Qg16SXpnA/QapEBJAE1nNQ+AIfmwqOqkRw1k5nrEGchNQ2hqENhBmd5QGGFIodI5dc222etaXAVttN+sOmbTVpcI80hCYrcKJ7FYv1p+tjW0TW8KfrCZyhta+xAO6Gh+v+EhoOd5SwIj/1NYhHShkERaQQIn2NLswfwPD3aMHtu6tRM732FCrhG3P252sLCSLzV1ysjCTmoWZntqEZUTdWAs0vD/9Wn4TP/w466SZ6yUk4o+HQ1WANwMy/ujlA4f2ASmJ42TwF/Exu5Gk6hmyoC7gdT2OFhrJCbON4MmJxg1VmeiPJ2EVXhEAOQItaGGZoNV756TQ0CO29IUEt8URW0iSXw9qvVdXJD2CvMS210YI8dKg8zUlwI15bKsrjf0YNaC7/Ij2qwiAGLsrfjpEjQUFJBzMiS+Z1d1Q0TJV/bwCVdxY+xo+T9pUooQcTf7ES+G13I4wRlKyxL7Xak+TzHW0vuJCWiOXsO6oJtgQ77Iis4NAiJRECR6ihrD1NSMglWrRvy16iISc8M/R1LBmhXXHByhBLhoqwiV4YBdpDkFMAqEvxPFTmitHbzRwko7tkyK9Q4STocqXTieZgP7m/mdEd+mGGz6WlmHfjUjHk6YR+4RLQgKyjneRSPfW+xLjNc+Xfq/e/Wg+VbWxiQjrFE1gs8+aTkhVU+P/XAkAZq8p9t4Ot5pD9N1Np3n++M4Wzng6uFHyAhFTdxW14wzy//ZwUisAgAsf2l7ELqv78DmcsBgSDDQeDoV/PvMslFPsLehdC6X7mL+30WzHcGtqjJk+Ap+tMInAaQIj9fy9josFhoVRKRhLWTbe2mLrB8MlFJHXe4nDY+3GCMnlCCnUGvBVnTQfu3qfr0XYvcajtho484ShZ0fBzoTDZhjmqF/8b0FTTaTNpw3L5PxRgeuwkrtZPKkBSLsZ0Y3SCIY4bz720rOBOzouqTLQ9tEkYyWtJ2phkxkwIPGtD7Vhq+EVR4grhnmgL5AwoMoe4mYhY+c8BKVOUqY/oUlj+iSrUAZgjovXVJ7twHUaYVgn+sQ1TwDqVgpwIjjo5kksGdlUz6zwB5ow== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4417e81e-6f37-4b1e-1923-08da81eb3d8b X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2022 14:00:57.7420 (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: 4YbT6AdvFh62Cw5RZtPjx2V16TP7Kn4mEglMb//ZvCTr6DSgIGkk7Hmw3y9mmjcIJdsivJaeIjY2q/yDqVkthA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR08MB7373 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 Add an optional length header attribute to the device tree blob entry class based on the compressed data header from the utilities to compress and decompress data. If needed the header could be enabled with the following attribute beside the compress attribute: prepend = "length"; 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. 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 any compressed data by itself. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Fix decompress Changes in v3: - Move comp_util.py changes (drop with_header) into separate commits. Changes in v2: - Reworked to make the feature optional. tools/binman/entries.rst | 3 ++ tools/binman/etype/blob_dtb.py | 27 +++++++++++++ tools/binman/ftest.py | 39 +++++++++++++++++++ .../test/235_compress_dtb_prepend_invalid.dts | 17 ++++++++ .../test/236_compress_dtb_prepend_length.dts | 19 +++++++++ 5 files changed, 105 insertions(+) create mode 100644 tools/binman/test/235_compress_dtb_prepend_invalid.dts create mode 100644 tools/binman/test/236_compress_dtb_prepend_length.dts diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst index 782bff1f8d..c9336d1bb4 100644 --- a/tools/binman/entries.rst +++ b/tools/binman/entries.rst @@ -216,6 +216,9 @@ This is a blob containing a device tree. The contents of the blob are obtained from the list of available device-tree files, managed by the 'state' module. +Additional Properties / Entry arguments: + - prepend: Header type to use: + length: 32-bit length header .. _etype_blob_ext: diff --git a/tools/binman/etype/blob_dtb.py b/tools/binman/etype/blob_dtb.py index 4159e3032a..5a6a454748 100644 --- a/tools/binman/etype/blob_dtb.py +++ b/tools/binman/etype/blob_dtb.py @@ -7,6 +7,8 @@ from binman.entry import Entry from binman.etype.blob import Entry_blob +from dtoc import fdt_util +import struct # This is imported if needed state = None @@ -17,6 +19,9 @@ class Entry_blob_dtb(Entry_blob): This is a blob containing a device tree. The contents of the blob are obtained from the list of available device-tree files, managed by the 'state' module. + + Additional attributes: + prepend: Header used (e.g. 'length') """ def __init__(self, section, etype, node): # Put this here to allow entry-docs and help to work without libfdt @@ -24,6 +29,14 @@ class Entry_blob_dtb(Entry_blob): from binman import state super().__init__(section, etype, node) + self.prepend = None + + def ReadNode(self): + super().ReadNode() + self.prepend = fdt_util.GetString(self._node, 'prepend') + if self.prepend and self.prepend not in ['length']: + self.Raise("Invalid prepend in '%s': '%s'" % + (self._node.name, self.prepend)) def ObtainContents(self): """Get the device-tree from the list held by the 'state' module""" @@ -58,3 +71,17 @@ class Entry_blob_dtb(Entry_blob): # will still return the old contents state.UpdateFdtContents(self.GetFdtEtype(), data) return ok + + def CompressData(self, indata): + data = super().CompressData(indata) + if self.prepend == 'length': + hdr = struct.pack('; + #size-cells = <1>; + + binman { + u-boot { + }; + u-boot-dtb { + compress = "lz4"; + prepend = "invalid"; + }; + }; +}; diff --git a/tools/binman/test/236_compress_dtb_prepend_length.dts b/tools/binman/test/236_compress_dtb_prepend_length.dts new file mode 100644 index 0000000000..1570233637 --- /dev/null +++ b/tools/binman/test/236_compress_dtb_prepend_length.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + }; + u-boot-dtb { + compress = "lz4"; + prepend = "length"; + }; + fdtmap { + }; + }; +};