From patchwork Tue Feb 23 16:50:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Marinho X-Patchwork-Id: 1443576 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=3EYLMiFH; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=3EYLMiFH; 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DlQ6M6MfKz9s1l for ; Wed, 24 Feb 2021 03:50:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CA7FC82A76; Tue, 23 Feb 2021 17:50:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=arm.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=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="3EYLMiFH"; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="3EYLMiFH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A5CD282A70; Tue, 23 Feb 2021 17:50:39 +0100 (CET) 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,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::614]) (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 A3E7282A4C for ; Tue, 23 Feb 2021 17:50:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Jose.Marinho@arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0OFusIGdAq7kGTZfPGK8s1jv4Yit4QJEyKEs/30SC4A=; b=3EYLMiFH9Uot6OPERtmTNluVOKvteqQ5pEjls11fhn2HuPL/67O4a7SkaniUiG3ivix09b55/GWWzHR5JrsdWIIEbStrJyIkPhm1XpELhcMDGamQt//v+TxGr5qLCl28GSvDllaTGazdSI5AQo3iq4iQ7LM3dN6BHCoVZstX14E= Received: from DU2PR04CA0273.eurprd04.prod.outlook.com (2603:10a6:10:28c::8) by AM6PR08MB3751.eurprd08.prod.outlook.com (2603:10a6:20b:84::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.32; Tue, 23 Feb 2021 16:50:30 +0000 Received: from DB5EUR03FT024.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:28c:cafe::b7) by DU2PR04CA0273.outlook.office365.com (2603:10a6:10:28c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Tue, 23 Feb 2021 16:50:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; lists.denx.de; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;lists.denx.de; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT024.mail.protection.outlook.com (10.152.20.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Tue, 23 Feb 2021 16:50:30 +0000 Received: ("Tessian outbound 46f6cf9da5e8:v71"); Tue, 23 Feb 2021 16:50:30 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 7472ad966d00d132 X-CR-MTA-TID: 64aa7808 Received: from d8109bd60a38.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 7E5EBB5B-BC05-4DB0-B89A-386AB079F10E.1; Tue, 23 Feb 2021 16:50:24 +0000 Received: from EUR01-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id d8109bd60a38.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 23 Feb 2021 16:50:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QafBJpDcbsFtVluFPmM/ZFJJYp2eHrrEW4x1+QuWJcbNdDNWGw2h8hhuBIyS6Ta7HskgR34u+EH3dOgpYMhgjqCQm/sBnSogo6aWKJ6/5Rs+dgmwzno7nsJfULIjkuNv/t2eCPBBLc4RnAniWmJsArijGyzQOMie/Tzx46fKdr2ewrj+7JKgeCPswnMpVbStFAPcqg8LW2t4RDfhOh0a3O5wKAcnHDGthxZqoYv6AYWg7LOE43K8VH5v/GyqmO8yLlfGVIT+y6HTVJfY6ZL1lAMLiFA6jgYolOqhV/Juql3JkKHikKPbdP4Z5a22/IJYO/itY3YrBt9DKVdjUZ6bPg== 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-SenderADCheck; bh=0OFusIGdAq7kGTZfPGK8s1jv4Yit4QJEyKEs/30SC4A=; b=jLrhL9+A83nF/vtiF2SdNfPbwZ4Ljsznsi7O9nfkM8s6M+3Zk97xtA86Q+OCrvAL2AKFwlHy+whPFLiS6i8cN5JYnH5DnzDygryE4KJMLwIEPbPvRV4oiaB5y4GJOiZYIy1lqamaT31UPheaQowgsaS0/9qxzcnHEQ1ezpQI8msUmTdJ7L3008XKWHababa8ST6MVt3PP/ClxboywW1l8K69ejQSRGeS7mKVKCwL0cyjd9+Jvx/e6DOUCDjufkF7gx0XtGB/XdoDZbcnsUq94TNNYOJCuFxpICj2plg3+TnNz2Pp4Y/8zdbKl4JO4XiaY3rjP0vDBNQ0tB4z+M+sGQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0OFusIGdAq7kGTZfPGK8s1jv4Yit4QJEyKEs/30SC4A=; b=3EYLMiFH9Uot6OPERtmTNluVOKvteqQ5pEjls11fhn2HuPL/67O4a7SkaniUiG3ivix09b55/GWWzHR5JrsdWIIEbStrJyIkPhm1XpELhcMDGamQt//v+TxGr5qLCl28GSvDllaTGazdSI5AQo3iq4iQ7LM3dN6BHCoVZstX14E= Authentication-Results-Original: lists.denx.de; dkim=none (message not signed) header.d=none; lists.denx.de; dmarc=none action=none header.from=arm.com; Received: from DBBPR08MB6012.eurprd08.prod.outlook.com (2603:10a6:10:205::9) by DB8PR08MB4955.eurprd08.prod.outlook.com (2603:10a6:10:38::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.31; Tue, 23 Feb 2021 16:50:22 +0000 Received: from DBBPR08MB6012.eurprd08.prod.outlook.com ([fe80::5d51:f66c:7554:6920]) by DBBPR08MB6012.eurprd08.prod.outlook.com ([fe80::5d51:f66c:7554:6920%4]) with mapi id 15.20.3846.046; Tue, 23 Feb 2021 16:50:22 +0000 From: Jose Marinho To: u-boot@lists.denx.de Cc: Jose Marinho , Heinrich Schuchardt , Sughosh Ganu , AKASHI Takahiro , Ilias Apalodimas , Andre Przywara , Alexander Graf , nd@arm.com Subject: [PATCH 2/2 v4] efi: ESRT creation tests Date: Tue, 23 Feb 2021 16:50:01 +0000 Message-Id: <20210223165001.17001-3-jose.marinho@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210223165001.17001-1-jose.marinho@arm.com> References: <20210223165001.17001-1-jose.marinho@arm.com> X-Originating-IP: [217.140.106.49] X-ClientProxiedBy: LO2P265CA0036.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:61::24) To DBBPR08MB6012.eurprd08.prod.outlook.com (2603:10a6:10:205::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from josmar02Desktop.cambridge.arm.com (217.140.106.49) by LO2P265CA0036.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:61::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.31 via Frontend Transport; Tue, 23 Feb 2021 16:50:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8f0da378-62d8-46a4-88eb-08d8d81b20eb X-MS-TrafficTypeDiagnostic: DB8PR08MB4955:|AM6PR08MB3751: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:16;OLM:16; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: MGqlExZ/nVywPlY6L5/bRMfcygXtpGzK3J18nTU85TOvMnUTDmOR5fW7JUvkLZNopD5luslpEq7R+RFuBSF+JicFWceiGprPCQbEnS9esi8rqevurU+VAlQL29e6BD2MNMBb3xiBwy50Bvq5ckJ7CQtWcdlRzVjXwXIrmud60doLVOvJLdXzxMxR8e0rCr8w8NKJ8yxh+Pt4s8MFuyMbHUdC2rIkUGnGhn0+t17LxMJVYlI5pNTcGusuFo4FqV0gw0N3xfRj7cMF568p94nlyFSlk9p5HmxuqZwAB46k0j9SlH73D44cXBnmT+a+Kw/lgf56uuxlvzd/+RbKrs2cp5m1M8bJT3WKfTzsjo3xM5r/Ryeowe0P8bPZhzcY2ibcD3BdURk8zaZ9ulbzwF1IkmfIkmXV5jJCSzIY28HCCmn6dKFWDabohPHLg4DU9xQL0RUL81f1bvLJ1kIh2TlYu7uFmyf+w8SW0YeA8UN6YsMvO9jwyUuks44onS4N0vd9Mv+/gIEs75qjdep1Fq0r5Q== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR08MB6012.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(376002)(136003)(39850400004)(346002)(366004)(5660300002)(2616005)(86362001)(8936002)(44832011)(6666004)(6916009)(54906003)(4326008)(36756003)(316002)(478600001)(6486002)(8676002)(83380400001)(2906002)(1076003)(52116002)(16526019)(26005)(7696005)(186003)(66556008)(66476007)(66946007)(956004)(30864003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ssRjGNRzo9asttSPaOI8HXz3ltpRIafWU0E3RoE6zqqxS6AppsflPcRMdohu+1e85kHbht758vSlceAbpMIeDyVtwu+b8iJ5+M3uv6kcN7R0n1rLyeF7Seu/2ziFExASTEvDF+9oTKEt4q8MRV+0h3JwtF+nL4hXVSDXO5WeJcV2xN0A4U5e83R5XbYfaXfwpIenSHcd1nnsI2Vstz3QajTFN1BNwVpBnWomLfleLpfQOqKcH8863vAZD5OFiT/NyJMhZpO2tkBOHhvtjaPHiJKSsKfXYPLNd/uWSWLVG4iQNgDxeIyUTkr35FpFBQbvvcrBSuL4jXeOaOOQlMMxsTsW8XpIHYdu5AscaIr4wKRcL4KYex4PFCRCS8FmdCNVnJAPxiDAheIPjoLx9/aN8k084hYfCQA1YLCff/gvz17XK6XkD36R2vnOh1LnM2h67Ld26FDa1C4Y5p55quRnMWSswpXVhMn7q8usd7JyUDNuPqsCKkaqh/lBgymxH0ktjy76YVIQmJFX1qNLIgMVwAgROu7OhzzMNCRYGSWjXARFv8OQ7WnhvJA/ARM/3yqvc47hwarp8NEIzRiO8vCJua5RuCG5+5f251K7inGdec7BWlPeEVJOT0drSF9sJOM1yloW+TrqAElcWm87VioQJ6wTZ9YhdZllaa5PU2w4FX2HslvF/6Ov2Qp6357osxPGDfDerbzpaPz/bNTTnVs65Xx/dPIyGcp4sztUnEeTyizh4IyGzvRZxDvpxVdxrVRO+U4lfPRCin9gnH/sIbOf9UEKR9rs418wAcsoJhx8I77IVrtcqnbXbiq9T5oabb8scb3Ki+Y56xL1gza3jYbWRiCrK0utKb5naknD8YLt9/l0dxIbOBxZGbRY7bMSZxPQ33KMuY0rwW1hy4S5NhIL4UUfaIbh+8L1R2w7BFMmI6wRnRXt+5y6GqP59VaXQw8H8AATKkKosbxd+VjG0jt9NKuvTSviY2WxlptG6uP6eJ4dlZdcHq+hDWR5ApRMKxJgIBs9ZgSfVkkhhiKN2QmvTF8rmUjrlnI+PkTMJhrW26F1ONnPQjHoNOzWAYOecP6r7vKOHVI6Lmi/L0DHWu6g8d5BPl+NdyBOa9i3gNLvKW/IgTVCyIllWLOAjCNwlyzzwM0la+FFkzKxQaCGXbP/Tc2KDt7AI9KZ6000Tw+5p0PpYmj4ETME2c4wW5gqda/vwmQeBhBSenWODL7lTnurLJoxLKaA8+CzuIHWmuEgas1hr8fF/yuoYkURd9HDogrM4jc9Bj6db3J7qw7fNKxXU0u/zbZipSCQPztkwBwEblsUS2lzhwSSQyobSjG/mD8x X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB4955 Original-Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none; lists.denx.de; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT024.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: dc5c4574-117e-4ce9-1fcc-08d8d81b1bec X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BgZysUw8CKg20T4DepxRkf/ttEFv75FWvYZXG3tZvZKydC0W92LYCTS245MaJgeT/fxfthZ4okmI+dNz4BYCktNYq6ESuAYuWE3DBtqZrDYE+O7+vXCJuBgTMYs2mdRmXyV8M2rEC7kEgsdm8t9xFcjC2+E7ySztGhdhUj0bqG9BT6eXcb6gCRxuH99EEX9RmYrrMNKwgY3vKsFAk3oL8Q2iMPfewLwNDKoXLgYYJ77uLZLElbB5RcHe+mQJZO3Kk7BQnsJbLWYzIx7Ua5jHsKjFsX/Bjl2FrYzdp3UNxhR+3IxTzvMZq0rI10x1BF8R8wHcDppWf7OC82Q+KEXYMSgMo7k2nX/H234bfjxbg1lwAcRywcPArfoqZdIA/Tx2wDa9s5HckBNBa71mZWFGSjX/afhl7PWoTeweDcX8uzLN3ALIfjVYrDAWRF+7ckQl1v2RzW9IyS6jQPw3t9hAJ3Xk386hqbELPyo5YYZOYya+mZPGmXCHcw0G43mQmx15CAluC31H/7uQGzThO8BItI0QnLnLX8CRs2iE/q/5q3JTm2/ylDBXLKHmujqMOIYF0EtrHcX3l/rZoAHbdtDLeGdV5mkhrhWzR4sST6GPfcLhubWTlp5mloWFE4oxAmaX8ZlhOIUspJRbKzoBbJPWUcjM84q3Gxly/sPJ2QrQ+XM= X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(396003)(376002)(346002)(136003)(39850400004)(46966006)(36840700001)(44832011)(4326008)(1076003)(82310400003)(6666004)(83380400001)(81166007)(7696005)(8936002)(86362001)(16526019)(70206006)(47076005)(6486002)(82740400003)(6916009)(36756003)(356005)(186003)(54906003)(2906002)(26005)(36860700001)(316002)(478600001)(2616005)(956004)(336012)(5660300002)(70586007)(8676002)(30864003); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2021 16:50:30.0868 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8f0da378-62d8-46a4-88eb-08d8d81b20eb X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT024.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3751 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean This commmit exercises the ESRT creation -- introduced in the previous commit -- in two tests. test 1: A fake FMP, with TEST_ESRT_NUM_ENTRIES FW images, is installed in the system leading to the corresponding ESRT entries being populated. The ESRT entries are checked against the datastructure used to initialize the FMP. test 1 invocation: make sandbox_capsule_defconfig all ./u-boot -d arch/sandbox/dts/test.dtb ut lib test 2: The test is part of test_efi_capsule_fw3. In order to run the test the following must be added to sandbox_defconfig: +CONFIG_CMD_SF=y +CONFIG_CMD_MEMORY=y +CONFIG_CMD_FAT=y +CONFIG_DFU=y The ESRT is printed in the u-boot shell by calling efidebug esrt. The test ensures that, after the capsule is installed, the ESRT contains entries with the GUIDs: - EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID; - EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID; test 2 invocation: sudo ./test/py/test.py --bd sandbox -k capsule_fw3 -l --build Signed-off-by: Jose Marinho CC: Heinrich Schuchardt CC: Sughosh Ganu CC: AKASHI Takahiro CC: Ilias Apalodimas CC: Andre Przywara CC: Alexander Graf CC: nd@arm.com --- cmd/efidebug.c | 64 ++++++ test/lib/Makefile | 1 + test/lib/efi_esrt.c | 191 ++++++++++++++++++ .../test_efi_capsule/test_capsule_firmware.py | 4 + 4 files changed, 260 insertions(+) create mode 100644 test/lib/efi_esrt.c diff --git a/cmd/efidebug.c b/cmd/efidebug.c index a7dace2f80..5a9ff2bd9a 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -129,6 +129,61 @@ static int do_efi_capsule_show(struct cmd_tbl *cmdtp, int flag, return CMD_RET_SUCCESS; } +#ifdef CONFIG_EFI_ESRT +/** + * do_efi_capsule_esrt() - manage UEFI capsules + * + * @cmdtp: Command table + * @flag: Command flag + * @argc: Number of arguments + * @argv: Argument array + * Return: CMD_RET_SUCCESS on success, + * CMD_RET_USAGE or CMD_RET_RET_FAILURE on failure + * + * Implement efidebug "capsule esrt" sub-command. + * The prints the current ESRT table. + * + * efidebug capsule esrt + */ +static int do_efi_capsule_esrt(struct cmd_tbl *cmdtp, int flag, + int argc, char * const argv[]) +{ + struct efi_system_resource_table *esrt = NULL; + + if (argc != 1) + return CMD_RET_USAGE; + + for (int idx = 0; idx < systab.nr_tables; idx++) + if (!guidcmp(&efi_esrt_guid, &systab.tables[idx].guid)) + esrt = (struct efi_system_resource_table *)systab.tables[idx].table; + + if (!esrt) + return CMD_RET_FAILURE; + + printf("========================================\n"); + printf("ESRT: fw_resource_count=%d\n", esrt->fw_resource_count); + printf("ESRT: fw_resource_count_max=%d\n", esrt->fw_resource_count_max); + printf("ESRT: fw_resource_version=%lld\n", esrt->fw_resource_version); + + for (int idx = 0; idx < esrt->fw_resource_count; idx++) { + printf("[entry %d]==============================\n", idx); + printf("ESRT: fw_class=%pUL\n", &esrt->entries[idx].fw_class); + printf("ESRT: fw_type=%d\n", esrt->entries[idx].fw_type); + printf("ESRT: fw_version=%d\n", esrt->entries[idx].fw_version); + printf("ESRT: lowest_supported_fw_version=%d\n", + esrt->entries[idx].lowest_supported_fw_version); + printf("ESRT: capsule_flags=%d\n", + esrt->entries[idx].capsule_flags); + printf("ESRT: last_attempt_version=%d\n", + esrt->entries[idx].last_attempt_version); + printf("ESRT: last_attempt_status=%d\n", + esrt->entries[idx].last_attempt_status); + } + printf("========================================\n"); + + return CMD_RET_SUCCESS; +} +#endif /* CONFIG_EFI_ESRT */ /** * do_efi_capsule_res() - show a capsule update result * @@ -221,6 +276,10 @@ static struct cmd_tbl cmd_efidebug_capsule_sub[] = { "", ""), U_BOOT_CMD_MKENT(show, CONFIG_SYS_MAXARGS, 1, do_efi_capsule_show, "", ""), +#ifdef CONFIG_EFI_ESRT + U_BOOT_CMD_MKENT(esrt, CONFIG_SYS_MAXARGS, 1, do_efi_capsule_esrt, + "", ""), +#endif U_BOOT_CMD_MKENT(disk-update, 0, 0, do_efi_capsule_on_disk_update, "", ""), U_BOOT_CMD_MKENT(result, CONFIG_SYS_MAXARGS, 1, do_efi_capsule_res, @@ -256,6 +315,7 @@ static int do_efi_capsule(struct cmd_tbl *cmdtp, int flag, return cp->cmd(cmdtp, flag, argc, argv); } + #endif /* CONFIG_EFI_HAVE_CAPSULE_SUPPORT */ /** @@ -1580,6 +1640,10 @@ static char efidebug_help_text[] = " - show capsule information\n" "efidebug capsule result []\n" " - show a capsule update result\n" +#ifdef CONFIG_EFI_ESRT + "efidebug capsule esrt\n" + " - print the ESRT\n" +#endif "\n" #endif "efidebug devices\n" diff --git a/test/lib/Makefile b/test/lib/Makefile index 97c11e35a8..aeb8c13eb0 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -15,3 +15,4 @@ obj-$(CONFIG_UT_LIB_ASN1) += asn1.o obj-$(CONFIG_UT_LIB_RSA) += rsa.o obj-$(CONFIG_AES) += test_aes.o obj-$(CONFIG_GETOPT) += getopt.o +obj-$(CONFIG_EFI_ESRT) += efi_esrt.o diff --git a/test/lib/efi_esrt.c b/test/lib/efi_esrt.c new file mode 100644 index 0000000000..e8cfe671e2 --- /dev/null +++ b/test/lib/efi_esrt.c @@ -0,0 +1,191 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Test ESRT tables support + * + * Copyright (C) 2021 Arm Ltd. + */ +#include +#include +#include +#include +#include +#include + +#define TEST_ESRT_NUM_ENTRIES 255 + +#if 0x100 < TEST_ESRT_NUM_ENTRIES +#error TEST_ESRT_NUM_ENTRIES must be lower or equal to 255. +#endif + +static +struct efi_firmware_image_descriptor static_img_info[TEST_ESRT_NUM_ENTRIES]; + +static void efi_test_esrt_init_info(void) +{ + for (int idx = 0; idx < TEST_ESRT_NUM_ENTRIES; idx++) { + static_img_info[idx].image_index = 1; + + // Note: the 16 byte value present in + // static_img_info[idx].image_type_id is not strictly a GUID. + // The value is used for the sake of code testing. + static_img_info[idx].image_type_id.b[0] = idx; + + static_img_info[idx].image_id = 0; + static_img_info[idx].image_id_name = NULL; + static_img_info[idx].version = 0; + static_img_info[idx].version_name = NULL; + static_img_info[idx].size = 0; + static_img_info[idx].lowest_supported_image_version = 1; + static_img_info[idx].last_attempt_version = 2; + static_img_info[idx].last_attempt_status = 3; + static_img_info[idx].hardware_instance = 1; + } +} + +static efi_status_t +EFIAPI efi_test_fmp_get_image_info(struct efi_firmware_management_protocol *this, + efi_uintn_t *image_info_size, + struct efi_firmware_image_descriptor *image_info, + u32 *descriptor_version, + u8 *descriptor_count, + efi_uintn_t *descriptor_size, + u32 *package_version, + u16 **package_version_name) +{ + efi_status_t ret = EFI_SUCCESS; + + if (!image_info_size) + return EFI_INVALID_PARAMETER; + + if (descriptor_version) + *descriptor_version = EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION; + if (descriptor_count) + *descriptor_count = TEST_ESRT_NUM_ENTRIES; + if (descriptor_size) + *descriptor_size = sizeof(*image_info); + if (package_version) + *package_version = 0xffffffff; + if (package_version_name) + *package_version_name = NULL; + + if (*image_info_size < sizeof(*image_info)) { + *image_info_size = *descriptor_size * *descriptor_count; + return EFI_BUFFER_TOO_SMALL; + } + + for (int idx = 0; idx < TEST_ESRT_NUM_ENTRIES; idx++) + image_info[idx] = static_img_info[idx]; + + return ret; +} + +struct efi_firmware_management_protocol efi_test_fmp = { + .get_image_info = efi_test_fmp_get_image_info, + .get_image = NULL, + .set_image = NULL, + .check_image = NULL, + .get_package_info = NULL, + .set_package_info = NULL, +}; + +static void *lib_test_get_esrt(void) +{ + for (int idx = 0; idx < systab.nr_tables; idx++) + if (!guidcmp(&efi_esrt_guid, &systab.tables[idx].guid)) + return systab.tables[idx].table; + + return NULL; +} + +static bool lib_test_check_uuid_entry(struct efi_system_resource_table *esrt, + struct efi_firmware_image_descriptor + *img_info) +{ + const u32 filled_entries = esrt->fw_resource_count; + struct efi_system_resource_entry *entry = esrt->entries; + + for (u32 idx = 0; idx < filled_entries; idx++) { + if (!guidcmp(&entry[idx].fw_class, &img_info->image_type_id)) { + if (entry[idx].fw_version != img_info->version) + return false; + + if (entry[idx].lowest_supported_fw_version != + img_info->lowest_supported_image_version) + return false; + + if (entry[idx].last_attempt_version != + img_info->last_attempt_version) + return false; + + if (entry[idx].last_attempt_status != + img_info->last_attempt_status) + return false; + + /* + * The entry with fw_class = img_uuid matches with the + * remainder fmp input. + */ + return true; + } + } + + /* There exists no entry with fw_class equal to img_uuid in the ESRT. */ + return false; +} + +int lib_test_efi_esrt(struct unit_test_state *uts) +{ + struct efi_system_resource_table *esrt; + efi_status_t ret = EFI_SUCCESS; + struct efi_boot_services *bt; + + efi_test_esrt_init_info(); + + ret = efi_init_obj_list(); + + bt = systab.boottime; + ut_asserteq(ret, EFI_SUCCESS); + + assert(bt); + + ret = EFI_CALL(bt->install_multiple_protocol_interfaces + (&efi_root, + &efi_guid_firmware_management_protocol, + &efi_test_fmp, + NULL)); + + ut_asserteq(ret, EFI_SUCCESS); + + esrt = lib_test_get_esrt(); + ut_assert(esrt); + + ut_asserteq(esrt->fw_resource_count, TEST_ESRT_NUM_ENTRIES); + + /* Update the ESRT. */ + ut_asserteq(efi_esrt_populate(), EFI_SUCCESS); + esrt = lib_test_get_esrt(); + ut_assert(esrt); + + /* Verify that the number of images remains the same. */ + ut_asserteq(esrt->fw_resource_count, TEST_ESRT_NUM_ENTRIES); + + for (u32 idx = 0; idx < TEST_ESRT_NUM_ENTRIES; idx++) + ut_assert(lib_test_check_uuid_entry(esrt, &static_img_info[idx])); + + ret = EFI_CALL(bt->uninstall_multiple_protocol_interfaces + (efi_root, &efi_guid_firmware_management_protocol, + &efi_test_fmp, NULL)); + + ut_asserteq(ret, EFI_SUCCESS); + + /* Update the ESRT after FMP removal. */ + ut_asserteq(efi_esrt_populate(), EFI_SUCCESS); + esrt = lib_test_get_esrt(); + ut_assert(esrt); + + ut_asserteq(esrt->fw_resource_count, 0); + + return ret; +} + +LIB_TEST(lib_test_efi_esrt, 0); diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware.py b/test/py/tests/test_efi_capsule/test_capsule_firmware.py index f006fa95d6..3a7c2e1ac8 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware.py @@ -229,6 +229,10 @@ class TestEfiCapsuleFirmwareFit(object): output = u_boot_console.run_command( 'env print -e -all Capsule0000') + output = u_boot_console.run_command_list(['efidebug capsule esrt']) + assert 'AE13FF2D-9AD4-4E25-9AC8-6D80B3B22147' in ''.join(output) + assert 'E2BB9C06-70E9-4B14-97A3-5A7913176E3F' in ''.join(output) + output = u_boot_console.run_command_list([ 'host bind 0 %s' % disk_img, 'fatls host 0:1 %s' % CAPSULE_INSTALL_DIR])