From patchwork Thu Mar 24 15:26:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1609107 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=rNDRgFjW; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4KPTbN5GLcz9sBy for ; Fri, 25 Mar 2022 02:26:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EAD45840EB; Thu, 24 Mar 2022 16:26:37 +0100 (CET) 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="rNDRgFjW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 34803840D5; Thu, 24 Mar 2022 16:26:36 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20611.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::611]) (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 974CF84000 for ; Thu, 24 Mar 2022 16:26:33 +0100 (CET) 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=k8iq4hJFmgORUS0bQGNs5HhmuZ3Jm8icK7m2k4xnzai495qt7vMvLf7MQW8YHLtsxf4tIZRe1wKRhtgo5J219oTfNVbiPqWMMP21ViyITN2ZOKkMCNnkDuyj50Fkvrftq0ydVwNiX4Oa+5gDAacTYbzJ2hrPzbZG9dNkwWcG72A7ZusYdXmzT1tPE7kayn4oBt4aXM27p71LWtrJxAElLuLhNGsIjczWw8u6okK+DdBpH6ovazxNMEaF3uKz41qN2IsUXcAbZ5J7CWK3xtTvhia3iZmLcd+wdPthIxvIAc3z+gEhFz3vloyzla4sZPwEq4GNqlqqZ7+w99pczi3NGA== 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=ZEBWSujzzcZD6j3JOx/xxErObUhkju7HCZnAAwoK36Q=; b=CZwab+JR8jTJs9pSIfhWZvh1Q+5Nc8/tsuCAFBopKK1mWYtGFKYzTiLB7zsId8N5n7RY3j5XAiwhZVkwQNbNkXfE0+3dFJNpkF3URPbqKNMJ9sqO8ZCXtURzeErRc1XvTxULU8Ez0d9xbIKgG0v1QQSkjRtsQ207Zp3Gt306KSRLVaz+jwZW5GVspYrzniDtIIwKQQVl4WJOhNCzjEQ5Ay34QS9xwjrAsh6hWiRe+phj1soS4QXAZBLLAoBZUOAB9aT+K271W9+pnev/fUK2ZkNRI41mKt3vC3p37CdYLv55Lo24rZbqKfoxMVwbJjvIOFh6kENSj+rwCbeS3ss89g== 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=ZEBWSujzzcZD6j3JOx/xxErObUhkju7HCZnAAwoK36Q=; b=rNDRgFjW0VJFC60I1Dfq6XLjwsv+UaWhgRr4Ak+QMI/LCfgg56AstdGfjZNWX9qHczeOzl04Ot/1qv62FGlUppCVlbfegovNNc+Srb0cAtoOMeMDSLafuWpeXXBkJ0cD6RD+aqXmvNr0eLwVTpwAlYAuA2GgiVokKPrif4HCHZjYIpYXqcZcyBMf1skfEEp2rH25Z56sSjjjfdSXF6SISe/ybngYk6qFZFKRO2M0M2SqjSMpxfLvY3fxHv4IUqVAQC0OOgUE8n35vO/YTWJk7tLvbuQMTJzWmzzHEF6P05PRdm8OGOTpy21RwGTHMiLmeJi0sgJzkjw18gfrM+6pPg== 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 AM0PR03MB5652.eurprd03.prod.outlook.com (2603:10a6:208:171::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.18; Thu, 24 Mar 2022 15:26:30 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::2414:8ad5:9fd6:3bff]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::2414:8ad5:9fd6:3bff%5]) with mapi id 15.20.5102.018; Thu, 24 Mar 2022 15:26:30 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Marian Balakowicz , Bartlomiej Sieka , Sean Anderson Subject: [PATCH] image: fit: Align hash output buffers Date: Thu, 24 Mar 2022 11:26:11 -0400 Message-Id: <20220324152611.1970384-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: BL1PR13CA0066.namprd13.prod.outlook.com (2603:10b6:208:2b8::11) 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: 11b67a47-9cbb-4379-acf9-08da0daaabe3 X-MS-TrafficTypeDiagnostic: AM0PR03MB5652:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lz90NHQSLILU5XRTd/2k+HtmL5A3B1WHT+VF3lGbHP8DOmmdXQ9Psvs+IHuY7Frqmhb6prXA+dlZ5vQY+vhrjVguN8ptW1U8b/UexAY2I6WmazFLlk6zX20mm6VhgTtLhtFUki4/5ABUa2WCKJIt+dhywMMudRw7UvmodxcS9rGxsGI77OKewJcZ/m16MgoyK464mHfMk1UwsFi/Cid/hmeIv3eTF874IrHaJz8NVj3LiH9xA6DZuVZaEAbFFb9/cGunQWRjDIH6Wk0BjM1TsiHKvUqnS9fvTWAqekhQBMVe10UT9+s+tdpHA88Xgndgy7WsrlUc/kJ5RI1TmqZPp0EvtAG1oRYcBylxLOuIXPfywLoWyc2wkyaOf8WJws/pQTiUARHpeskxSOKr6Itk8ZuZP++UdNj75IBNtcoBJqX+GmofDamLbDshx5hUJhO0USud/JuLR12evta3/bJ6L9Te4GeND9itFDmpbhXNNUEY++5T8nfJl+vDwQlnhR++PtpcYm50iOfOgH+rwtPIsrmxzvjtTgftdW2pX/XHhYhJkBQHlSXO556tXBad+mmHWDkYOj1SPfCdDwJlrTZf/N1krRbYT+za2P+mbOfvMSB7bgkN/pGjVz5cxtD5tfVFB5YwpvMfU/IWo9YvuJ4aTOU4OSCgryACyFAg3Ho+pb2CJ+JvRFYsir0Rs+wNfkrsMub/wyjiyjIxTN+W4qcemQ== 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:(13230001)(366004)(54906003)(38100700002)(38350700002)(4326008)(316002)(6666004)(26005)(186003)(6512007)(2616005)(52116002)(107886003)(1076003)(6506007)(83380400001)(508600001)(2906002)(6486002)(8936002)(86362001)(5660300002)(36756003)(44832011)(8676002)(66946007)(66476007)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dwgzARY3gErQVJhbFNMTfg7iTKbbCybX7GzQsfgiPR4ziDqUAofuD6pYQ+oUzBxcvRKvPooJSktFQJh1NbxerYsBPaiULTaBaYyO7o1EKT2egiNgPgy6NnlcnVzqegKb0hj8cZ42nAhmyB26PWkjXsEZn8wHJ1l5WLOoUnESDkcDi4bVecUjvd4zXVDISt+ezyAVsb38qWQwTVGxhlwiikqi3+eNOs7utpEzbX7MVAsnCHmFy3481OA077EIuJ14htuJfmug51F4Jzj1SFVMcH9x9gqN6hndfa7A52sey0XyhRi82wxxxBVazeFquUXaOwwTTtcFSYMMePru2R72yWs9TvNO9vNWeaUW0qUZsc375/4Bq1PjnOWxPDwGY+pte+wkK/CIKwF663TLLjnHerNz/6aZKg6+AkAoNqEHKWvL3upbvI7LorHWZqZlM3fVa5iZByKvPsloqHVqBYJ+XUCDsgphFMgfQ7pbF9UcNtfs6xPbh/hZ0kAZkhenRWxTLY/W8DkpWNLlSQ6JbebxjKkPOLq+u/0Kqnw1BANIqtgR5BwZUhNhXZGeZJJJNAxVLEYapAAztJDx3p86tUoz8FVrlDLmwgGoUYN9VxabcQjMaTLgImbYPysDFDwBbtwlf6dDs4+VAUXSpcRq4Kjc7Hz+FIdleOcrOaRrBLk+kwZGeQ7+mosScH2oECHzOdyzz8vuqVFpkcDuCqWSuVY88yT4lPguPqxroUtrAFEl0snMLyLY0XAD3XOcBb5dHO2ywL0nxYfstpBWQ9D2U3wAZJX3MCjOoNJkr5bpElS69i+wQZLHmo4rDdXYsH2nH9f+6AyoMM0DgigPd4NwLbtZqZrhXUhbSM7d3DGnqRmZ9YNXlb6dsDBWwvHIFsklTYRbD3Q9uHZxugLqKcVEP7OZTpCAg1zXH7krSYLJYe2g0gxJkV99M91l0cdxA7hFUx2ZYmEpYW8ayzggrfL+bc0J2e36CrtUJoTcvTDpDS4PmuCd0GLG6SkBH8HvgvTi/hTklO2dBz2Wmat/t+2K107Y2WzcIdpAxPJPzdpjUajbFOtnBU7dzrXChp17G3FaZiHTzQGIjB7CoJtCfJ2CpFVFmG7Lm2+NgoLN1xjSJJACSQ4m8389Qq7t8tRKJcBHbY+AzPmNIMtkw/jCgs/Z1i1SGewLN0TQXmh1BtMB4sGgmPRBW+/GU+0DasDHub/2bOdxPggYuHCXwo/oKhDl4PrNEF/88u7XFdjg2z5ix+OkLih1rS8ZnqdgoTqUOoW2qcCEhVpgF2ndF8dnv3iRGnYHL9Vk3tSS1Dt2uZlWzlrrj4Y3Lbc6d/e3GyqEGMXOjptJYdC3ViB2WEYS8rQnOY5j4BqVRCMyVy3CylF8m1C9BVPOJSdAC6s/bOMVGm4DevQxGTvgnBOS6j4pscfrASUR/I/G/ksuyyxiWoBkGYs2s5HiL7FvWycXhSIQoqHp6SPoxtRlDrLyEuDmxDAdhhslLADR1JCL5aCbb6FHsONrzoBZEEbQkmtFl/a39MwxD+zkRzGubBg+Xr7kAYBKuM06rBqyW7NOiuQbZlgBTa57kY0jTrZCq+G/ZwCELFJjkqZT/tgLbnmoIChwqNWwx8vzkTGyCZvIGTSckO7eo3dcPcYaGAl+wW/90+wmE0h8BooS869Hq1A6zqFJyzGijNdsbTRU3S0EQDg3juL+Dy8aMnO0Dmqsu+SPAK+MY59HU1V/vnqFMIrfj+hSKzMq/mGDGynmMPnElVVuCqdgB3xe+t8= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11b67a47-9cbb-4379-acf9-08da0daaabe3 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2022 15:26:30.7491 (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: /df/lR7y7qWVOpizmCJ8Tqz79kiXrmuhq2MbH2axdW/vNDaRu6edXbgG3AifBuCNwkA1rguqETH1sWi8OyHIig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR03MB5652 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.5 at phobos.denx.de X-Virus-Status: Clean Hardware-accelerated hash functions require that the input and output buffers be aligned to the minimum DMA alignment. memalign.h helpfully provides a macro just for this purpose. It doesn't exist on the host, but we don't need to be aligned there either. Fixes: 5dfb521386 ("[new uImage] New uImage low-level API") Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- boot/image-fit.c | 4 +++- tools/mkimage.h | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/boot/image-fit.c b/boot/image-fit.c index f01cafe4e2..6610035d0a 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #ifdef CONFIG_DM_HASH #include @@ -1263,7 +1264,8 @@ int calculate_hash(const void *data, int data_len, const char *name, static int fit_image_check_hash(const void *fit, int noffset, const void *data, size_t size, char **err_msgp) { - uint8_t value[FIT_MAX_HASH_LEN]; + DEFINE_ALIGN_BUFFER(uint8_t, value, FIT_MAX_HASH_LEN, + ARCH_DMA_MINALIGN); int value_len; const char *algo; uint8_t *fit_value; diff --git a/tools/mkimage.h b/tools/mkimage.h index 0d3148444c..7652c8b001 100644 --- a/tools/mkimage.h +++ b/tools/mkimage.h @@ -41,6 +41,9 @@ static inline ulong map_to_sysmem(void *ptr) return (ulong)(uintptr_t)ptr; } +#define ARCH_DMA_MINALIGN 1 +#define DEFINE_ALIGN_BUFFER(type, name, size, alugn) type name[size] + #define MKIMAGE_TMPFILE_SUFFIX ".tmp" #define MKIMAGE_MAX_TMPFILE_LEN 256 #define MKIMAGE_DEFAULT_DTC_OPTIONS "-I dts -O dtb -p 500"