From patchwork Mon Jul 10 14:09:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Taedcke, Christian" X-Patchwork-Id: 1805864 X-Patchwork-Delegate: monstr@monstr.eu 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 (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=ZAZZkLLJ; 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 4R05Vq5ttTz20Ph for ; Tue, 11 Jul 2023 00:10:11 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 779FC86662; Mon, 10 Jul 2023 16:10:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="ZAZZkLLJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6D1E1866B0; Mon, 10 Jul 2023 16:10:07 +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=-0.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1f::622]) (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 B126984780 for ; Mon, 10 Jul 2023 16:10:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Christian.Taedcke-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JoFvrYw1ccm9nxFdK4LSEyC94LdiTXpl36nZsQIqr0Av2mXoNns2q/Y/+xaYqmnLsyFyr0bnHsLtL7BQeP3ldaetpQXTB/UIhUzq7jRvqIAUiApV44yQSHy1g/BgR1BQS9JX4kTrmOuBmN26nktvmwrP1HYz08xKWbMu6LVKKc2e348fafb+35ZvJEvJcJuhu9SeH89ZdDzupdD50gb1aRCLqVFTdlCePmzJa8+7DEG6q+ELAn+P/j7uiI4PqiiJo5X+YUm/nsN92v9noO7lSg5f8vUGE9Uu2WKH4b5zGmKZeVU8jXlxSx5wfxZnte8LBkypxi2xRGVvxE67QEi3Og== 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=DU8ChDFLYwio16rWmfoZBAmPJuzrD26vtqh/2yv6Xjo=; b=eCEIH2De3Nt2zqXZpWmQ/df6T3hLsdg2mOO4ddFQRFyeijjVdTf0NyjBm4NOkpNeW0RpToypR83Y5ryrJ/oetxxWn0a/C+4ouJCschZPUyM0mDfOWDyzWnC5ogbbWLzR9IH1ufTKGQtMmOE2zXagLaDRnwaX/RtzZVoHGn930siWeTBG+lnayhrtjpZhfiqlK5bmit8xoxCYgD5hVhkLN7ZrIutRq95I90X3CInCjy6ZpB1k1fiGfgPWkleyn+pQwkvWa62iIe/Kb51aDQlD6U4vxrVzWHj6HYXJgjFY/VJJL7SBD+5l0VEKpG3afTlTu6MNLuG1w3Obbhga4LekzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DU8ChDFLYwio16rWmfoZBAmPJuzrD26vtqh/2yv6Xjo=; b=ZAZZkLLJVWD49qK0rwJRXqIXHME0F2thFaD//ZvKZ4zfHTEYaQC/i46jRm8joeHK9/0fNbfdo75KALOK9ieWN2Ez7jAY41wzhumWdxcRIQjJbjzXZek8uMiYEF3LQDfavf+Dzigdvp7IL7vDeB5sFQSIVzc4KNX/95HAJuA9nxs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) by DU0PR08MB8066.eurprd08.prod.outlook.com (2603:10a6:10:3e9::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.30; Mon, 10 Jul 2023 14:10:00 +0000 Received: from AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a535:8289:1a68:c0bd]) by AM0PR08MB4946.eurprd08.prod.outlook.com ([fe80::a535:8289:1a68:c0bd%6]) with mapi id 15.20.6565.028; Mon, 10 Jul 2023 14:10:00 +0000 From: christian.taedcke-oss@weidmueller.com To: u-boot@lists.denx.de Cc: Christian Taedcke , Michal Simek Subject: [PATCH v2] xilinx: zynqmp: Extract aes operation into new file Date: Mon, 10 Jul 2023 16:09:52 +0200 Message-Id: <20230710140952.128021-1-christian.taedcke-oss@weidmueller.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: FR0P281CA0122.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::12) To AM0PR08MB4946.eurprd08.prod.outlook.com (2603:10a6:208:165::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR08MB4946:EE_|DU0PR08MB8066:EE_ X-MS-Office365-Filtering-Correlation-Id: 5035de05-b0a6-48af-12d0-08db814f596d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n52A6GwzOwZGgasyqg7CgZrkB9Jm7Rd8RUqY4ksF7Vlc53s6mJNobdx9UCS/G+eHc1i2Jkh5E99HhRxbFFnbyiqsUMdZXFuJUm7VSk4rPqMDiKIvJLpkFvd525ecXvDRuA4EAAPvoy4bLAqkUvVFOTXq19AItp8it0ZQ0GO09hhf9fOP8aZp2al4V1XrgX9TB4vodFsnkGqjDreMuck+QS7BVOqJZg3cxvNFaeUk97Hfau5c4gShN2GfxAeMP/fQ6gIz0bEcGxghVNczJnlGXB1OhABTd08Tq7j37+pB9Kb2EekY7Lhc6xeopeHukgxtilzmvLfArUjL6KtTQH4FbN67EUZx7a5hT71C0ZMa78cQTb3zVcQiSGVhsJvFVDHk9SE2OfmW5bE8oxw7M/dVCI3B1enDub1cmnI0y5bsd9aQCZcNYByiuWlezKeDrm6jOkre/bQHNy/syOeuWEAKbQrkr4UO00sQPyfkdMdptCVHn+NGoYBTUgPayw+qsc4smMhQMffvS6Hw5IRB9MUJP08M4kICx7yp7LAM/kqxDNDEeY0dq9Cb0XoJBT2OmU6reh3Qhqt62M6dEAaWrtoY7KR9zQ7bYnO6Nm84PIqC9pSd3uO6D/QZwXHXeZd/RWZd X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR08MB4946.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(396003)(39860400002)(366004)(376002)(136003)(451199021)(86362001)(38100700002)(38350700002)(36756003)(6666004)(6486002)(52116002)(54906003)(6506007)(26005)(186003)(1076003)(6512007)(9686003)(2616005)(5660300002)(2906002)(66556008)(316002)(478600001)(66946007)(8936002)(66476007)(8676002)(83380400001)(4326008)(6916009)(41300700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: il0Qdpri6gPnNb5orOX2SzVRWiN7rPN7WzOYyLhZtFQAqqWEFh7KVj0Yb33ZrJQjCU46sxfoKK/FHHHffi2Xmd6ReRwgiLHzsY5nCrPf/dxufnz8du44HLe9IQVdJG57cemYiThyauNO+UHnCJJ3e0GSB+TfGdskVSHuGbII4GdvRgoYieFOPEnyc2yFnuu+o0MMPPhoaiGUBLf2xXeNgFEtRvInvbb9mkEFQMtRc4bScgdiGxmnFqY4LqLhD/Fdgr6z2Bde3m/xi7h1YPeH8JyGTlLdDYhfj2l35KIH2RTw5YdKO/2ddG0zfzb27nj729Are8/7AtgENKcTAnuYowROdyfsozUoQqtxyScviMQfTeN/KjTPpilQg/GGy3XkBXY5EX8wy0Gbry7f6tzOtPHiBvUI3PBpCUdgv+P5XO5zxGSJnzoRciXs+X2aXWhWzBHsk/y9VZOJFwkP65shMPFFKdNrj8wDiTcOzk2g/QfI8gYozzc0Wav0+dtIDizbU3c6GrtmRETetY9alp9alyiWLxIdQCY/TbWQOWlYvLl3YcK9eKr7TUg0dWoKG/6Vq5KkNBAPQmEHiLMnG1yVxtIHxGZA9fo6IIV1wn5CfQbwUMrUCIa3cTWWEAYAMUFGHBjO5ewqmy12lt3yeeSqv4u1pY8o8wSDttyqvMxAL0VDHuXAIbaRaF+0Uvlyka+BW2JdqkubjX6u9FTeLUk46Zzu+U+CqI0IhcuNCJH6qkvmdH+SwtQioWjE9H6tEpvYBhjQ6e15WRHbgRhihSgSPFdOqPV7Knhg0XT8oNQMuEz1rTyf+orY7+9N8EzToIdM68TVBSbCrB8C8sqTS9i/yveS+kCgRue2ejV0Cqrj3fE/iXFVgg35f+IBCQGjUegJHYMHCNZA8wUE1KFWAPuSoxbCsaz8KcGiuXyOyDHY1uoqeMJh80G93vP5Gcm6zEMATaRCI/Xmp/vDAR1HM5VYul8esdO6dmhC6qEPQLjiFbJ7gvs8ZrCM+gd0QOlnfav5jCYcNMrLrTadCtlVGRQfoJnMaQvvUvUYBLyNuBVSV9xyHHQU9zwFE3QYg977C1yFd5bGmgvDfSisjFnI1ph674/HvooW+4g/n9q0apzZ1mXQTwnmht3J3Dg3aW81iGY7JeIi0Zm9Lo2SOdVMbduwTRddOdWtY6wLDP4K9ycwSxdbZuLv3UYHrH5ivDc6oTwGhu7qKNdZeK2kspzPE4QelvkO67PHJxz65ljCMd4TL+cBLIDJEtQHzeudqSbnUzHEZrrz3gph4AIxnms0B+zZlwovXgjByEkHMo78jClOZrAcldbsJBq3pYP5M2TsFeU7d7jIZGr406wDAzJM7ImkVso1usLeKHBbRFHmqIxezNgqSgWZHYWReeV4m1w1kZBZUdqxts+oKteAHPbCx/5vIG72eibWrXNfdBwPRQ45nj6sjB8tZz1RWLuyPyV5hiMcWHUsX/ef1Uc6G7Vxnnt7tQ1Iwalscx7eV3UujkVI9Bm8ARvlFJDFNHmqDp7X+miVKcw5JjUJbJqxzq8nJpRPUHXxoYKWRzAxxoWVF8o4NYnQlFDYxFqtC3jg3tb1ExM3m9sBge0oI6mGVfKejqxQIvDG/7ExCdIMcvmJy7tOxhYUZ+ETnYllCXkelJZsAqP/ X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5035de05-b0a6-48af-12d0-08db814f596d X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB4946.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2023 14:10:00.7090 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: khxiym7br2AJHLA/8mDTt9CudVGZpq1ixUG5+0nAFj/cXtw8NvSWuRfQ+RqH6loerTPuarpYbDrV12GGzhVIt0qfPKLcsk5q6GBIRvYLEpqACakHdvAiVQluQP9FU0S7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8066 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.8 at phobos.denx.de X-Virus-Status: Clean From: Christian Taedcke This moves the aes operation that is performed by the pmu into a separate file. This way it can be called not just from the shell command, but also e.g. from board initialization code. Signed-off-by: Christian Taedcke --- Changes in v2: - convert doxygen comments to kernel-doc - fix typos - fix header license - fix do_zynqmp_aes() return value arch/arm/mach-zynqmp/Makefile | 3 +- arch/arm/mach-zynqmp/aes.c | 58 +++++++++++++++++++ .../arm/mach-zynqmp/include/mach/zynqmp_aes.h | 32 ++++++++++ board/xilinx/zynqmp/cmds.c | 43 +------------- 4 files changed, 94 insertions(+), 42 deletions(-) create mode 100644 arch/arm/mach-zynqmp/aes.c create mode 100644 arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h diff --git a/arch/arm/mach-zynqmp/Makefile b/arch/arm/mach-zynqmp/Makefile index bb1830c846..1a76493bef 100644 --- a/arch/arm/mach-zynqmp/Makefile +++ b/arch/arm/mach-zynqmp/Makefile @@ -3,8 +3,7 @@ # (C) Copyright 2014 - 2015 Xilinx, Inc. # Michal Simek -obj-y += clk.o -obj-y += cpu.o +obj-y += aes.o clk.o cpu.o obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_SPL_BUILD) += spl.o handoff.o psu_spl_init.o obj-$(CONFIG_SPL_ZYNQMP_DRAM_ECC_INIT) += ecc_spl_init.o diff --git a/arch/arm/mach-zynqmp/aes.c b/arch/arm/mach-zynqmp/aes.c new file mode 100644 index 0000000000..115bca8338 --- /dev/null +++ b/arch/arm/mach-zynqmp/aes.c @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * (C) Copyright 2018 Xilinx, Inc. + * Siva Durga Prasad Paladugu + * + * Copyright (C) 2023 Weidmueller Interface GmbH & Co. KG + * Christian Taedcke + */ + +#include +#include + +#include +#include +#include +#include + +int zynqmp_aes_operation(struct zynqmp_aes *aes) +{ + u32 ret_payload[PAYLOAD_ARG_CNT]; + int ret; + + if (zynqmp_firmware_version() <= PMUFW_V1_0) + return -ENOENT; + + if (aes->srcaddr && aes->ivaddr && aes->dstaddr) { + flush_dcache_range(aes->srcaddr, + (aes->srcaddr + + roundup(aes->len, ARCH_DMA_MINALIGN))); + flush_dcache_range(aes->ivaddr, + (aes->ivaddr + + roundup(IV_SIZE, ARCH_DMA_MINALIGN))); + flush_dcache_range(aes->dstaddr, + (aes->dstaddr + + roundup(aes->len, ARCH_DMA_MINALIGN))); + } + + if (aes->keysrc == 0) { + if (aes->keyaddr == 0) + return -EINVAL; + + flush_dcache_range(aes->keyaddr, (aes->keyaddr + + roundup(KEY_PTR_LEN, ARCH_DMA_MINALIGN))); + } + + flush_dcache_range((ulong)aes, (ulong)(aes) + + roundup(sizeof(struct zynqmp_aes), ARCH_DMA_MINALIGN)); + + ret = xilinx_pm_request(PM_SECURE_AES, upper_32_bits((ulong)aes), + lower_32_bits((ulong)aes), 0, 0, ret_payload); + if (ret || ret_payload[1]) { + printf("Failed: AES op status:0x%x, errcode:0x%x\n", + ret, ret_payload[1]); + return -EIO; + } + + return 0; +} diff --git a/arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h b/arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h new file mode 100644 index 0000000000..5bffb6b64c --- /dev/null +++ b/arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Weidmueller Interface GmbH & Co. KG + * Christian Taedcke + * + * Declaration of AES operation functionality for ZynqMP. + */ + +#ifndef ZYNQMP_AES_H +#define ZYNQMP_AES_H + +struct zynqmp_aes { + u64 srcaddr; + u64 ivaddr; + u64 keyaddr; + u64 dstaddr; + u64 len; + u64 op; + u64 keysrc; +}; + +/* + * Performs an aes operation using the pmu firmware + * + * @aes The aes operation buffer that must have been allocated using + * ALLOC_CACHE_ALIGN_BUFFER(struct zynqmp_aes, aes, 1). + * + * Return: 0 in case of success, in case of an error any other value + */ +int zynqmp_aes_operation(struct zynqmp_aes *aes); + +#endif /* ZYNQMP_AES_H */ diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c index e20030ecda..dfa25f6d0d 100644 --- a/board/xilinx/zynqmp/cmds.c +++ b/board/xilinx/zynqmp/cmds.c @@ -14,16 +14,7 @@ #include #include #include - -struct aes { - u64 srcaddr; - u64 ivaddr; - u64 keyaddr; - u64 dstaddr; - u64 len; - u64 op; - u64 keysrc; -}; +#include static int do_zynqmp_verify_secure(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) @@ -121,9 +112,7 @@ static int do_zynqmp_mmio_write(struct cmd_tbl *cmdtp, int flag, int argc, static int do_zynqmp_aes(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { - ALLOC_CACHE_ALIGN_BUFFER(struct aes, aes, 1); - int ret; - u32 ret_payload[PAYLOAD_ARG_CNT]; + ALLOC_CACHE_ALIGN_BUFFER(struct zynqmp_aes, aes, 1); if (zynqmp_firmware_version() <= PMUFW_V1_0) { puts("ERR: PMUFW v1.0 or less is detected\n"); @@ -142,40 +131,14 @@ static int do_zynqmp_aes(struct cmd_tbl *cmdtp, int flag, int argc, aes->keysrc = hextoul(argv[6], NULL); aes->dstaddr = hextoul(argv[7], NULL); - if (aes->srcaddr && aes->ivaddr && aes->dstaddr) { - flush_dcache_range(aes->srcaddr, - (aes->srcaddr + - roundup(aes->len, ARCH_DMA_MINALIGN))); - flush_dcache_range(aes->ivaddr, - (aes->ivaddr + - roundup(IV_SIZE, ARCH_DMA_MINALIGN))); - flush_dcache_range(aes->dstaddr, - (aes->dstaddr + - roundup(aes->len, ARCH_DMA_MINALIGN))); - } - if (aes->keysrc == 0) { if (argc < cmdtp->maxargs) return CMD_RET_USAGE; aes->keyaddr = hextoul(argv[8], NULL); - if (aes->keyaddr) - flush_dcache_range(aes->keyaddr, - (aes->keyaddr + - roundup(KEY_PTR_LEN, - ARCH_DMA_MINALIGN))); } - flush_dcache_range((ulong)aes, (ulong)(aes) + - roundup(sizeof(struct aes), ARCH_DMA_MINALIGN)); - - ret = xilinx_pm_request(PM_SECURE_AES, upper_32_bits((ulong)aes), - lower_32_bits((ulong)aes), 0, 0, ret_payload); - if (ret || ret_payload[1]) - printf("Failed: AES op status:0x%x, errcode:0x%x\n", - ret, ret_payload[1]); - - return ret; + return zynqmp_aes_operation(aes); } #ifdef CONFIG_DEFINE_TCM_OCM_MMAP