From patchwork Fri Feb 19 18:04:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Marinho X-Patchwork-Id: 1442407 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=1NsfJd+3; 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=1NsfJd+3; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DhzyG1NJ6z9sSC for ; Sat, 20 Feb 2021 05:05:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C153782731; Fri, 19 Feb 2021 19:05:11 +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="1NsfJd+3"; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="1NsfJd+3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CD44D82385; Fri, 19 Feb 2021 19:05:02 +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,SPF_HELO_PASS, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::612]) (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 952F382385 for ; Fri, 19 Feb 2021 19:04:55 +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=1NsfJd+3+dEsS1hesuzk2veqNMrCnLlWCmKGc22iF2boWnQtHow2Tdjq0No81j3cs1W3UZwqtePbWSubvc5MM9OfHLMgGKBjSCZ7CH7rBXrq963m7o6BxDHV5d4t5TMeLmzJNSS6kY1i/rDJ69/S1q5XAPTF3ZwqU5A4NzuCsXU= Received: from AM6P195CA0026.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:81::39) by VI1PR08MB5421.eurprd08.prod.outlook.com (2603:10a6:803:132::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.29; Fri, 19 Feb 2021 18:04:53 +0000 Received: from AM5EUR03FT030.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:81:cafe::92) by AM6P195CA0026.outlook.office365.com (2603:10a6:209:81::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Fri, 19 Feb 2021 18:04:53 +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 AM5EUR03FT030.mail.protection.outlook.com (10.152.16.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Fri, 19 Feb 2021 18:04:52 +0000 Received: ("Tessian outbound fb307b4548b2:v71"); Fri, 19 Feb 2021 18:04:52 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 73e7992161594481 X-CR-MTA-TID: 64aa7808 Received: from fb3dbd01990e.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id FE27F343-A9FF-4430-9C8D-8D2136E50A8D.1; Fri, 19 Feb 2021 18:04:46 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id fb3dbd01990e.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 19 Feb 2021 18:04:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SEoLZs0rq3UNcmwv59oKsorX7VexLVdCdLT97mhqETwurni0KMmPip17mCegdeCn+9GByxMSpS658RJbttbvh0FOsO6o1JNH1ukyBuW10eOQKq/DQer5u7HcIvA1u8Ors7JAs1TJd2W7zqa6ulwaFkz3I1ipC7pN9mRYFQKD61bM3QmD1wWWTRxDihUu6nEcoSaS1xC4argwqP6Uz/+5YRY4xOHmtPAId3BD2tOcRZGtxA0Ca65htN5+1pt6D+GuI68O0xIrn0h4b4sW/lkjvosypwdOioy9OulaoiEYV+jNGJ2kKvhcbsq1gLc8Wy0wAzkLo+wQfsQgr3kC5aQV4g== 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=ag9XrWZ7zAMuklFzRQS8VGM5y9w+e4WKjxpJlXQ52SMhfcJyaKGr8S6Df1t5QtVC2YXZH5KG0UhUkX5s78V5j4E1+kIlb9cGWXfw23KYQp79YorchsaGiDyBz9JH49FJneYyc+/6i0gwtLe9bUbAAmZ176Gpe6Fumfo7ec3fCdvePGTuV1Qx2NQXC+Lz9wLUw6Xbka8QW1A+tYjwK1Q6M53WLEusoSCuWSoDPgo3mgd9H4P6JObkVGJVvaVAc3ur+dnD/87AMH7W/pnYUmJ55kGdws2DyObJvuq6WLrN+FS4P2GV+fE+PY99rTgwGvTYPMS45taYznK7ni89E3k1hg== 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=1NsfJd+3+dEsS1hesuzk2veqNMrCnLlWCmKGc22iF2boWnQtHow2Tdjq0No81j3cs1W3UZwqtePbWSubvc5MM9OfHLMgGKBjSCZ7CH7rBXrq963m7o6BxDHV5d4t5TMeLmzJNSS6kY1i/rDJ69/S1q5XAPTF3ZwqU5A4NzuCsXU= 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 DB7PR08MB4219.eurprd08.prod.outlook.com (2603:10a6:10:34::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.29; Fri, 19 Feb 2021 18:04:44 +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.042; Fri, 19 Feb 2021 18:04:44 +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] efi: ESRT creation tests Date: Fri, 19 Feb 2021 18:04:21 +0000 Message-Id: <20210219180421.2267-3-jose.marinho@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210219180421.2267-1-jose.marinho@arm.com> References: <20210219180421.2267-1-jose.marinho@arm.com> X-Originating-IP: [217.140.106.50] X-ClientProxiedBy: LO2P123CA0099.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:139::14) 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.50) by LO2P123CA0099.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:139::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.38 via Frontend Transport; Fri, 19 Feb 2021 18:04:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 21ba2cdb-5be1-4875-0517-08d8d500db02 X-MS-TrafficTypeDiagnostic: DB7PR08MB4219:|VI1PR08MB5421: 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: NFMvP+4BnTBsSAZjsEq8GlDrxdqMcTEmjvzD9t7ZH6sxCec6NsOR96w7v8OF/akjM4dmmrk3UFn0B+H1qIMO8x7iNYqBjMBMz3IMt2CIZF5l8Az39J2Vf7iuUb7EE+du32UdDIZyU45kFhzsPgHQTyN7bBMLpVVFyYfBUQCAlOfUcWqZQCpKWG0C4CYwgvloDQI9nlKWPlqmYVkykjPTLjS/oQx0xKT2+FBzj12AoGExUTYGvqLEu48RFkkQUiPKJeoZD1kqiR6SdTTlkx0JTpTV13sZnmjo9oBZa5VmnplbFthpKCCNej7ZhNoVxvSuKME1HlefPaB0gSrLrT2bHvS7Q1fmeu5BO05ionSqNH+JIPbVl2SZFCF2Qz88r5zeF7MaiXJRgk2FSVPfzAkJCkR+3iQLOp7bK4qnP9u/Wxj7Vf0wWYB2aw3y9ExvZ2qLn+sJyOysX1u8OVsDHmZPGKwHSr0EQozBGrInupdt02HYoAzAu8R2KU35mmZ41XR0EPkLZTGqBU4q4OvcOcFOtg== 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)(136003)(366004)(376002)(39860400002)(346002)(83380400001)(316002)(30864003)(54906003)(478600001)(5660300002)(86362001)(8936002)(186003)(26005)(2906002)(36756003)(16526019)(44832011)(2616005)(6666004)(8676002)(52116002)(6916009)(956004)(7696005)(6486002)(66556008)(4326008)(66476007)(1076003)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: HSzNKCYRiFH/pyhM7L6Zu1+VpPCWE273ssgWDxxWBgJVydi10gyEjxmKokGVbOK1aan3B85lkZ4CCGBiyqnhfGFdEPlOYvm5kxkZAdb6H3X5uWbj/SdWoR2jKv7/E8HCLSWfdfitJu3MTjQPxJJFFXYb/SF57AkWjxiFIbJ/mCONObVq8f+LyJiAfWsBUkTUMZFR6fynwvqkYzTjxjJHhHM9nYXmTlIqFXLArZRdivP2/DPt7So60v1tot741G/mIXNcw7A7ZNCDHI/3cXAmnU2w0qfXbyLGEUm9X0m+68wCNG0DQ/Vm2/9OsRTDZ0MT41TBIN0Cd/hrEILzozumQyhc/sPwL0bHJ15TZc5PedEP+TRoaUj4RMRGSe1LQ2vRiy/vUg+NvMXWIsVaPayLOGu9+/wltMEXQweiHrEDYN65ITrSewL0MmzUvL5xJtPwSkrqWoJtjRn04RNCeD5i0M4fqbHU+GQ5xCkVSIGd7IBxEHPirH6FL87+UOuHMNeaMNOhVHr8IqSqXQU+fzxtCaLNBHYo4THEsyjg8Btn6+gjEQqFa8gnWdqfvNyvC/wL42ZzKctxhB4oOU1Vyldgr2QaVdpd336N/mWHc4oBUysxvIWq5xtryuZsa1luAP4qgd/MiAaVX/SN1Oit09QYJylWlbUlJJSleFDUksbvcPVcCfGGavXH5L3fpyO0BrghQSnNCqFhOaF+0KEGQzdQqKbmc5/1Lahu3+PzeWjVSYjG9G9V2bOYQUYVWe9iHSL1oYqrZhBqQD9U66QLOp4QSozGhHrWL3ZkdSAVGr7boLYeuqJJHaRzwjCDDY2GXiKtxr1vTMzKDFB9XpRSabyGvUNuLfuBUPvW1epIX5dERMTyxuxcicmwRthzz+YpTL7QemPnvhNnAC+k5Tvs3nUOtsaxrQoMj17khle6VXWAthW8/GVXN0RqgnmqQWwm92YPp1QHhWtmFLESep1Js292s7yOJo7s8VLsvBrpkI7AbSw9hzUy7ecq6OjTi03eBF2WfU3s7zVLAigDs/d/g20aXVUM52InTdaBiP3iusnwy8/Hl9S0GQAminqmjxtofg/QTXbndGXVM/518beLxkRJZGIcFJUiMuLBK6rlZaSO0ZBJg8prxZDGHmMe3XEkTn4zhKN8jsir6WmFan1qn0xhU7qQk3mldGNF02U5dnaZZVCCepiOc50vEJMeKNIrlKaf0sDv/2IbWjhddEfXuEf/nB8G9Dextr2vEfd5ZFYm8O6ymqlQg4qlNuaHFrd7007d+q9pGTm7yWrXfBASaSGuUC50ijNSUIOVKy4HMyCiekPKywUy1TaiFwS8S7Sdkvxg X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB4219 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: AM5EUR03FT030.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: a81cb98b-11b8-4f88-78e5-08d8d500d619 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ujee2fBfpFX9/mBmFsRMG+ZEOxEyWowiLxVATk+wuGSrVjm8Zpydo912tjG+OpZFJKb6P9FB82JxQz50JJAt4Hu6cBrJ2XiIlTKFE1OZiF65OjXEnvGnTju062HwaxVRslOKWQdR00ejfHiR906E2HxaX5gygWwAnrPb91ovUqkdcHMKwN3TOzqlZ2+ZPMVShSuNN0dG2HMnkdA+0B+GEBuslwmOhirqzYJaNswm4uX1mMVH/4STD8VYazz+LBLOlJb5iq43GQZJtNN6FflO05Yn2aJUUUPvw6bABUCnwuw/Bc1ihiGShinYYE0z/N7NQa5saQiMXVEJ21kfZMi1i5c5IHHgSJ7w7c77NZCQ+OI+7GXjuyuTskc8qPcDbZ9YDN4UPAtZ9M/rhzx3bTkRo+wCm2XM6s5o8GXlfrvdnQpT3mFNfSt0aHVP0xhjfeYAfJ2gaYw4mrb9uH4RYeG2SgEKuAy1c182raMfVtPX3M538EADolEC5EDUeJyqakla3PLBMVhFqYLdg6Lq93pWGHwexy7Xl+tjrM+MmjZCOWYudXiSSe2X6gvqANRW0nETLb0luYKzrL95zFaKfUbQB6+GnMVgstXhPE+y7VJYjE0qJjrvyjg7vJUxBoBNTfSkoT8LYvyWPZ15GthAQ1CtOGxg/dyNEK4zyR977LWrTG8= 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)(346002)(39860400002)(396003)(136003)(376002)(36840700001)(46966006)(5660300002)(30864003)(1076003)(70206006)(8676002)(336012)(2906002)(4326008)(36756003)(6666004)(2616005)(16526019)(70586007)(186003)(82310400003)(81166007)(356005)(36860700001)(82740400003)(8936002)(83380400001)(26005)(7696005)(44832011)(54906003)(316002)(86362001)(6486002)(956004)(47076005)(6916009)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2021 18:04:52.3234 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 21ba2cdb-5be1-4875-0517-08d8d500db02 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: AM5EUR03FT030.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5421 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])