From patchwork Tue Aug 16 15:16:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1666900 X-Patchwork-Delegate: van.freenix@gmail.com 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.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=Zq/9tUcZ; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M6ZWP0hKkz1ygF for ; Wed, 17 Aug 2022 01:17:05 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 84CF984914; Tue, 16 Aug 2022 17:16:42 +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="Zq/9tUcZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4CE5B83FA2; Tue, 16 Aug 2022 17:16:36 +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,RCVD_IN_MSPIKE_H2,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-eopbgr60041.outbound.protection.outlook.com [40.107.6.41]) (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 D952F83FA2 for ; Tue, 16 Aug 2022 17:16:33 +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=e5Sx5U2D4CvTGaAsVoBsG6T2L35p87vY4JK59SicNKKqG6xpi1SmmUPDtIJQUC3EMPQrAk3d9VUtllfSwi3RkwL6+H5+S0LLOLjK0QbJWPktQYYx5o7Q16zU+sShGdefd8m5KbAsgfQXwAy94g/kiPVPBgikSgv/fG7ue2xUxzf6yX9bLWJRgDaEe3l/DTN+q7IDHL4H3cSKjB49bF/SyOuw0OSM9eQr7m8GOuQpWWmDdNdZIEyAdm9gpabHl+Ry6+eUGHJMe1sPzvN93bfl8TwRLAb9u4XVs+z4D0TezT82WC11vDBKHTQg9eWn8HjlMAG4Z7sNa1pqybBU4FjgJg== 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=3dZ/i3cN4Wlu3TizQ6Ef51lsrNnYpwpUHdJGD47nOHc=; b=P97AtGqqgWCQ91YnpOI6zYp3AUI3+F7TPOZQvY5QFALi5JV6tuYSeWJFLvse2F4NfVC5Db9p82YbDsOREWwOqU028JWia1b55y/t04pMTD/d61HaXghN2F9ftk8HyZ53Cst8H5bGGl5BvEC8MIV8D9rOvzix4oh7J3GrQ3isIbVtptvZWa1H4cyHTqkFpDCh6bvOoUSlRLO+MR9SKgQBnzd3kqvY9wUDjM9mxMCs/wE1nK/GRR+32cI2h7IC8ANsxwBtGS3yKp7+uQMmaEmnj//rRkD07neX4yXB7FLvngPmdGRZYVI7p1vWTGQj+9nUFHqHDgQgiJMz+UCsDv6pyA== 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=3dZ/i3cN4Wlu3TizQ6Ef51lsrNnYpwpUHdJGD47nOHc=; b=Zq/9tUcZqBs/sDC+WeFocU0pKh5U6hsmJsX16c7yDCnHdR+SaiuOthTQnCe7qQq57XT2B3gA5QrpUpdyGh5dzSVQspmW9jWCNoAvHf6fciKx3v7q62BhW3XANsPcknYQWtcYC9Gs2X+m05ZnpYe7IX3MitkQ9qVWAF345b4VIwCyb6ggrVuZS1hgpBIz+C1zrgwsyfQGz1lnRprSe0IJ/S14mUXzO50YYtqJ3agmyjkmJb1uCip94IqLrpjtvpEdU8XuWF85QmctNFAh0HwtfWrFGblJrAIvWHv/fB5VNfM4L67RV8YHw7fGtkRH/UTYjqizjvTedNLAN+n7IgjlUA== 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 VI1PR0302MB2735.eurprd03.prod.outlook.com (2603:10a6:800:e3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Tue, 16 Aug 2022 15:16:32 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::ecaa:a5a9:f0d5:27a2]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::ecaa:a5a9:f0d5:27a2%4]) with mapi id 15.20.5504.019; Tue, 16 Aug 2022 15:16:32 +0000 From: Sean Anderson To: Peng Fan , u-boot@lists.denx.de Cc: York Sun , Ramon Fried , Joe Hershberger , Simon Glass , Priyanka Jain , Sean Anderson Subject: [RESEND PATCH v2 3/6] ARMv8/sec_firmware: Convert to use fit_get_data_conf_prop Date: Tue, 16 Aug 2022 11:16:04 -0400 Message-Id: <20220816151607.1569660-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220816151607.1569660-1-sean.anderson@seco.com> References: <20220816151607.1569660-1-sean.anderson@seco.com> X-ClientProxiedBy: BL1P221CA0010.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:2c5::14) 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: 7c76266e-9ded-473a-44b2-08da7f9a4d45 X-MS-TrafficTypeDiagnostic: VI1PR0302MB2735:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LsaKtsGRhCCOEpV6LJqdlJAGfQJ5NsipxIjA34BDdjGB/mZMqJ/Noi8EuIGz/xHfteIHRjlhQPWomQEkvwQC9Xs9scMzQI/YfHH35lCP8qplYx5fbggRTaTrJDxFUam3FERAi21i+8E/Gx81ZD2YwzNV+2STIwegLkZrRZJWehncmGE7Rstkj+mVZZ6RZtb/o2rfDGVSLfe5WPNc2qkHeLzEUVpacCVgMrBDwpNXLrfWzoZo8FuOJeCsN9Iqkv6evuHvjnfAIq9xqnH2grmOCKuox3D/PTY5Z9pp6rCrmvCAgtu8S4KCG394LMoBqkS67L/FhNWhzxnQX6sixFKKbSkZxWXbg2REfgFDZ02qQg+BldnICCgMKHLq0BR/UL7CtcxlKbzJJG2MfnfYCFm6QnShXoKQJJSHM6++zEw6+rODxnS+edMNw/YnTXcLglhIHipPtSNhghUsSicKLn0XbA4WDi7ePhoZ6+bsk46N76/KR47cxSDVqyZea7ChY3bGKFT7WMIYOCacYldQWT7hcwo236+GpOLhVsrsRJTAEG/Y7buSugXRCud9D8/X4D87RPtUyjkncgcAv8f9HRrjvVMsIm4MPPx4BU9LJMqK8YLOxxE6j1argWboC/6bUR/P3D7UJ31WXxuPUMkRKnYZPiYlRxMbDgbG+src1BmI4O5J2YSYsYBw4bGNClxtzYSO4d7RFFBLJfjsI9R19Koe0Cd3VKZ++0khdo9okooT20Wt5UhjZ0y0pmyJZx8flQfO2eEzr3zx5sV/0wOtuAlqZctufQEmfvTLxM9286lfpy8= 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:(13230016)(396003)(346002)(366004)(376002)(136003)(39840400004)(6666004)(478600001)(54906003)(66476007)(6512007)(6506007)(52116002)(26005)(86362001)(41300700001)(316002)(66946007)(66556008)(8676002)(4326008)(36756003)(8936002)(2906002)(2616005)(44832011)(107886003)(5660300002)(1076003)(38350700002)(6486002)(83380400001)(186003)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rAIgXA6yavzZyy6ChePrsZQL1mqqlM1LQOMRGzLr5jEvDgHyExMHfgFpG9ZFolxW5ygGBON7KhPbKFyhFUNM48q23iyH6oQZVjaFW5ELaCbu7rfrSlPkYCLMA0FavC394kfnVJug8VDZ2EcWqWzMzoIxgfBR7j0nFnk7boRtfNqzbbI6R/Ff4ZniuQwfF39P08Li9FVR3KwgLlvzojBQgpIg9ff4/34owDGsWNSZYsHv2Qikxgo3wrPOlscm4/jvI2lw28YMKGKWdCrMUpXxsMYsroX0pB8daDRo0OgFr6yfqJHlts97yI6TFBfy6qcpAbUgj99PFk4+V7HKfixmsABl7idLgaTjsOqm/AjYhecBw3ivbRv4PjOZfgjBjNWNqva/w3WqE4nFKbfNkSHXhMpeqlL3FFskdH5tYvI+qa10qgP1loXNEYFptHXB9n7zMC0xNlpS8F40xZOxZEMuZGOOtAj51RX5QFADOohfzwz2jVNCIi3ExST0j//vpuy3B4AH8brLDzFC3Wm/ZmoUrF/nhOxfaEBzTiGOMz1k9HISfN43lEQzqJ57sLT+k8gpm8wolZyN8AESnq9Sj5wtl4m7jh4oTEqMxNMXo8YfRNZNfo+bckG01Kc8/l7UsZwqXp9BJWVD/GcsGgPDblrEjkJSZ1HuZ64RcB3L/1vWFhi01N3MLmOMNaOoAuIVF3CV7LR69RydMCYb4E8JT7iXdrlFqbcyfmI1f4WhGl0AYcyKML4N4Tw161xaXHNuWmyn1MW7HZk2e+WeycZTnC/AQy34EejgSvslUW3mOaFf2ttgCZ9kh8gP33DwTTzZFz0ICjtiKh7izRnSHlL5c3TRN5DZ7QLLquGdUnKpU31MjKioRD5Yb0TpIGPeF6v1bjFitGBbyc0wzkGlopuvv+7G06oDrBQHDjoLUyKSavZMwAE78K/8JnCpzqVhmbk1nR90ej5uJPc/eSbuFW7MZ0NswgvBgD+Ym7uyNdv6ihHdqFb2fclv15QBi69SXchR/k8XX7oAQRm6sMXogISeEIWDkUPylqusiIwEMUA6oyEJfm4D3VDlGeHgEKPts4Bsh/z0EMCAveA3vrZjdUT+u8Re98+3QDYr5jT3MhqaYp1u8Fw0b4BUSMN+rZxO7RVc/u0hp8sRoEPrDJ+aFQ1glWyTBuzdlVukM5UWDvBMqLi/oT+KtjOkhlzpiu3CcYisW7RReZ68bUaTFtu84foisVopOMPMgpwgjn5avBkkWy7QpATlBT7N1J0zA959iCvUkdvE3RQ9yIhAfW1RTysNTY4hzB6x5fiqU1pScrxNISSaAvu25n1QF8eZT6E4CJOV1kFbHO3rCvYXyCfLIoOWbol5EsJhSwySHMKGc7PhL3wb7xfGWC7ObEgM1Yc+TALw7qp/EjCjcdlXL8FraY+OXD6FY3nOrLlwul3A/TRAz5MC62YnZEqwkI15cJU/9qxZqlfciGEwIYVDexapgRzdt/OEw+HbUcTDBBE5grE59cfee75OFQjKOo2u75t8stvaPxIOlgPfHnY00mo8cqOtxQO0qrEIYgInhHtyvx/eTJCL4vM5/ov6LXPDEAxC+V30CyoDd/mH4sjfeodR99VxPNJAAw== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c76266e-9ded-473a-44b2-08da7f9a4d45 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 15:16:32.5828 (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: dNWUNMxX4jfm179Uyj/6wVv4BlaFxg78x4PIjDjLmqjav0FZz/PXss54h1RfOa6ILNpMAiGXIok0ULhxZ1vcZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0302MB2735 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.6 at phobos.denx.de X-Virus-Status: Clean This reduces sec_firmware_get_data to a single call to fit_get_data_conf_prop. I think sec_firmware_check_copy_loadable could also be converted, but it does not map as straightforwardly, so I have left it for a future cleanup. Signed-off-by: Sean Anderson --- Changes in v2: - New arch/arm/cpu/armv8/sec_firmware.c | 39 ++----------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index bbd3f2dca25..540436ba028 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -43,43 +43,8 @@ phys_addr_t sec_firmware_addr; static int sec_firmware_get_data(const void *sec_firmware_img, const void **data, size_t *size) { - int conf_node_off, fw_node_off; - char *desc; - int ret; - - conf_node_off = fit_conf_get_node(sec_firmware_img, NULL); - if (conf_node_off < 0) { - puts("SEC Firmware: no config\n"); - return -ENOENT; - } - - fw_node_off = fit_conf_get_prop_node(sec_firmware_img, conf_node_off, - SEC_FIRMWARE_FIT_IMAGE); - if (fw_node_off < 0) { - printf("SEC Firmware: No '%s' in config\n", - SEC_FIRMWARE_FIT_IMAGE); - return -ENOLINK; - } - - /* Verify secure firmware image */ - if (!(fit_image_verify(sec_firmware_img, fw_node_off))) { - printf("SEC Firmware: Bad firmware image (bad CRC)\n"); - return -EINVAL; - } - - if (fit_image_get_data(sec_firmware_img, fw_node_off, data, size)) { - printf("SEC Firmware: Can't get %s subimage data/size", - SEC_FIRMWARE_FIT_IMAGE); - return -ENOENT; - } - - ret = fit_get_desc(sec_firmware_img, fw_node_off, &desc); - if (ret) - printf("SEC Firmware: Can't get description\n"); - else - printf("%s\n", desc); - - return ret; + return fit_get_data_conf_prop(sec_firmware_img, SEC_FIRMWARE_FIT_IMAGE, + data, size); } /*