From patchwork Fri Apr 22 18:27:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1621087 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=MgpVaaDt; 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 (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KlNFk0Kbkz9s0r for ; Sat, 23 Apr 2022 04:28:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3B33E83E07; Fri, 22 Apr 2022 20:28:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="MgpVaaDt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 520038189D; Fri, 22 Apr 2022 20:28:06 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::60e]) (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 0340B82385 for ; Fri, 22 Apr 2022 20:28:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OoBU1One7ZaUT1g2Th8xHDftsaNp/q1cd1xC5gvfVZg3bhUWhXxQitqMh4ygLO7GohZNes9d12BVEM+ZJcqwYWgec+DE2rZdk3hjFQ35sY/hCWShc90bSLfwPJ6cbFYXmgh98BnDgWi79eCUrabZnFI//czCK5fmP1xr9CtepxKksT9lnSZJ/GJi5c+lY5Ql6tprIz9N907aSjuItJRc9jqdeW4pPpSnJgwnmHQds9ssCacgaLPDM/D0ywvF3SU77NNwBh506rDhnjqOqyIOIOJuUBgVOGfo7HqcWWxaj7kLA1eXLbHceQGALvYr47Mzu5qcLmsjzryKjhNIspTPHw== 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=rDwL7hIGhQHxPjvMdKoji3VsSW39oyvO8NPBJP4nnZ4=; b=CsTUEUw30wUNAy2HgGfYRIR29K9Crs2qDoILEDD1iIk7LTJ4EbZAH9tls8HeR/BGy0Q8FWJf8sBqEXJCIg/3Jysg+QDP4Tzewqx1CltXfcd1uyAcExvrgLQAXX0z+60PsjpnPuTL8YDN/Cv5dM8XiJOoLrgOIQClRUasG0C1zhVl4OiV4lcVUjQhD7pOo4uLbCx4IAyU0GTkwKswEFoo9UAD/BcislS2YcFIjlay1dHcXMDoNM5O1/uZcQCpj60BaUHnYtELd6O35G/jarQAikTUn/ZLiFAfHN+s+H/xUuoPjr9j6v78XYhmdU8U7DkNLy1eVw6s6UP18WuxwPaCew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rDwL7hIGhQHxPjvMdKoji3VsSW39oyvO8NPBJP4nnZ4=; b=MgpVaaDtPtL6xYwrVkKTV6mfNawItvg/HY2aGoIRxy/8WNL6pPz/DCR0uUI7Hir5/AmXSDeMe/8EK5EPzV1dkATRRPhVG7f/BI4VkFpyunal4KuMKDcznti8T10tqjIfeSnNyMkVjDm8Ikegr/y00AR4d85DsPJ8QdmxFeu7V8cnWQWuQkQ/qQIKLG44b6oQnWeT6cylNEj+PBELOxhGVe40sW3vd+yOs6HLACFEGpWKCmpeemv2/FxE6m0h1bC7Mdl1hJQ297wvepkAGSTIx7JwlVBwjvqnYMjlzEndjocmu28mK+cnL8CQYcq+lR6fRRdRdIOGqcdmUdOoblggEg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by DBBPR03MB5462.eurprd03.prod.outlook.com (2603:10a6:10:f6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Fri, 22 Apr 2022 18:27:59 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::714d:2b6:a995:51bd]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::714d:2b6:a995:51bd%4]) with mapi id 15.20.5186.015; Fri, 22 Apr 2022 18:27:58 +0000 From: Sean Anderson To: Simon Glass Cc: =?utf-8?q?Pali_Roh=C3=A1r?= , =?utf-8?q?Marek_Beh=C3=BA?= =?utf-8?q?n?= , u-boot@lists.denx.de, Stefan Roese , Marek Vasut , Sean Anderson , Nathan Barrett-Morrison Subject: [PATCH v2 0/9] spl: Use common function for loading/parsing images Date: Fri, 22 Apr 2022 14:27:38 -0400 Message-Id: <20220422182748.2309992-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty X-ClientProxiedBy: BL1P223CA0005.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:2c4::10) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e17acd3-9d9e-4340-36b5-08da248dd395 X-MS-TrafficTypeDiagnostic: DBBPR03MB5462:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5aSc7dKGNPZis70NQ/2wm2jQp5rAABoc4BxJ/miIYU1CTry7RK9YYqTUv4R4JrZBmfsr5eybCjREmTkPsgCepuggG/pM5mX9mwrCXCgKpKbu5ItkY8zrTDcW/6oxN/8i4+CkllG9n2Pc8vSEgcWkIGY+PiEZYr5PD/dIj/s9PeB8DPsLn1HLvKB1moBb0pTzj/Lyxcuvk/C3kdtVMRglJB3458BQGtiOWz0T1lUywW57BS8F58atHH+Z3Lz4lctUFpLKV9Am8t4OrWA+ty38l4jJCV2Lm0C5jXezI0S6Va8pCbCLnkQ9zVjve0r5nVSxNNxjDpbh2osxL7a48f94+CxLKwFcrQbTF63Oeb16UB9G28WSP9gInz9oNkTz/5N2CVFjLXzOUf/ubxCbRZ1O1vFDS+RfpdqaZntoRSGy8jiOu4wv3rgb7DMVPbbtdTqDLHhbXQQZqLXDWRfhkVK1Up5RAQPqCG8dkunjmqQcw9W9NHASv56buXXrPuvxy4JHIIerWDIC2Tqsq4HWnxY92+x4IrdpC0LcNsogSmfS/wEk7rYYIRArKb5XAko4Zd2kiXFqYLSvtew1h3ApfxLmd9p3ZMiED4n4SvThWJ/FdH/lQ358PNcq6NjUczqWOdRRcLebReTsm/lhGr5xVw2/HUbqcYsw87u0ua7BhPN/7w2jASOCF8XE90y7ALd0WM6S7VAEEEaDmM7pmmiezqp2+ciWhW7FqMaDerfu2WN5IDnS84bMRqXHOyU730i5MiIKb/Yc9G2K5cTPq96DXuFoxRgsITJtMlewjEUMX12AJuY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(508600001)(52116002)(2906002)(966005)(38350700002)(38100700002)(316002)(36756003)(54906003)(6916009)(66476007)(66556008)(66946007)(44832011)(6666004)(6512007)(6506007)(6486002)(5660300002)(4326008)(86362001)(8936002)(8676002)(83380400001)(186003)(26005)(2616005)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?1jeo2V+VgIWdC3RFxl7hWjQPFgXg?= =?utf-8?q?IWYaAFjFc+xfOndukFmpg+NAnpxRWEx0SR2apdndJkPv5Y1SPdzXc/wLmVhel2scy?= =?utf-8?q?u6akbaoWLg1J2hwKzSw5CNsbc2IijNd8fGr8iw6oaC+4/do80rjrttmIvhNmZ90ib?= =?utf-8?q?V46pIdmq7m5f5uSAi+yjvaSofrA9ZrxZeJp4rs/FVKdPQ5Q9KoV0R9s18HXHV2Zm7?= =?utf-8?q?yB1FYzP2nH+4/tYGS9TN+eLZOaBXuMrdgFlVhXVCwLXr9ZgMETqGHIFVxhwAil2Nn?= =?utf-8?q?U6ABMxwqsrMMmZ2uCdaXy8vI9c5QvN6sg3XYkMy/JZMtt//AYDbVB2f/3fFLbqwwK?= =?utf-8?q?TJZLQiyek7mqM7iVHCHFnSBRE0ghh4wLpwY5Kt1fV5aetYdOQA79vYKm25wfq8q09?= =?utf-8?q?z6tq50qfheJTQECZHQw71k+I0Y5EHeWBFJ1CPxtHHRXvBil2uPQVLvHC01+YWpakf?= =?utf-8?q?RzLd3SWe7cJyFXZpParsSHj5jiF7cqwImmfoQvKJoJH7XOITKZsE6vbTFNr0++4p/?= =?utf-8?q?o60RRxurp3neLvPuB+9ceSTpo25w7Xf45gX4Qt8/8EabQhT2/B00CbGawnCQYjWvY?= =?utf-8?q?NKkmR0PgOh7o2XOCsDa7eZ4m2xbxcf2g4HWlLP5HzvYXkf8k+u5bjPoLfUTECawqP?= =?utf-8?q?W2rUGMAtVH04z8p3Lr7iIZFRqYSxjNloh88euFhd49uu2l2iBMI8FImBhVUo84I2E?= =?utf-8?q?UfG5ofWeMp/vZ8KndulUwP5I+mMZS5/O6c5VI3oJ+xuB15sN4imdPGQBr4t6ujSPh?= =?utf-8?q?3LIs9ALRReQMOrKMky/z9P/xKrsLXQ39g4isHhtop1JpCJTLQUV/tvreacgcVUAGs?= =?utf-8?q?vqs68qt2KA8K2hjxVXXCtfny/ZZoGg8QRQFDGuVMm3Oo0UtaDrXkwwDznb+bRAqKx?= =?utf-8?q?vUzszy257zzXyp8IbTGhTe8nE6SEBmyq3BBsLwHQE5CSyPe19OT9jznrX3N2C6xvc?= =?utf-8?q?DPI2EkFqa8qzKMqWQq/FZogh+zQEsGZksSTmVDFYg/qRb3Gv8X5Hs0MqCcGB7o7TA?= =?utf-8?q?RUEBwV+stXuu8lsSzkqgK471OhQpVF7DKWsAzFXbHoyl9YXkd6la1LPQ9fT9NI1j/?= =?utf-8?q?H1jpYBvtOk6aPq8tElRZpi8DUWdxJRYzO51WolY0sVsbkYNi+y/ST/iwR/D8K3PS+?= =?utf-8?q?V4YMI190U/u+XKjBADbz3FLmlkWZGAEkMCOFnF5QtNMDr69LrD5efLwwks9Lm8vS7?= =?utf-8?q?+NWMRpyeCO3oUUkCSXURwazc1ECAthECFsQTB1XAYBrrWGDLTjTzhLGI7/zAAIhJZ?= =?utf-8?q?PVGRirRadnkMMFmWVnomnyeT7xkHUffvP/Nq5ldWQc13liSS5z9PEA3pZcuXYtSE6?= =?utf-8?q?An55CpT352f3GLtbFwOsQC/i2h43eSoW74pcoqe1Ff7QcSCLG53tg5IBIIixil99t?= =?utf-8?q?f2uCmgyBf4c6/RULl88wRIdTVIHe1WktsWKnMiVBHBCjcXtkLuQvaTvtLmiXJuEbx?= =?utf-8?q?93uWt6ZVTTIiwBOQw+uvFnB2LlJn/bJV8gN/UnhAuiyZOiMYaeILqCuKvIMQgxtkm?= =?utf-8?q?4KJNmlfngjHXW0M+CH8ABs8x37N7gpTyzkbT49edf8sfcZUrDNf1z0rbvuGcmYcIN?= =?utf-8?q?pypzLAcMJ5nEsckDoOdGt1WCDCyXnNoBsy+tpbVP96soFOg4PHUYuK3dZCZy0k+Bp?= =?utf-8?q?+bO8uOQ5g0zuEYg1lgL9+IhENVW24qxa7AIyvH0KjW+enXDSYc7rQ=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e17acd3-9d9e-4340-36b5-08da248dd395 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 18:27:58.6200 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Pa3vNId5gTus2DhNfCdC6CR/PMKsh0McJ8NjtNrOgCZ8kPHcsQxiNfKHabdKcRVwdSPSit43woAPbI1SAMIihw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB5462 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.5 at phobos.denx.de X-Virus-Status: Clean This series adds support for loading all image types (Legacy, FIT (with and without LOAD_FIT_FULL), and i.MX) to the MMC, SPI, NOR, NET, FAT, and EXT load methods. It does this by introducing a helper function which handles the minutiae of invoking the proper parsing function, and reading the rest of the image. Hopefully, this will make it easier for load methods to support all image types that U-Boot supports, without having undocumented unsupported image types. I applied this to several loaders which were invoking spl_load_simple_fit and/or spl_parse_image_header, but I did not use it with others (e.g. DFU/RAM) which had complications in the mix. Here's some bloat-o-meter for j7200_evm_a72_defconfig with ext4 support enabled: add/remove: 1/0 grow/shrink: 2/4 up/down: 224/-236 (-12) Function old new delta spl_load - 176 +176 spl_fit_read 60 104 +44 spl_load_image_ext 364 368 +4 spl_nor_load_image 120 108 -12 spl_spi_load_image 280 228 -52 spl_load_image_fat 320 264 -56 spl_mmc_load 716 600 -116 Total: Before=264556, After=264544, chg -0.00% ext4 support is +48 bytes, because the original image support was so bare-bones (just legacy/raw images). For most boards with a few load methods (where one of them isn't ext4), this series should be no bloat or a net negative. However, in the worst case this series will add 150-180 bytes. I haven't tested most of this, so please try booting your favorite board with NOR/SPI flash, FAT, or falcon mode. I had a nand conversion in here as well, but dropped due to difficulties outlined in [1]. [1] https://lore.kernel.org/u-boot/c2ea7097-9e85-b9ec-e404-bd46eb83dd5b@seco.com/ Changes in v2: - Use reverse-xmas-tree style for locals in spl_simple_read. This is not complete, since overhead depends on bl_mask. - Convert semihosting as well - Consolidate spi_load_image_os into spl_spi_load_image Sean Anderson (9): spl: Add generic spl_load function spl: Convert ext to use spl_load spl: Convert fat to spl_load spl: Convert mmc to spl_load spl: Convert net to spl_load spl: Convert nor to spl_load spl: Convert semihosting to spl_load spl: Convert spi to spl_load spl: spi: Consolidate spi_load_image_os into spl_spi_load_image common/spl/spl.c | 61 ++++++++++++++++ common/spl/spl_ext.c | 24 +++++-- common/spl/spl_fat.c | 36 ++-------- common/spl/spl_mmc.c | 73 ++----------------- common/spl/spl_net.c | 24 ++----- common/spl/spl_nor.c | 35 ++-------- common/spl/spl_semihosting.c | 39 +++++------ common/spl/spl_spi.c | 131 ++++++++++------------------------- include/spl.h | 30 +++++++- 9 files changed, 184 insertions(+), 269 deletions(-)