[PATCH v3] xilinx: zynqmp: Extract aes operation into new file
Michal Simek
monstr at monstr.eu
Mon Jul 24 12:39:27 CEST 2023
On 7/18/23 12:30, christian.taedcke-oss at weidmueller.com wrote:
> From: Christian Taedcke <christian.taedcke at weidmueller.com>
>
> 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 <christian.taedcke at weidmueller.com>
> ---
>
> Changes in v3:
> - fix function doc format
>
> 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 <michal.simek at xilinx.com>
>
> -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 <siva.durga.paladugu at xilinx.com>
> + *
> + * Copyright (C) 2023 Weidmueller Interface GmbH & Co. KG <oss at weidmueller.com>
> + * Christian Taedcke <christian.taedcke at weidmueller.com>
> + */
> +
> +#include <common.h>
> +#include <mach/zynqmp_aes.h>
> +
> +#include <asm/arch/sys_proto.h>
> +#include <cpu_func.h>
> +#include <memalign.h>
> +#include <zynqmp_firmware.h>
> +
> +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)));
Can you please get rid of () around the second parameter?
> + flush_dcache_range(aes->ivaddr,
> + (aes->ivaddr +
> + roundup(IV_SIZE, ARCH_DMA_MINALIGN)));
same here
> + flush_dcache_range(aes->dstaddr,
> + (aes->dstaddr +
> + roundup(aes->len, ARCH_DMA_MINALIGN)));
same here.
> + }
> +
> + if (aes->keysrc == 0) {
> + if (aes->keyaddr == 0)
> + return -EINVAL;
> +
> + flush_dcache_range(aes->keyaddr, (aes->keyaddr +
> + roundup(KEY_PTR_LEN, ARCH_DMA_MINALIGN)));
And here. And here you also have incorrect indentation on second line.
> + }
> +
> + 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..2a9cffbd0f
> --- /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 <oss at weidmueller.com>
> + * Christian Taedcke <christian.taedcke at weidmueller.com>
> + *
> + * 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;
> +};
> +
> +/**
> + * zynqmp_aes_operation() - 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 dd1ad66f90..60c7bfca02 100644
> --- a/board/xilinx/zynqmp/cmds.c
> +++ b/board/xilinx/zynqmp/cmds.c
> @@ -14,16 +14,7 @@
> #include <asm/arch/hardware.h>
> #include <asm/arch/sys_proto.h>
> #include <asm/io.h>
> -
> -struct aes {
> - u64 srcaddr;
> - u64 ivaddr;
> - u64 keyaddr;
> - u64 dstaddr;
> - u64 len;
> - u64 op;
> - u64 keysrc;
> -};
> +#include <mach/zynqmp_aes.h>
>
> 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
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP/Versal ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal/Versal NET SoCs
TF-A maintainer - Xilinx ZynqMP/Versal/Versal NET SoCs
More information about the U-Boot
mailing list