From 94e7cb181ad6bd25d36a11c58e0df64e9f815888 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 24 Jul 2023 19:51:05 -0400 Subject: Revert "Merge branch '2023-07-24-introduce-FF-A-suppport'" This reverts commit d927d1a80843e1c3e2a3f0b8f6150790bef83da1, reversing changes made to c07ad9520c6190070513016fdb495d4703a4a853. These changes do not pass CI currently. Signed-off-by: Tom Rini --- test/cmd/Makefile | 2 - test/cmd/armffa.c | 33 ------- test/dm/Makefile | 3 +- test/dm/ffa.c | 261 ------------------------------------------------------ test/lib/Makefile | 1 - test/lib/uuid.c | 41 --------- 6 files changed, 1 insertion(+), 340 deletions(-) delete mode 100644 test/cmd/armffa.c delete mode 100644 test/dm/ffa.c delete mode 100644 test/lib/uuid.c (limited to 'test') diff --git a/test/cmd/Makefile b/test/cmd/Makefile index 6e3d7e919e..a3cf983739 100644 --- a/test/cmd/Makefile +++ b/test/cmd/Makefile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2013 Google, Inc -# Copyright 2022-2023 Arm Limited and/or its affiliates ifdef CONFIG_HUSH_PARSER obj-$(CONFIG_CONSOLE_RECORD) += test_echo.o @@ -25,7 +24,6 @@ obj-$(CONFIG_CMD_SEAMA) += seama.o ifdef CONFIG_SANDBOX obj-$(CONFIG_CMD_READ) += rw.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o -obj-$(CONFIG_ARM_FFA_TRANSPORT) += armffa.o endif obj-$(CONFIG_CMD_TEMPERATURE) += temperature.o obj-$(CONFIG_CMD_WGET) += wget.o diff --git a/test/cmd/armffa.c b/test/cmd/armffa.c deleted file mode 100644 index 9a44a397e8..0000000000 --- a/test/cmd/armffa.c +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Test for armffa command - * - * Copyright 2022-2023 Arm Limited and/or its affiliates - * - * Authors: - * Abdellatif El Khlifi - */ - -#include -#include -#include -#include -#include -#include - -/* Basic test of 'armffa' command */ -static int dm_test_armffa_cmd(struct unit_test_state *uts) -{ - /* armffa getpart */ - ut_assertok(run_command("armffa getpart " SANDBOX_SERVICE1_UUID, 0)); - - /* armffa ping */ - ut_assertok(run_commandf("armffa ping 0x%x", SANDBOX_SP1_ID)); - - /* armffa devlist */ - ut_assertok(run_command("armffa devlist", 0)); - - return 0; -} - -DM_TEST(dm_test_armffa_cmd, UT_TESTF_SCAN_FDT | UT_TESTF_CONSOLE_REC); diff --git a/test/dm/Makefile b/test/dm/Makefile index 7ed00733c1..3799b1ae8f 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2013 Google, Inc -# Copyright 2022-2023 Arm Limited and/or its affiliates +# Copyright 2023 Arm Limited and/or its affiliates obj-$(CONFIG_UT_DM) += test-dm.o @@ -92,7 +92,6 @@ obj-$(CONFIG_POWER_DOMAIN) += power-domain.o obj-$(CONFIG_ACPI_PMC) += pmc.o obj-$(CONFIG_DM_PMIC) += pmic.o obj-$(CONFIG_DM_PWM) += pwm.o -obj-$(CONFIG_ARM_FFA_TRANSPORT) += ffa.o obj-$(CONFIG_QFW) += qfw.o obj-$(CONFIG_RAM) += ram.o obj-y += regmap.o diff --git a/test/dm/ffa.c b/test/dm/ffa.c deleted file mode 100644 index 6912666bb4..0000000000 --- a/test/dm/ffa.c +++ /dev/null @@ -1,261 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Functional tests for UCLASS_FFA class - * - * Copyright 2022-2023 Arm Limited and/or its affiliates - * - * Authors: - * Abdellatif El Khlifi - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -/* Functional tests for the UCLASS_FFA */ - -static int check_fwk_version(struct ffa_priv *uc_priv, struct unit_test_state *uts) -{ - struct ffa_sandbox_data func_data; - u32 fwk_version = 0; - - func_data.data0 = &fwk_version; - func_data.data0_size = sizeof(fwk_version); - ut_assertok(sandbox_query_ffa_emul_state(FFA_VERSION, &func_data)); - ut_asserteq(uc_priv->fwk_version, fwk_version); - - return 0; -} - -static int check_endpoint_id(struct ffa_priv *uc_priv, struct unit_test_state *uts) -{ - ut_asserteq(0, uc_priv->id); - - return 0; -} - -static int check_rxtxbuf(struct ffa_priv *uc_priv, struct unit_test_state *uts) -{ - ut_assertnonnull(uc_priv->pair.rxbuf); - ut_assertnonnull(uc_priv->pair.txbuf); - - return 0; -} - -static int check_features(struct ffa_priv *uc_priv, struct unit_test_state *uts) -{ - ut_assert(uc_priv->pair.rxtx_min_pages == RXTX_4K || - uc_priv->pair.rxtx_min_pages == RXTX_16K || - uc_priv->pair.rxtx_min_pages == RXTX_64K); - - return 0; -} - -static int check_rxbuf_mapped_flag(u32 queried_func_id, - u8 rxbuf_mapped, - struct unit_test_state *uts) -{ - switch (queried_func_id) { - case FFA_RXTX_MAP: - ut_asserteq(1, rxbuf_mapped); - break; - case FFA_RXTX_UNMAP: - ut_asserteq(0, rxbuf_mapped); - break; - default: - ut_assert(false); - } - - return 0; -} - -static int check_rxbuf_release_flag(u8 rxbuf_owned, struct unit_test_state *uts) -{ - ut_asserteq(0, rxbuf_owned); - - return 0; -} - -static int test_ffa_msg_send_direct_req(u16 part_id, struct unit_test_state *uts) -{ - struct ffa_send_direct_data msg; - u8 cnt; - struct udevice *dev; - - ut_assertok(uclass_first_device_err(UCLASS_FFA, &dev)); - - ut_assertok(ffa_sync_send_receive(dev, part_id, &msg, 1)); - - for (cnt = 0; cnt < sizeof(struct ffa_send_direct_data) / sizeof(u64); cnt++) - ut_asserteq_64(-1UL, ((u64 *)&msg)[cnt]); - - return 0; -} - -static int test_partitions_and_comms(const char *service_uuid, - struct unit_test_state *uts) -{ - struct ffa_partition_desc *descs; - u32 count, i, j, valid_sps = 0; - struct udevice *dev; - struct ffa_sandbox_data func_data; - struct ffa_partitions *partitions; - - ut_assertok(uclass_first_device_err(UCLASS_FFA, &dev)); - - /* Get from the driver the count and information of the SPs matching the UUID */ - ut_assertok(ffa_partition_info_get(dev, service_uuid, &count, &descs)); - - /* Make sure the count is correct */ - ut_asserteq(SANDBOX_SP_COUNT_PER_VALID_SERVICE, count); - - /* SPs found , verify the partitions information */ - - func_data.data0 = &partitions; - func_data.data0_size = sizeof(struct ffa_partitions *); - ut_assertok(sandbox_query_ffa_emul_state(FFA_PARTITION_INFO_GET, &func_data)); - - for (i = 0; i < count ; i++) { - for (j = 0; - j < partitions->count; - j++) { - if (descs[i].info.id == - partitions->descs[j].info.id) { - valid_sps++; - ut_asserteq_mem(&descs[i], - &partitions->descs[j], - sizeof(struct ffa_partition_desc)); - /* Send and receive data from the current partition */ - test_ffa_msg_send_direct_req(descs[i].info.id, uts); - } - } - } - - /* Verify expected partitions found in the emulated secure world */ - ut_asserteq(SANDBOX_SP_COUNT_PER_VALID_SERVICE, valid_sps); - - return 0; -} - -static int dm_test_ffa_ack(struct unit_test_state *uts) -{ - struct ffa_priv *uc_priv; - struct ffa_sandbox_data func_data; - u8 rxbuf_flag = 0; - const char *svc1_uuid = SANDBOX_SERVICE1_UUID; - const char *svc2_uuid = SANDBOX_SERVICE2_UUID; - struct udevice *dev; - - /* Test probing the sandbox FF-A bus */ - ut_assertok(uclass_first_device_err(UCLASS_FFA, &dev)); - - /* Get a pointer to the sandbox FF-A bus private data */ - uc_priv = dev_get_uclass_priv(dev); - - /* Make sure the private data pointer is retrieved */ - ut_assertnonnull(uc_priv); - - /* Test FFA_VERSION */ - check_fwk_version(uc_priv, uts); - - /* Test FFA_ID_GET */ - check_endpoint_id(uc_priv, uts); - - /* Test FFA_FEATURES */ - check_features(uc_priv, uts); - - /* Test RX/TX buffers */ - check_rxtxbuf(uc_priv, uts); - - /* Test FFA_RXTX_MAP */ - func_data.data0 = &rxbuf_flag; - func_data.data0_size = sizeof(rxbuf_flag); - - rxbuf_flag = 0; - sandbox_query_ffa_emul_state(FFA_RXTX_MAP, &func_data); - check_rxbuf_mapped_flag(FFA_RXTX_MAP, rxbuf_flag, uts); - - /* FFA_PARTITION_INFO_GET / FFA_MSG_SEND_DIRECT_REQ */ - test_partitions_and_comms(svc1_uuid, uts); - - /* Test FFA_RX_RELEASE */ - rxbuf_flag = 1; - sandbox_query_ffa_emul_state(FFA_RX_RELEASE, &func_data); - check_rxbuf_release_flag(rxbuf_flag, uts); - - /* FFA_PARTITION_INFO_GET / FFA_MSG_SEND_DIRECT_REQ */ - test_partitions_and_comms(svc2_uuid, uts); - - /* Test FFA_RX_RELEASE */ - rxbuf_flag = 1; - ut_assertok(sandbox_query_ffa_emul_state(FFA_RX_RELEASE, &func_data)); - check_rxbuf_release_flag(rxbuf_flag, uts); - - return 0; -} - -DM_TEST(dm_test_ffa_ack, UT_TESTF_SCAN_FDT | UT_TESTF_CONSOLE_REC); - -static int dm_test_ffa_nack(struct unit_test_state *uts) -{ - struct ffa_priv *uc_priv; - const char *valid_svc_uuid = SANDBOX_SERVICE1_UUID; - const char *unvalid_svc_uuid = SANDBOX_SERVICE3_UUID; - const char *unvalid_svc_uuid_str = SANDBOX_SERVICE4_UUID; - struct ffa_send_direct_data msg; - int ret; - u32 count; - u16 part_id = 0; - struct udevice *dev; - struct ffa_partition_desc *descs = NULL; - - /* Test probing the sandbox FF-A bus */ - ut_assertok(uclass_first_device_err(UCLASS_FFA, &dev)); - - /* Get a pointer to the sandbox FF-A bus private data */ - uc_priv = dev_get_uclass_priv(dev); - - /* Make sure the private data pointer is retrieved */ - ut_assertnonnull(uc_priv); - - /* Query partitions count using invalid arguments */ - ret = ffa_partition_info_get(dev, NULL, NULL, NULL); - ut_asserteq(-EINVAL, ret); - ret = ffa_partition_info_get(dev, unvalid_svc_uuid, NULL, NULL); - ut_asserteq(-EINVAL, ret); - ret = ffa_partition_info_get(dev, unvalid_svc_uuid, &count, NULL); - ut_asserteq(-EINVAL, ret); - - /* Query partitions count using an invalid UUID string */ - ret = ffa_partition_info_get(dev, unvalid_svc_uuid_str, &count, &descs); - ut_asserteq(-EINVAL, ret); - - /* Query partitions count using an invalid UUID (no matching SP) */ - count = 0; - ret = ffa_partition_info_get(dev, unvalid_svc_uuid, &count, &descs); - ut_asserteq(0, count); - - /* Query partitions data using a valid UUID */ - count = 0; - ut_assertok(ffa_partition_info_get(dev, valid_svc_uuid, &count, &descs)); - /* Make sure partitions are detected */ - ut_asserteq(SANDBOX_SP_COUNT_PER_VALID_SERVICE, count); - ut_assertnonnull(descs); - - /* Send data to an invalid partition */ - ret = ffa_sync_send_receive(dev, part_id, &msg, 1); - ut_asserteq(-EINVAL, ret); - - /* Send data to a valid partition */ - part_id = uc_priv->partitions.descs[0].info.id; - ut_assertok(ffa_sync_send_receive(dev, part_id, &msg, 1)); - - return 0; -} - -DM_TEST(dm_test_ffa_nack, UT_TESTF_SCAN_FDT | UT_TESTF_CONSOLE_REC); diff --git a/test/lib/Makefile b/test/lib/Makefile index e75a263e6a..e0bd9e04e8 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -22,7 +22,6 @@ obj-$(CONFIG_AES) += test_aes.o obj-$(CONFIG_GETOPT) += getopt.o obj-$(CONFIG_CRC8) += test_crc8.o obj-$(CONFIG_UT_LIB_CRYPT) += test_crypt.o -obj-$(CONFIG_LIB_UUID) += uuid.o else obj-$(CONFIG_SANDBOX) += kconfig_spl.o endif diff --git a/test/lib/uuid.c b/test/lib/uuid.c deleted file mode 100644 index e24331a136..0000000000 --- a/test/lib/uuid.c +++ /dev/null @@ -1,41 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Functional tests for UCLASS_FFA class - * - * Copyright 2022-2023 Arm Limited and/or its affiliates - * - * Authors: - * Abdellatif El Khlifi - */ - -#include -#include -#include -#include -#include - -/* test UUID */ -#define TEST_SVC_UUID "ed32d533-4209-99e6-2d72-cdd998a79cc0" - -#define UUID_SIZE 16 - -/* The UUID binary data (little-endian format) */ -static const u8 ref_uuid_bin[UUID_SIZE] = { - 0x33, 0xd5, 0x32, 0xed, - 0x09, 0x42, 0xe6, 0x99, - 0x72, 0x2d, 0xc0, 0x9c, - 0xa7, 0x98, 0xd9, 0xcd -}; - -static int lib_test_uuid_to_le(struct unit_test_state *uts) -{ - const char *uuid_str = TEST_SVC_UUID; - u8 ret_uuid_bin[UUID_SIZE] = {0}; - - ut_assertok(uuid_str_to_le_bin(uuid_str, ret_uuid_bin)); - ut_asserteq_mem(ref_uuid_bin, ret_uuid_bin, UUID_SIZE); - - return 0; -} - -LIB_TEST(lib_test_uuid_to_le, 0); -- cgit v1.2.3