From patchwork Fri Jun 16 11:34:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1795865 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=TPwCcvVx; 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 4QjHBw1qh3z20Wy for ; Fri, 16 Jun 2023 21:35:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6D97C86241; Fri, 16 Jun 2023 13:34: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="TPwCcvVx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 83F7E8625C; Fri, 16 Jun 2023 13:34:43 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20621.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::621]) (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 D45FF86103 for ; Fri, 16 Jun 2023 13:34:40 +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=h0ErCER9a8uOQRrBPgmrf0NIySmxoqvfg5+MIXKrkQQixE/vMwbQqrRO3KQRgm0rV7is8YNe95iRSllH/rYoAMrnQMKA8QzOIXTK/67I1U4u9QSEQHUhliYFy/wgAGrianDMrM5zOzn4JJi7hZ1JJbgryhXieutMlr5pAqpftQozFHY/zCDfc67XRxf5RbsKUAhqJOzs/wmFt6yde7l/cCDV7GXbWss3MTKu76UTq1N1BI7MxA9b8Nu1mqvIJrnVsbBzcHwOgmqiUuCxgn5Tw8nBdzq7g7v/Sx9+jHWSdQtOiUcKiMPhLBUvwkmY7q1JtUrm5Bey33yTnPDCDlc2Ew== 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=u4IGfEWX5NDufDXxPgaKY95SImXDdQ/qQ1eQgIty/Bs=; b=XnPLP50RW4Ee/ni6GpDixItDfPAeQ/fjBFTifOc0ixn12ZDpQWDrYkpfl6zj/yjqsW9iPb7OoXkBdn1XduuYhEeF7kcMBLedBZeLE6L6UlCUsT4bhpVWE4c3DGXh3vSLH/r1GV6cUAv5XaUVhiQ1AT/tUdARrqN0LYjfbMuKKvKuTXTQms/w7/dkFLCG2DYbuSS3t4Go+kfjPvIxbDeriu4o/nJ7Sr+ckgffzXwF1KSrG8MFqIs5HM/NQ2y8eYbrXlF5ddLOPldfcFpqgtB+yxvbFR7+cpZhYpvuUpuvFfynWOeWK7rZ16mbSQanGUyf4h+6LGZtu8JJ3gWkNpDaXg== 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=u4IGfEWX5NDufDXxPgaKY95SImXDdQ/qQ1eQgIty/Bs=; b=TPwCcvVx6LxNx4GEUq6NjVSy98pa9Q/I1eYOqnLpbfLpDnasfe7AqSLzoU2cG4xjsHp7U/tgL4cc4RwCw0BGzQrtin0CD2qFK5H4BXc1+IYjDoJkXuJmCklce9chj20KuxXCkDIxKTMFRunbarQQ2DWTZIvxTQK9sKjf4EmHFtQ= 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 DB9PR08MB6444.eurprd08.prod.outlook.com (2603:10a6:10:23c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 11:34:38 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::7501:6f07:8ffe:f389]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::7501:6f07:8ffe:f389%4]) with mapi id 15.20.6500.025; Fri, 16 Jun 2023 11:34:38 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Malte Schmidt , Sughosh Ganu , Stefan Herbrechtsmeier , Etienne Carriere , Heinrich Schuchardt , Ilias Apalodimas , Malte Schmidt , Masahisa Kojima Subject: [PATCH 0/5] Extend mkeficapsule tool to pack multiple payloads Date: Fri, 16 Jun 2023 13:34:21 +0200 Message-Id: <20230616113426.13976-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: FR2P281CA0174.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::11) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR08MB6969:EE_|DB9PR08MB6444:EE_ X-MS-Office365-Filtering-Correlation-Id: 54dc9dbd-8d99-4bd6-0fd2-08db6e5daae0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FrURaD9c3Zu0NoILzgYFPpxCOsqv9j818Kgys2Wgl2Y5fsf1xQIpOgjCcPu+UuGax87sm1nyWrfs62mEG9awp2cOA6R/rbOd/6BwKBkBNifdYmSfxtIN7WtZDG7XMj2nbB0WQP0oelROKSfjUcKnAGpbH1FJPcyaGPXZ72SefZcSAzlkPbFygqqmXaoYWTr76ZY+F6+NPVQdjf8hpVYMntYOk0mp10uNW5Ykcn6VOAN2io/FJ/l9jNAQTfCZ4QfIffjdB23ED3UaYseaUHvoEJg46Lgy2edYuQ+DR6eLpprYiO0NL087dNT484X1vmZegK2OKTk5KEUrD3DYkuilAcqdzANy/3OAStGw2nMZL+31dQbb1B7XzQ/fHn8WqAnjh4L/gtZVQ58AtOHL+9n6OK6/l8nZTxXl7gWWB2xeYjxOFCQ8qEpyOtxZSHxxWr3McXYnnoe3Yj+W0cM0WqqSe8i+b/DUbN4sVfph9uIV79ogBTNjtwpwBaN0swL27/02btYcVDzivQzM6XXjjEKQFK6EaJTG5zMSE1VXNw4IwUEnGM8KqNT2G5mqW1NA6NV8UZkOO5Y6Bsi+WEHvGJSvWEfCY+dpMqijXDqQylZod2Mai1soBw2TeA/rWmlSM37z 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:(13230028)(4636009)(136003)(346002)(366004)(39860400002)(376002)(396003)(451199021)(5660300002)(54906003)(41300700001)(6486002)(8676002)(8936002)(316002)(6666004)(52116002)(186003)(6506007)(26005)(6512007)(4744005)(478600001)(4326008)(6916009)(66556008)(66476007)(66946007)(86362001)(1076003)(38100700002)(38350700002)(2616005)(83380400001)(36756003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K0I7GKbkjZEJhtjdjpGA4xx1GYWc0sEL89ugK5cHScQUeao6t1aOhx2Ja9oqOdt3CK5W7G1+tTzBg0CdpZS7irRcFm98vrAoGFW4LFNwfP8XN7JDe2Ms/qsLYuld70DcaTXynexOhQDwaip/naXv8V7DJOrzIEAVDeokshwncyhdmJRN22AhB1YrHN3TG7l013Wg1taQ77nSlleRyGHI5w1u6e/hRafBYSIPwVsT1E/cUm/UcNxEl4FU5/aom974tUyJZYSYa3PYg67HmlzQLTql5f5zRfbJHmWp4K/QItTExfSVUnqQSvr8JG4oaN3pWjrhtYun8JFltQmIv/c4gE7VLNeN7nhya2SJQ79XnmAVrn5LsBXd5W93aGGKQ48SK8iauJaUNiqkB9LWadrC1fhhWGwz9SnLP9nZxhnTkQCl9wSDyoI65EPmOHBQ7vrFOHxtL2bLZF1n6hFGC8bPgHIjbsk+XUOK6y8eYyZkYjxpW1sMhL3zVzLfBAmM7+A+4oefuwa1W01lNMr/Gl+aoY1oh08WEaPCv3sXcNvSYhw47hEoK0zlbWa2KisaQn1gqmdKGSeO5jHpMRwK3raUaYVLTJCRIP4wk2+Mu6K1KQxk5YJjL1D/oHAwgWi5/S+zax9kzOrIn9Ia/C5EuUlc5DMNPGYJO+h6L9pONAlRU12MylyEUmsSgFyUSKZnWIubOQik1E+QnIAs2ePt53K+2SvjeVz7g6xUwU34QkPXBvRflLa8AVu/hUfRpgWspUMHCnjWdt7nD2nfsEyNjX0n5wfpSyTrPVpQyW47HEd3yG1DxCCR8yiPMDEVMNB1PDIyWenUaQ12NUbXrT8ZJ5YOo5tAaUVW0tzah2SH8HCa40F3+p4ugN74E2dF2P5lN8IGDhOhyw8JrHdliiEo+srk3xQ2OWVXCbAt6xd8X3hiLeIuMoHZoGicC89LBfgsFM8p+4VMSQHFSm1J76BIvNC0RGQtU17zWH1e65B4dhevBOIGJeT3mKVOTp8npBt2F9KgRTnRsdIq2ut6rA/xHKCNlUd271Ws++An6JV8PJpHvli4CZrI98DcSkY+6N7jPH8dE4B53Mio3QyxBbQ6nihGtzGi0W8EofHB5xTnyF6c20X4UpGyeHekulrjPcjXtoCRlDdeUJI0bOCcRicAIDbJw3PjpjK33KyYkAo2yJWq2WE+iAYu0QGBARyDMaiV9lXQ/ENobqPbbrJBxPYRB4RmgyU2We60lZexHw7NWhrd2K54BCLPy6/+Hel1a1gTjzYf/Sq1v6o2TxLXrGEg7UqrQGCLs3WzNJRUjN26Fu/zkNnhDt1kzUTZCJk411y4BVCuAdPp/r2bkLK4ItX65KUkUVJtH/e3SjKydEi/h8YvIdJ4J3yNZj/KClrZkb3CbObmbYPafAakM2UE+aIlDbk7YXG8iAb8bA9zyWUktryKnyEK7kzPHcpXQKOwY6GBuKdmwxuqVm2BruR/6JuYz/a13+B1dl3lST9I1YEk/anb2ULzjxWjcp9yYUstYXfiTM2tQ5Kmehvrmfk4DYfpx0EM4hFJvg2F4UW4UED5Ey1t4cQeIN/6u6dlebW4/LaE5qBijgJloeiK9928Ve8HIWV87A== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54dc9dbd-8d99-4bd6-0fd2-08db6e5daae0 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 11:34:38.3175 (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: a1kI+ZuUOM/dPRgwmhS9A8QNLLCLg/Nu4WjcdQnnpOFr5QUix1PxVFC1Pm3dqLrsYqDpdpyQRKiDpA0tLSJ7XQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6444 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.8 at phobos.denx.de X-Virus-Status: Clean From: Stefan Herbrechtsmeier Currently, the mkeficapsule tool supports at most one payload inside the capsule. However, the UEFI specification and the u-boot code support multiple payloads inside one capsule. Extend the tool by this feature. The tool is kept backwards-compatible, so it can still be used and called exactly as before if desired. Malte Schmidt (5): mkeficapsule: constify function parameters mkeficapsule: add support for multiple payloads inside capsule test: efi_capsule: test a capsule update containing multiple images doc: uefi: update mkeficapsule documentation doc: uefi: clarify capsule concept doc/develop/uefi/uefi.rst | 73 +- test/py/tests/test_efi_capsule/conftest.py | 18 +- .../test_capsule_firmware_raw.py | 46 +- .../test_capsule_firmware_signed_raw.py | 24 +- tools/eficapsule.h | 5 - tools/mkeficapsule.c | 651 +++++++++++++----- 6 files changed, 622 insertions(+), 195 deletions(-)