From patchwork Thu May 5 20:16:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1627243 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=LPFI8aZ1; 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) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KvQ3S1y6Rz9sBF for ; Fri, 6 May 2022 06:17:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 26D0183FC8; Thu, 5 May 2022 22:17:12 +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="LPFI8aZ1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7A2CD83FF6; Thu, 5 May 2022 22:17:10 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::61e]) (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 B69A283F99 for ; Thu, 5 May 2022 22:17:07 +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=FtbCAXSXPfMjSScyH7gt5mWCM1g9+SKGMNwwVa5NAaUbxXb5rme3X9RWQzsDam5sJXQscvA4VenlUiyhNtq80SGc9QRaPnYZBCNMQ1BZYl/L6x/vz2F2u6mzjl+WZZpfCTPtEXtIK85wwLqmjX2zJWA2PfxCVeuOADZQwoGXkEEQIUwFmHnatnWzQyW7E4TM2Ak0OvRwL6lYjuCdAz2mV5/Q7EzrcyAr2lk9eKSxs1rB8289C08U3JUPBLT7UgWEk5Orh5kk54lYSzAmlzlxe+hSLOyFg3CGqA/1BENCzbiw1aVFtoTCFmFPQhfmUkBpV475r2hAwPP3xSnDftcmiQ== 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=6T88V/HFAnWFk8xPgYRBma28LIRxqPf/9PMXYOkysWo=; b=Sq+mD+h1aTnWZUdxRf8QjyAYHZqpdHDDaXPCkHKkBNypyT9OHX/XKzOfX7U30Apqq1YChFujrzXsH5aRdRJl4c7vMusgR2S0Lkt6cXbBkIXtLQc4pFmZefh+3Fe2QgM6ykNiIp59uv9C+iVr3sptZ9dhM1Ywyqw0GJst2BSYVWIamM+Xb6fv2BM2YFPWs2owT2kRzd2dGe00Ik6adSyyuESNA/vbRnfwdtHXMCXfKnzE45i3zj6HiiD+uDU6qlcwZ8DAC/WZOtHRrhJkz78dmNDF6gOyBxoo0OvWorDZU78UP/cmZ3J0mn5NeWCDkMLNWNkZuUGe5rVc/WRwPVMAEg== 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=6T88V/HFAnWFk8xPgYRBma28LIRxqPf/9PMXYOkysWo=; b=LPFI8aZ1qomU7XbOGr0sfH9dJ6be5u2wMXyM5tVHOcUJwOOxvCUbKG9mfkAvAk2Gk5xTWVXhwkRPxNFQI6LIJtotzQJIhFPVwbK2fRPdIZW2BW67gUwlZxbqdav/79bJMX2HbEvu++l4e/sE2XKj3YY4IQEOrokG6N0BKn97n6JnrUgwFRalCzdUawQcd6mxXk6YgtuFj4ZDc59YUEOKi6bMgwID7W91s6kLIsijFyu1TK4jV00nLDhhbu+b+oEVAH/uqsN36Nso/4fSy13eh1nRWv2MN+CJxfzsDVxy+TviLpL4jo/ABjEh6c4hakmlYFopziqWZ7ftzfZLjqybUQ== 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 DB8PR03MB5676.eurprd03.prod.outlook.com (2603:10a6:10:10b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.25; Thu, 5 May 2022 20:17:06 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::a9d3:8abd:3f5e:a0c]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::a9d3:8abd:3f5e:a0c%5]) with mapi id 15.20.5206.027; Thu, 5 May 2022 20:17:06 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Stefan Roese , Marek Vasut , Simon Glass , =?utf-8?q?Pali_Roh=C3=A1r?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Sean Anderson , Jagan Teki , Nathan Barrett-Morrison Subject: [PATCH v3 0/9] spl: Use common function for loading/parsing images Date: Thu, 5 May 2022 16:16:46 -0400 Message-Id: <20220505201655.645692-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty X-ClientProxiedBy: MN2PR20CA0047.namprd20.prod.outlook.com (2603:10b6:208:235::16) 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: 9a1be242-705f-4fe8-18e8-08da2ed43987 X-MS-TrafficTypeDiagnostic: DB8PR03MB5676: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: 2Po/T8PgpcFDFfZayPFXhQN32EsToDlu8CtXjdbSTYZUnwGW2iP8o+QthwuJpkHfkYtNUflNosPATLsCnhw2o14hCUnhi7WhUt86CMUzRTI95zT3pAVxB6fZcWHYN6VYC5blPxCcCBk23Qf6s2HGpzDrUOFBpmNjdrRFPjPM3WCxBHTXolFNxLhn9lD8SIgPvpxBbi0w5qLGLpUWmzKuBtfiIfaw2hZNiZ/RZ2kmRzQftJEJ+Jl0z+eiBVSSffd9NrCoEYxSslBX7v6TkvnnzlvKpYsxA/fZ4O4p83/lIK994791oJ7DFOPQXC3fAJylbjx7u4BV7cZL1E9rl2OcvxXwmaLdop6Kgz6DaHa6CVsrIi3jEgi/HuGGcZye2X7N4S+rLG1QJjhgvJefkRGH3auJouJpTKW37FWn5yyHrLQwHQ2kXXDtTGPUsWzDl+7YOORvNzQ2bj4KOADsgF4e5ao6/ZR9GAEC0ckImfk3RxeEZljoelvGxVxwuEINgN80xOMLlAuU/76swq9EGmqX1KWgpSh49DbPdMr8QXDXevzm+huMli++KcqZbd+SCCoSroOqYmHsGlY+53Eg204vLYtKx+vFWL4qexFACTGKGxaSSqhFvHHBipc+JCnHs1gtc9YimxPWbfW7N0qIsf5lOPsPKmyxgqG6L4yDBtelNfrh4tj9bB4exzflKkBaYTFYuoMyjAunu+lOhAr7+HAryg== 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)(86362001)(1076003)(4326008)(6512007)(54906003)(26005)(186003)(2616005)(44832011)(8676002)(83380400001)(66946007)(66556008)(66476007)(316002)(5660300002)(38350700002)(36756003)(6486002)(38100700002)(6506007)(8936002)(508600001)(2906002)(52116002)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?R7asuaUfrJwsDOt9BQIca5lCF9VZ?= =?utf-8?q?3vXdr4daMdFuu/QtKrc/wwqwlxIZqF8ex5UNuV4roL+JkKZO7KPGy4/z6nYjJA5LE?= =?utf-8?q?4tzwH5I7nF7bij07HflxWfeUM/3mCwAq1gqdOsHbTlsWA/WCNHntzOuVSA1HsFAuT?= =?utf-8?q?comldCFd/hSKiUsBmdBdBrfpo4osNSuLC2/xlSZrfNvFKmXG42t5MMk0ddoFKSAnw?= =?utf-8?q?rjsgAL4SHNLktOYY5PpufPNeLUhLuSF4JKYjDIaTPhnB/yekONYI8/nkmnTVISO7D?= =?utf-8?q?biH2XERcWNccLKh70AN/AiJioeGubxOUmoWiwfp7PHTgmecX/KzUAkXeGC53lrHDn?= =?utf-8?q?ygztMhbhOIuOgHMe9YI8qf5XsMM/hCkw4/VGnzcBfjoDX9tgkkeYHPc0c1wkH6ue9?= =?utf-8?q?QjKY2ZSA7zwvazV7pNxvkGSD5uLUnZdRmn6JtdXFhW5IkB8qh/Psl5yTQR833LA/z?= =?utf-8?q?VYW2LG90GjyEsibm6WHe9k+q7qx5jQNkPRrZnWW7UO+0LgGFEHrNKnl6M7/Z+cbVS?= =?utf-8?q?eMqgqxnHsmA5nXi6rhkgong0ZlWRIW+o76XJ9YJeVHgv4Gn/1BoiXUcFCR/be/pSp?= =?utf-8?q?w3c9FHmIbN/6xSsOxyFKtFZ56ixOlyMR5wFu/5ObbnocQY0P2Jb/iKQIerVUzb+IT?= =?utf-8?q?Y5E2QTHfecUoOykiMXQRpPeiUpaPD/aCVKuhUDM0jT8S+Pdnj4yCDHbHpE/iTSsRT?= =?utf-8?q?Rip57WeOA8Po1DqNY6dIAnRZCaqI+rOWe5TXWQaZZSGopCRzeKH+kh/eMGYq6mS8R?= =?utf-8?q?YJ7qizmIhp9VtAi36iXTX1UQaOTJkHE79iVCOxIoMQZ+jGYg+J442JSbLdjrEorSE?= =?utf-8?q?8lfUbxe7xEuFcoLbNtoT7ZxuA3HCIpjqE4nBu40/DXtMbQs0lX+pc8kCYtZlfTbhI?= =?utf-8?q?dHvbGiCWaWJgSK+yTmtd2LwPmpu1OFPkAsQ7Cwdsgzt8oec0eoPuTlc66rE489KzU?= =?utf-8?q?XQewFTlOUfMlNGnlQqJFk3eaCrlPrEIUNHodaielKTlpTouWqlGuBiu0BWP2nyZKO?= =?utf-8?q?61gdhW3jbDRvRmEfFGYxilaR5sEaqWAgvZ+x89kwsNWazIoSHaX2NiJ6OsJuyjAjd?= =?utf-8?q?+nIsJTI97cO9Wdpo/9EGL+l3NIiFMJoOMK/A7hlcBCInQvBX9jaAjDV7K7C3/4d5v?= =?utf-8?q?JxZ69ABTTCYThthcGBCHFsjZ0TgAcYNTtdQ/qe/2MByJeREl16k8+6f4R02U4w9YE?= =?utf-8?q?E1Qh828emPDzscGHbtSvWTnMN1uA3a2nLixnoATHPKmtdObGv3BogUGtM5R/PkY7T?= =?utf-8?q?3OgnSyPEE+ceZL7VR6FUFIeHw4IdnxJVAhhqfVhRnELwlfN7uaRirQGyUlqNngXPs?= =?utf-8?q?8kqIsLZdOmHKxVWLAqk9AKbM5frP6kj0btFo6PzuB9PFgSNumij18s2L8m9r4bmzO?= =?utf-8?q?CqBtEG3Py2NT+Q0UQ5wEv8Rz0mXO5zww4IPXVbvwUkZoLvUhAp+ZuSNBX77iGorn2?= =?utf-8?q?/Q+tVHVNS5cyCU9I4XYp8TCfqE8oRDb2sq3nSra2S/1MfX0ark79mNkt6EGUGsG3A?= =?utf-8?q?I+7TAwDJfF1Q7uhq58oG7sRrVHsJ6MMLx17DAiFNmmADIqIVRQ9Z4qsxk0QwM/0FU?= =?utf-8?q?+iW/8+aX92lO2R8zl0ikORkljKqoH/+x+7C2a694AS4XL6Jog/kDHGImn7kro5lTP?= =?utf-8?q?Hzc4skvHUrUVApQkkeEQwtbk8DD6501BVfAiF+tlJIJs529xWoquE=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a1be242-705f-4fe8-18e8-08da2ed43987 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 20:17:06.1164 (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: uqOwtgjIe54pCxISVddAjP4SJO1ZMN8BLq4cZNuoKPjJnlpe0jXiXCLC0JEioyQk8bI60GkwCCN4D5iVpjTuUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR03MB5676 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 have only tested EXT and MMC raw loaders. Please try booting your favorite board with NOR/SPI flash or SPI falcon mode. Changes in v3: - Fix using ffs instead of fls - Fix using not initializing bl_len when info->filename was NULL - Fix failing on success 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 | 68 ++++++++++++++++++ common/spl/spl_ext.c | 24 +++++-- common/spl/spl_fat.c | 40 +++-------- 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, 193 insertions(+), 271 deletions(-)