From patchwork Tue Aug 16 15:16:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1666898 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=Ueo5U4su; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M6ZW55DWvz1ygF for ; Wed, 17 Aug 2022 01:16:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7921784923; Tue, 16 Aug 2022 17:16:35 +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="Ueo5U4su"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 802C58491A; Tue, 16 Aug 2022 17:16:33 +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-eopbgr60043.outbound.protection.outlook.com [40.107.6.43]) (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 1222483FAB for ; Tue, 16 Aug 2022 17:16:31 +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=nMQjuZH+1hJ0IjFvDcY6+7qz3MRcpG6PbUbzWwN9OqvpcvaH6clPFhjuIGTqjqWMC5NtUxzA51W/MebUSx7jx/0OTuluexrPkEkHYUEGDksULUujP9U0aGnPAbzoApII+e42aCsuQ1nAVdd7kxGuM5bZNuFE9x+NJjyLOlhl6Kxk3NoANj8PVhyb3dcxwYLj2ghyHX5/JRWTGa/W2LtgdKUamcpezOJMs+LNZaLzdC5pY2M1DR9TPuw6onk8Dct62+Mi5bSgDh20SkOfwrw5TmTexdv9z4I1+B7+kvDglr8COnmLlybZwGHBywDS2lMQS3KBNB/jGUYv/Gp3ZCYu2g== 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=RyeStB6Mp1XPE6+ANovD/q+sX7DqXoIw1PBHlyhBDn0=; b=CcIp/6r8qCdBLJ7n1nu8/7wcMAWy7M7WvAJBLwzVsrfttUd4ckU0QJ4/PUA9E4tcXNyjTzDdJM3t6TYDa3kxoG4mhlY8h0IK6tEriTfiTi2YM9I2kNN0WprfVI6vPa2jGFHpwE6/lbmtF38tXakDfoZsakQfwk/rS1eLV7V4i1Ay1q0+owvveC//k2ZKKMAwwPLKjwqauXEKQkkweTT+tdQvaL2y7mvL1TaH/xxWSY5pQO6bGP9fiSFZ9cbTtA1zD0fHe39HAgz+dZGlcVRRH2KROX8DKwt1Zzn4RRR/dqu5UoWvlJ156VwsYPS2Jh1GTmgKyzWrLwPA62v4FaX/9A== 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=RyeStB6Mp1XPE6+ANovD/q+sX7DqXoIw1PBHlyhBDn0=; b=Ueo5U4sud3l8IFxliEznUw9XzWwMzg2skr8wLhBHaWSRPdwHvcVfxOO5qzMR50KE8WPptg3qK69O+VQ8PNPvnAJaxf4Gg/BIf9j94aQDqEdnAMO/JawxAxczSffAfjYidKpGANyiaj8XF4G4u9djakgVsNCLTFiMpStICoxBQRq1wqvIA69H1150eSDvUfDN362g3ksUMfWejkL26iKJ2JXdpTQVTXylOr8Zpwdl7OLC68enGjlmMWNQWn7WNOyCAP8F2vCSRuIQnnVaJTpJANn4upKDMIjf7UX79/9MlJ7YmvQK7RY0mJNCmwgGSS5ks06X8hrLvSmuLcbW7bbWdQ== 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:30 +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:29 +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 1/6] ARMv8/sec_firmware: Remove SEC_FIRMWARE_FIT_CNF_NAME Date: Tue, 16 Aug 2022 11:16:02 -0400 Message-Id: <20220816151607.1569660-2-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: 6034cbbd-64e7-4fd8-d4cf-08da7f9a4ba8 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: /aMT+39fSTBd3ttazhpXQ+GV1DMdQEdDgumH07vt1uoblX8PwfAlTaVz+3ivtff8/+nNk9Fm+MLcDO6l8YCxszTgbMLOvW52ZXrEtXWRXjWLpiEiadl2thNxXCNKEJNA8v6J6fsm4nH0x8BckxkVqTj2BS3v2uFcNq9BnGX7R53lAr5Pf/VJ5BKpSlG+a4OUUz6DZwx4dT/7QrOG8fBtKNw8rODL/6UjLd2EMIcM/WDnF7c4G6hA9KwKJXhJh5gCmc5MbFfCssE1T7ajC7TP9OrKZrzrazxx1fvciotVtB580x/T2pZt4zwbYHMKFaDsy3t1eQM+x+geWPstMdO+9qLjAh9ugLXzpYyS5JkY0snYB+WLugWMMoO+SN1FSkG6qTzMWoqaFrhrp62D/oe/ZpWzGCY2jA1mDDiahgwSKbnJjSsru+JR45wYFKnSwZyCvJe3Jiy3i7RdOGlOkrorYVfYLv0ghyuz5EZzVEx0j1pVap0YsVH7NrL+5vYnw6GgS1Fisk8WQ53G9QNrQF76OTxr/QG4I/YNU7R+2g6W74ztdtpRpicG4ZgPFfvNkIvi7y+t054mwvIshF/msC75VqNq8cVka8w84DS42J7kSQDEgmnnG6kFbPi7aP+eKGuEEEsLc96wiAhUg0N+VgCpFeKYVDHqLD1nbcbA45aV7LRbcWo9l+RJ3JXZbwCf8EBqIItgRAb8kJ3SknwxEyktKrYvTtbXwjNCrippXzSoD4OAWTOE1k7EHiWq13/32PyRoSiqGDqkpKJeiAeOAgeFN7xY8P4yaqsBSEZM7NT1nao= 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: x4Ehc6QLjrceR85GRJelzWaV4EpUHMuJQ5LHqwNmYX2xb7KyG7dj529iS7hulssyq7IptsB1Z+QfQ7XSbyUxWAMpwVmzMupPl/DuF9pRSK/QIXIYeNh7Ncq+fEcGe/WcI0MMcGrmaJsvOO1Dvt4n3B2LiP6DsdkK9VXEDAUTNJVvSfMINLOSBT7eYf3xQRZlWB5PvcXIDIFuaPef0vLmDYds3bATjVmxQ7m3BCGYGEQf/0LdDZXcBmnyh8GCB7hhMjqeKiFLt00RAmXr1hgfvOqwkK2/UqC/hIJPm3EjmFI0m646ECV6LIT3V3BZxMqdh33qEjQaQ1EOrIzdT+lpGdmON2gdBS+p5iOa8WU00j72BbRt32b5JDchlzq4audbOCKOSMTptA7otrADF86Sg33w7dzH3BpUjpY5NA8aTUUP9fIiLz4uayYryIB7kh/CXn8nXKbaOiRtm1Ttzik9CWAlB1TWRi420sYkccZRYXhivOJOFje8x49Rhhi2j49qrGoTEe1Obx/sEEJS+K/nO0CjiqLWlKNmOYccN9lLqh9YyT+E/lg5CH6ya3tx/0qcwNvHoYiJrNsIOIlWi2vy7sZq8AGR5rCt0WSlDG8D3ciEDrR8Q1Mk5HhkhhNviRFH/PGVWXKtFZCRTriZ//wr+kWKkcOYuAc9INpou+fv3TtvskaG7mDwm92PgBkiNHjdSIhWAGQhugKZUB1dBETUYsNte+b9cNspsr66i48Pv0USAR2q/WPz9klb4qsfbue/jvfI/laVUKUYkxTf08d7+CprAuAxaj5vvm/Dut7dWLTuEAeQ3VTzMU9qcnkPrioNhK1S0amJD7PtlIFctBnK3o1c/EEiwOkVj3QLrPNFlNlop0w7VzYNkN//HohT/la/dAimewgH/Xv98ajdcZbMmdwgJ/A5PGTKnbtsXvY1VMUL9HwqSRJXrSowTHilFj7Z3h3lwY1zz83B4pGBShXT4pj/M7HSWITwCGbLcjaWMfp9BoKpykHaaW6X2/ubz95BQhW7YIBGoql5N4TzVU2ggz194tSEfCm+7WuJJknyJIyPuh82rgXYcVaJ35NK8RnOkheLx+wt/ZBW+3w25TxT8JaJ++HHuUeovXjRfcxUGm/si0BHQr07KPpKzjDjW6SeXTxijUb1UhY5h3fcR2fwf0jllosuCe/Z0kNQGJtt0IWpXUJ9yr58wwO8ASSknRmqbUznVUJx+0E9QTbPGqWLVApEBpKUAvOmuzjSa3lA5NQZNPwdEjQNt3is+o/omlbSnErR7+gvryBs1i64tgyuz16G+HK0kAXFEJ4HQw0AMyVTZ4g0JutX/aWn7paCdgz84rKb4ZmeMu+gUWWz/Jbd6W/bVDY+0Fhc7dDWxFxCwbbfC1X2X3KXBwrrz8EGw6SQhozfAlY7EGxo1HuponfnOBHERgcokEFGEJqEZtuGi9EVAnmK7QA5P8QANicyq2fBRnJBmq+sJNl5ZQ0mSL9l0EtflhBgyy4c0vsqGZNeC2UG0ZNubBfw8fSC2bwexlcQ3m/OmDwkHrF3MlWzOI5cCZUDQkLNunzFSuQLDYfr6XFMmdp9wN1vYEJZXV2hV/SNLYRHpEDgx/PyA/M4bk0EeQ== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6034cbbd-64e7-4fd8-d4cf-08da7f9a4ba8 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:29.8487 (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: jxZpe2As9iXWwBuKoVJlm85AfT4Bwp9b7Cy7NAj1WEzvBTGC2JnB/NrlC/Du6vbQyB811Sb4sf9LtvaptMQsGQ== 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 The config to use for FIT images can be better specified by enabling CONFIG_MULTI_DTB_FIT and implementing board_fit_config_name_match. Signed-off-by: Sean Anderson --- (no changes since v1) arch/arm/cpu/armv8/sec_firmware.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 7e6e4064ffe..bbd3f2dca25 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -36,9 +36,6 @@ phys_addr_t sec_firmware_addr; #ifndef SEC_FIRMWARE_FIT_IMAGE #define SEC_FIRMWARE_FIT_IMAGE "firmware" #endif -#ifndef SEC_FIRMWARE_FIT_CNF_NAME -#define SEC_FIRMWARE_FIT_CNF_NAME "config-1" -#endif #ifndef SEC_FIRMWARE_TARGET_EL #define SEC_FIRMWARE_TARGET_EL 2 #endif @@ -47,15 +44,12 @@ 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 *conf_node_name = NULL; char *desc; int ret; - conf_node_name = SEC_FIRMWARE_FIT_CNF_NAME; - - conf_node_off = fit_conf_get_node(sec_firmware_img, conf_node_name); + conf_node_off = fit_conf_get_node(sec_firmware_img, NULL); if (conf_node_off < 0) { - printf("SEC Firmware: %s: no such config\n", conf_node_name); + puts("SEC Firmware: no config\n"); return -ENOENT; } @@ -124,18 +118,15 @@ static int sec_firmware_check_copy_loadable(const void *sec_firmware_img, { phys_addr_t sec_firmware_loadable_addr = 0; int conf_node_off, ld_node_off, images; - char *conf_node_name = NULL; const void *data; size_t size; ulong load; const char *name, *str, *type; int len; - conf_node_name = SEC_FIRMWARE_FIT_CNF_NAME; - - conf_node_off = fit_conf_get_node(sec_firmware_img, conf_node_name); + conf_node_off = fit_conf_get_node(sec_firmware_img, NULL); if (conf_node_off < 0) { - printf("SEC Firmware: %s: no such config\n", conf_node_name); + puts("SEC Firmware: no config\n"); return -ENOENT; }