diff --git a/baremetal_app/app.c b/baremetal_app/app.c index 97112c3cf14cde7ae8a6bbb6117c4b13adb9c8c1..241bb664e4d3457b0680662d72b1e8303932faec 100644 --- a/baremetal_app/app.c +++ b/baremetal_app/app.c @@ -1,6 +1,6 @@ /** @file - * Copyright (c) 2021, 2023, Arm Limited or its affiliates. All rights reserved. - * SPDX-License-Identifier : Apache-2.0 + * Copyright (c) 2023, Arm Limited or its affiliates. All rights reserved. + * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/arm_system_control_and_management_interface_test_suite_validation_methodology.pdf b/docs/arm_system_control_and_management_interface_test_suite_validation_methodology.pdf index 8abe7ea2d3ba7066bc21f3f97250b2c24b1590e1..6074ccb25408571059baeae3f85ee1da2eeefe85 100644 Binary files a/docs/arm_system_control_and_management_interface_test_suite_validation_methodology.pdf and b/docs/arm_system_control_and_management_interface_test_suite_validation_methodology.pdf differ diff --git a/docs/arm_system_control_and_management_interface_test_suite_validation_methodology_101871_0302_02_en.pdf b/docs/arm_system_control_and_management_interface_test_suite_validation_methodology_101871_0302_02_en.pdf deleted file mode 100644 index 6074ccb25408571059baeae3f85ee1da2eeefe85..0000000000000000000000000000000000000000 Binary files a/docs/arm_system_control_and_management_interface_test_suite_validation_methodology_101871_0302_02_en.pdf and /dev/null differ diff --git a/mocker_app/app.c b/mocker_app/app.c index 48bb43cfe3194dc1566a98c252f08bd5f60b91a8..8da105b6eef33cb403b1211d2d23a26c49c94362 100644 --- a/mocker_app/app.c +++ b/mocker_app/app.c @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2021, 2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2021, 2023, 2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform/linux/common/transport_raw.c b/platform/linux/common/transport_raw.c index 4f9b2d11894b8798332a5cab1cca5bcd1982dc25..fca2e8adff34306ff59133257f70865a1bc7b798 100644 --- a/platform/linux/common/transport_raw.c +++ b/platform/linux/common/transport_raw.c @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -62,38 +62,38 @@ static struct linux_scmi_raw_config *rawc; static int safe_read(int fd, void *buf, size_t count) { - int ret, bytes = 0; - - do { - ret = read(fd, buf + bytes, count - bytes); - if (ret < 0) { - if (errno == -EINTR) - continue; - return ret; - } - bytes += ret; - } while (ret); - - return bytes; + int ret, bytes = 0; + + do { + ret = read(fd, buf + bytes, count - bytes); + if (ret < 0) { + if (errno == -EINTR) + continue; + return ret; + } + bytes += ret; + } while (ret); + + return bytes; } static int safe_write(int fd, const void *buf, size_t count) { - int bytes = 0; + int bytes = 0; - do { - int ret; + do { + int ret; - ret = write(fd, buf + bytes, count - bytes); - if (ret < 0) { - if (errno == -EINTR) - continue; - return ret; - } - bytes += ret; - } while (count > bytes); + ret = write(fd, buf + bytes, count - bytes); + if (ret < 0) { + if (errno == -EINTR) + continue; + return ret; + } + bytes += ret; + } while (count > bytes); - return bytes; + return bytes; } static int linux_read_integer_from_file(int fd_base, char *filepath, diff --git a/platform/linux/juno/include/pal_base_expected.h b/platform/linux/juno/include/pal_base_expected.h index d2d84b69959fdbdfe9df76cdab9f91bb2bfdeeb2..1d1630083c077faf990961fc96f871a7b6bd4949 100644 --- a/platform/linux/juno/include/pal_base_expected.h +++ b/platform/linux/juno/include/pal_base_expected.h @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform/linux/juno/include/pal_clock_expected.h b/platform/linux/juno/include/pal_clock_expected.h index dfc7b208500243dcccbbc9335cb3e456317b2832..89a9d5669fd26f9c45efe5c54e2cc0c4d4faa9a6 100644 --- a/platform/linux/juno/include/pal_clock_expected.h +++ b/platform/linux/juno/include/pal_clock_expected.h @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform/linux/juno/include/pal_powercap_expected.h b/platform/linux/juno/include/pal_powercap_expected.h index a5b64f35956f5a37ee81c5b3ccdc919e8bc3a6f9..f5e456b3e486838596a2a3f1109571cbdf6e354e 100644 --- a/platform/linux/juno/include/pal_powercap_expected.h +++ b/platform/linux/juno/include/pal_powercap_expected.h @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2021, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/platform/linux/juno/pal_powercap.c b/platform/linux/juno/pal_powercap.c index 034ce0962983789b239b0ea784f44927e929614b..774f58f4cc735ee307a83739a7139f8880ee7210 100644 --- a/platform/linux/juno/pal_powercap.c +++ b/platform/linux/juno/pal_powercap.c @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2021, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/test_pool/base/test_b008.c b/test_pool/base/test_b008.c index a10ec29a2849f38410a9b18eb85a2b43a74c6c06..70a0861e071b19a35af4b4b94b2001eeb897c11a 100644 --- a/test_pool/base/test_b008.c +++ b/test_pool/base/test_b008.c @@ -90,7 +90,7 @@ uint32_t base_query_protocol_list(void) /* DISCOVER_LIST_PROTOCOLS with invalid skip value should return INVALID PARAMETERS status */ if (!val_protocol_version_checks_are_relaxed()) - skip = (PROTOCOL_MAX - PROTOCOL_BASE) + 1; /* skip value is set > total num of protocols */ + skip = (PROTOCOL_MAX - PROTOCOL_BASE) + 1; /* skip value is set > total num of protocols */ else skip = total_num_protocols + 1; val_print(VAL_PRINT_TEST, "\n [Check 2] Send invalid skip value : %d", skip); diff --git a/test_pool/clock/test_c005.c b/test_pool/clock/test_c005.c index 4aee5632a944ac0aace8577b389d5b854bec33a6..ed25f3cd4d49834c7b34cf4636f9183c1650f52a 100644 --- a/test_pool/clock/test_c005.c +++ b/test_pool/clock/test_c005.c @@ -37,25 +37,25 @@ uint32_t clock_attributes_check(uint32_t version) /* Discover clock attributes for all clocks */ num_clocks = val_clock_get_info(NUM_CLOCKS, 0); if (num_clocks == 0) { - val_print(VAL_PRINT_ERR, "\n No Clock found "); + val_print(VAL_PRINT_ERR, "\n No Clock found "); return VAL_STATUS_SKIP; } val_print(VAL_PRINT_DEBUG, "\n NUM CLOCKS : %d", num_clocks); switch (version) { case CLOCK_PROTOCOL_VERSION_1: - r_begin = 1; - r_end = 31; - break; + r_begin = 1; + r_end = 31; + break; case CLOCK_PROTOCOL_VERSION_2: - r_begin = 1; - r_end = 28; - break; + r_begin = 1; + r_end = 28; + break; case CLOCK_PROTOCOL_VERSION_3: default: - r_begin = 2; - r_end = 26; - break; + r_begin = 2; + r_end = 26; + break; } for (clock_id = 0; clock_id < num_clocks; clock_id++) @@ -88,26 +88,26 @@ uint32_t clock_attributes_check(uint32_t version) val_print(VAL_PRINT_INFO, "\n CLOCK_ENABLED: %d", val_get_clock_attributes_flag(attributes, CLOCK_ENABLE)); - if (version >= CLOCK_PROTOCOL_VERSION_2) { - val_print(VAL_PRINT_INFO, "\n Extended Name Support: %d", - val_get_clock_attributes_flag(attributes, CLOCK_EXTENDED_NAME_SUPPORT)); - val_print(VAL_PRINT_INFO, "\n Rate Change req notify Support: %d", - val_get_clock_attributes_flag(attributes, CLOCK_RATE_CHNG_REQ_NOTI_SUPP)); - val_print(VAL_PRINT_INFO, "\n Rate Change notification Support: %d", - val_get_clock_attributes_flag(attributes, CLOCK_RATE_CHNG_NOTI_SUPP)); - } + if (version >= CLOCK_PROTOCOL_VERSION_2) { + val_print(VAL_PRINT_INFO, "\n Extended Name Support: %d", + val_get_clock_attributes_flag(attributes, CLOCK_EXTENDED_NAME_SUPPORT)); + val_print(VAL_PRINT_INFO, "\n Rate Change req notify Support: %d", + val_get_clock_attributes_flag(attributes, CLOCK_RATE_CHNG_REQ_NOTI_SUPP)); + val_print(VAL_PRINT_INFO, "\n Rate Change notification Support: %d", + val_get_clock_attributes_flag(attributes, CLOCK_RATE_CHNG_NOTI_SUPP)); + } - if (version >= CLOCK_PROTOCOL_VERSION_3) { - val_print(VAL_PRINT_INFO, "\n Parent Clock Identifier Support: %d", - val_get_clock_attributes_flag(attributes, CLOCK_PARENT_IDENTIFIER_SUPPORT)); - } + if (version >= CLOCK_PROTOCOL_VERSION_3) { + val_print(VAL_PRINT_INFO, "\n Parent Clock Identifier Support: %d", + val_get_clock_attributes_flag(attributes, CLOCK_PARENT_IDENTIFIER_SUPPORT)); + } val_print(VAL_PRINT_INFO, "\n CLOCK_NAME: %s ", (uint8_t *) &return_values[NAME_OFFSET]); - if (version >= CLOCK_PROTOCOL_VERSION_2) - val_print(VAL_PRINT_INFO, "\n CLOCK Enable Delay: %d ", - return_values[ENABLE_DELAY_OFFSET]); - } + if (version >= CLOCK_PROTOCOL_VERSION_2) + val_print(VAL_PRINT_INFO, "\n CLOCK Enable Delay: %d ", + return_values[ENABLE_DELAY_OFFSET]); + } return VAL_STATUS_PASS; } diff --git a/test_pool/clock/test_c009.c b/test_pool/clock/test_c009.c index d7159f286851e86d4f9b8564381ff883810c7213..42cd05b543dcf129ef802d1f02626d8d7d0529a8 100644 --- a/test_pool/clock/test_c009.c +++ b/test_pool/clock/test_c009.c @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2020-2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2020-2023, 2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -106,7 +106,7 @@ uint32_t clock_rate_set_sync_check(void) return VAL_STATUS_FAIL; if (val_compare_status(status, SCMI_DENIED) == VAL_STATUS_PASS) - continue; + continue; if (val_compare_status(status, SCMI_SUCCESS) != VAL_STATUS_PASS) return VAL_STATUS_FAIL; diff --git a/test_pool/clock/test_c010.c b/test_pool/clock/test_c010.c index 87a8441fadd1e62fe4b4e12a0ee181a94b71137d..26c24b389101a08e0187424717e7eba8f5f2dfcd 100644 --- a/test_pool/clock/test_c010.c +++ b/test_pool/clock/test_c010.c @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2020-2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2020-2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -117,7 +117,7 @@ uint32_t clock_rate_set_async_check(void) return VAL_STATUS_FAIL; if (val_compare_status(status, SCMI_DENIED) == VAL_STATUS_PASS) - continue; + continue; if (val_compare_status(status, SCMI_SUCCESS) != VAL_STATUS_PASS) return VAL_STATUS_FAIL; diff --git a/test_pool/clock/test_c011.c b/test_pool/clock/test_c011.c index d3a9c23951412a88c7028732c64d9eff30a5e8a8..80f2e787c41c7e794fed676694cbf3629a1ae4c6 100644 --- a/test_pool/clock/test_c011.c +++ b/test_pool/clock/test_c011.c @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2020-2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2020-2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/test_pool/clock/test_c017.c b/test_pool/clock/test_c017.c index bfb87dcd459cf60743be1f548ae8126ed1b37c05..a586148bb99122d5154c35d1f7d130ecfbf8daa9 100644 --- a/test_pool/clock/test_c017.c +++ b/test_pool/clock/test_c017.c @@ -53,18 +53,18 @@ uint32_t clock_config_set_check(uint32_t version) switch (version) { case CLOCK_PROTOCOL_VERSION_1: - r_begin = 1; - r_end = 31; - break; + r_begin = 1; + r_end = 31; + break; case CLOCK_PROTOCOL_VERSION_2: - r_begin = 1; - r_end = 28; - break; + r_begin = 1; + r_end = 28; + break; case CLOCK_PROTOCOL_VERSION_3: default: - r_begin = 2; - r_end = 26; - break; + r_begin = 2; + r_end = 26; + break; } for (clock_id = 0; clock_id < num_clocks; clock_id++) @@ -90,8 +90,10 @@ uint32_t clock_config_set_check(uint32_t version) VAL_INIT_TEST_PARAM(param_count, rsp_msg_hdr, return_value_count, status); parameters[param_count++] = clock_id; parameters[param_count++] = attributes; - if (version >= CLOCK_PROTOCOL_VERSION_3) - parameters[param_count++] = 0; + + if (version >= CLOCK_PROTOCOL_VERSION_3) + parameters[param_count++] = 0; + cmd_msg_hdr = val_msg_hdr_create(PROTOCOL_CLOCK, CLOCK_CONFIG_SET, COMMAND_MSG); val_send_message(cmd_msg_hdr, param_count, parameters, &rsp_msg_hdr, &status, &return_value_count, return_values); @@ -127,7 +129,7 @@ uint32_t clock_config_set_check(uint32_t version) return VAL_STATUS_FAIL; if (val_reserved_bits_check_is_zero( - VAL_EXTRACT_BITS(return_values[ATTRIBUTE_OFFSET], r_begin, r_end) != VAL_STATUS_PASS)) + VAL_EXTRACT_BITS(return_values[ATTRIBUTE_OFFSET], r_begin, r_end) != VAL_STATUS_PASS)) return VAL_STATUS_FAIL; val_print_return_values(return_value_count, return_values); diff --git a/test_pool/pin_control/test_pi011.c b/test_pool/pin_control/test_pi011.c index dd4b6d80e124667375ede1ba3562a63aa188d3b9..924cdd8739f9788476b542c1b2a871534f9b32db 100644 --- a/test_pool/pin_control/test_pi011.c +++ b/test_pool/pin_control/test_pi011.c @@ -168,6 +168,7 @@ uint32_t pin_control_query_settings_configure_check(void) entry_1 = pin_configs_array[1]; if (val_compare("New Config Value ", entry_1, new_config_value)) return VAL_STATUS_FAIL; + /* STEP 5 : Set default config value back */ val_print(VAL_PRINT_TEST, "\n [Step 5] Set default config value"); diff --git a/test_pool/pin_control/test_pi012.c b/test_pool/pin_control/test_pi012.c index f978152ad50088b414bec6a1b4ab706b569e6abe..76cb3f42bd8bd5e47cc92af61f65a269c4ced322 100644 --- a/test_pool/pin_control/test_pi012.c +++ b/test_pool/pin_control/test_pi012.c @@ -21,11 +21,11 @@ #define TEST_NUM (SCMI_PIN_CONTROL_TEST_NUM_BASE + 12) #define TEST_DESC "pin ctrl settings config invalid param check " -#define PARAMETER_SIZE 5 -#define CONFIG_NUM_SET 1 +#define PARAMETER_SIZE 5 +#define CONFIG_NUM_SET 1 -#define CONFIG_ENABLE 1 -#define DEFAULT_CONFIG_TYPE 0 +#define CONFIG_ENABLE 1 +#define DEFAULT_CONFIG_TYPE 0 uint32_t pin_control_settings_configure_invalid_param_check(void) { diff --git a/test_pool/pin_control/test_pi014.c b/test_pool/pin_control/test_pi014.c index 5f6d96c6adfabe1d0e5e84103b79e6bdf8bf7b19..1368a8b218db8d02e9a6bf88926ea70d63c57d66 100644 --- a/test_pool/pin_control/test_pi014.c +++ b/test_pool/pin_control/test_pi014.c @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -83,7 +83,7 @@ uint32_t pin_control_query_function_select_check(void) val_print_return_values(return_value_count, return_values); val_print(VAL_PRINT_DEBUG, "\n SELECTED PIN FUNCTION: %d", - return_values[RET_FUNCTION_SELECTED_OFFSET]); + return_values[RET_FUNCTION_SELECTED_OFFSET]); } } } @@ -127,7 +127,7 @@ uint32_t pin_control_query_function_select_check(void) val_print_return_values(return_value_count, return_values); val_print(VAL_PRINT_DEBUG, "\n SELECTED GROUP FUNCTION: %d", - return_values[RET_FUNCTION_SELECTED_OFFSET]); + return_values[RET_FUNCTION_SELECTED_OFFSET]); } } } diff --git a/test_pool/pin_control/test_pi015.c b/test_pool/pin_control/test_pi015.c index d26a690086777c881e6624fbd8438abfa55ed077..1f03f4e31c1e4b059e6ce9a4485334d953a138c9 100644 --- a/test_pool/pin_control/test_pi015.c +++ b/test_pool/pin_control/test_pi015.c @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -54,11 +54,11 @@ uint32_t pin_control_query_function_select_invalid_case_check(void) /* pins 0 to num_pins - 1 are valid, using num_pins as invalid pin */ parameters[param_count++] = num_pins; attributes = (GET_NO_CONFIGS << GET_ALL_CONFIGS_LOW) + - (PIN_SELECTOR << SELECTOR_LOW); + (PIN_SELECTOR << SELECTOR_LOW); parameters[param_count++] = attributes; cmd_msg_hdr = val_msg_hdr_create(PROTOCOL_PIN_CONTROL, - PIN_CONTROL_SETTINGS_GET, COMMAND_MSG); + PIN_CONTROL_SETTINGS_GET, COMMAND_MSG); val_send_message(cmd_msg_hdr, param_count, parameters, &rsp_msg_hdr, &status, &return_value_count, return_values); @@ -97,11 +97,11 @@ uint32_t pin_control_query_function_select_invalid_case_check(void) parameters[param_count++] = num_functions - 1; /* Making reserved bit as 1 to make invalid flag */ attributes = (1 << (FUNCTION_ID_VALID + 1)) + - (SET_FUNCTION << FUNCTION_ID_VALID) + PIN_SELECTOR; + (SET_FUNCTION << FUNCTION_ID_VALID) + PIN_SELECTOR; parameters[param_count++] = attributes; cmd_msg_hdr = val_msg_hdr_create(PROTOCOL_PIN_CONTROL, - PIN_CONTROL_SETTINGS_CONFIGURE, COMMAND_MSG); + PIN_CONTROL_SETTINGS_CONFIGURE, COMMAND_MSG); val_send_message(cmd_msg_hdr, param_count, parameters, &rsp_msg_hdr, &status, &return_value_count, return_values); diff --git a/test_pool/pin_control/test_pi022.c b/test_pool/pin_control/test_pi022.c index 42ad65f312e31a31654bce2204e1e6c03715617c..635097f06e45e6abebce83775783b37276bb5832 100644 --- a/test_pool/pin_control/test_pi022.c +++ b/test_pool/pin_control/test_pi022.c @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,14 +43,14 @@ uint32_t pin_control_set_permission_invalid_param_check(void) val_print(VAL_PRINT_ERR, "\n No pin control pin identifiers found"); } else { /* If PINCTRL_SET_PERMISSIONS not supported, skip the test */ - VAL_INIT_TEST_PARAM(param_count, rsp_msg_hdr, return_value_count, status); - message_id = PIN_CONTROL_SET_PERMISSIONS; - param_count = 1; - cmd_msg_hdr = val_msg_hdr_create(PROTOCOL_PIN_CONTROL, - PIN_CONTROL_PROTOCOL_MESSAGE_ATTRIBUTES, - COMMAND_MSG); + VAL_INIT_TEST_PARAM(param_count, rsp_msg_hdr, return_value_count, status); + message_id = PIN_CONTROL_SET_PERMISSIONS; + param_count = 1; + cmd_msg_hdr = val_msg_hdr_create(PROTOCOL_PIN_CONTROL, + PIN_CONTROL_PROTOCOL_MESSAGE_ATTRIBUTES, + COMMAND_MSG); val_send_message(cmd_msg_hdr, param_count, &message_id, &rsp_msg_hdr, &status, - &return_value_count, return_values); + &return_value_count, return_values); if (status != SCMI_SUCCESS) { val_print(VAL_PRINT_ERR, "\n PINCTRL SET PERMISSIONS not supported "); diff --git a/test_pool/pin_control/test_pi023.c b/test_pool/pin_control/test_pi023.c index 56bc67f962a639aaefedbb5587e36724f188f1c4..21c47a7ef08320290616ee3fa70657497b0e766e 100644 --- a/test_pool/pin_control/test_pi023.c +++ b/test_pool/pin_control/test_pi023.c @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,14 +43,14 @@ uint32_t pin_control_set_permission_invalid_id_check(void) val_print(VAL_PRINT_ERR, "\n No pin control pin identifiers found"); } else { /* If PINCTRL_SET_PERMISSIONS not supported, skip the test */ - VAL_INIT_TEST_PARAM(param_count, rsp_msg_hdr, return_value_count, status); - message_id = PIN_CONTROL_SET_PERMISSIONS; - param_count = 1; - cmd_msg_hdr = val_msg_hdr_create(PROTOCOL_PIN_CONTROL, - PIN_CONTROL_PROTOCOL_MESSAGE_ATTRIBUTES, - COMMAND_MSG); + VAL_INIT_TEST_PARAM(param_count, rsp_msg_hdr, return_value_count, status); + message_id = PIN_CONTROL_SET_PERMISSIONS; + param_count = 1; + cmd_msg_hdr = val_msg_hdr_create(PROTOCOL_PIN_CONTROL, + PIN_CONTROL_PROTOCOL_MESSAGE_ATTRIBUTES, + COMMAND_MSG); val_send_message(cmd_msg_hdr, param_count, &message_id, &rsp_msg_hdr, &status, - &return_value_count, return_values); + &return_value_count, return_values); if (status != SCMI_SUCCESS) { val_print(VAL_PRINT_ERR, "\n PINCTRL SET PERMISSIONS not supported "); diff --git a/test_pool/power_domain/test_p007.c b/test_pool/power_domain/test_p007.c index 7a04e0290e28225ee585b8479936439b893c114f..9925460447064f2618275c44d6729fc582fc0c78 100644 --- a/test_pool/power_domain/test_p007.c +++ b/test_pool/power_domain/test_p007.c @@ -48,19 +48,19 @@ uint32_t power_domain_set_power_state_check(uint32_t version) switch (version) { case POWER_PROTOCOL_VERSION_1: case POWER_PROTOCOL_VERSION_2: - r_begin = 0; - r_end = 28; - break; + r_begin = 0; + r_end = 28; + break; case POWER_PROTOCOL_VERSION_2P1: - r_begin = 0; - r_end = 27; - break; + r_begin = 0; + r_end = 27; + break; case POWER_PROTOCOL_VERSION_3: case POWER_PROTOCOL_VERSION_3P1: default: - r_begin = 0; - r_end = 26; - break; + r_begin = 0; + r_end = 26; + break; } for (domain_id = 0; domain_id < num_domains; domain_id++) @@ -85,7 +85,7 @@ uint32_t power_domain_set_power_state_check(uint32_t version) attribute = return_values[ATTRIBUTE_OFFSET]; if (val_reserved_bits_check_is_zero(VAL_EXTRACT_BITS(attribute, r_begin, r_end)) != - VAL_STATUS_PASS) + VAL_STATUS_PASS) return VAL_STATUS_FAIL; set_state_async = VAL_EXTRACT_BITS(attribute, 30, 30); diff --git a/test_pool/power_domain/test_p008.c b/test_pool/power_domain/test_p008.c index 7e0f7345d092f5ed4355efd7ba1a3f49734ca8c9..b1e701befe7a9ac453440df2ad045870e6b0d7bf 100644 --- a/test_pool/power_domain/test_p008.c +++ b/test_pool/power_domain/test_p008.c @@ -48,19 +48,19 @@ uint32_t power_domain_set_power_state_unsupported_domain_check(uint32_t version) switch (version) { case POWER_PROTOCOL_VERSION_1: case POWER_PROTOCOL_VERSION_2: - r_begin = 0; - r_end = 28; - break; + r_begin = 0; + r_end = 28; + break; case POWER_PROTOCOL_VERSION_2P1: - r_begin = 0; - r_end = 27; - break; + r_begin = 0; + r_end = 27; + break; case POWER_PROTOCOL_VERSION_3: case POWER_PROTOCOL_VERSION_3P1: default: - r_begin = 0; - r_end = 26; - break; + r_begin = 0; + r_end = 26; + break; } for (domain_id = 0; domain_id < num_domains; domain_id++) @@ -85,7 +85,7 @@ uint32_t power_domain_set_power_state_unsupported_domain_check(uint32_t version) attribute = return_values[ATTRIBUTE_OFFSET]; if (val_reserved_bits_check_is_zero(VAL_EXTRACT_BITS(attribute, r_begin, r_end)) != - VAL_STATUS_PASS) + VAL_STATUS_PASS) return VAL_STATUS_FAIL; set_state_async = VAL_EXTRACT_BITS(attribute, 30, 30); diff --git a/test_pool/power_domain/test_p012.c b/test_pool/power_domain/test_p012.c index 58338a2f523a7d5fdb66bbbd5f68831b894ffc33..a6d47138453a9a48030109014d6be087d1705763 100644 --- a/test_pool/power_domain/test_p012.c +++ b/test_pool/power_domain/test_p012.c @@ -63,19 +63,19 @@ uint32_t power_domain_power_state_notify_check(uint32_t version) switch (version) { case POWER_PROTOCOL_VERSION_1: case POWER_PROTOCOL_VERSION_2: - r_begin = 0; - r_end = 28; - break; + r_begin = 0; + r_end = 28; + break; case POWER_PROTOCOL_VERSION_2P1: - r_begin = 0; - r_end = 27; - break; + r_begin = 0; + r_end = 27; + break; case POWER_PROTOCOL_VERSION_3: case POWER_PROTOCOL_VERSION_3P1: default: - r_begin = 0; - r_end = 26; - break; + r_begin = 0; + r_end = 26; + break; } for (domain_id = 0; domain_id < num_domains; domain_id++) @@ -100,7 +100,7 @@ uint32_t power_domain_power_state_notify_check(uint32_t version) attribute = return_values[ATTRIBUTE_OFFSET]; if (val_reserved_bits_check_is_zero(VAL_EXTRACT_BITS(attribute, r_begin, r_end)) != - VAL_STATUS_PASS) + VAL_STATUS_PASS) return VAL_STATUS_FAIL; state_change_notify = VAL_EXTRACT_BITS(attribute, 31, 31); diff --git a/test_pool/power_domain/test_p013.c b/test_pool/power_domain/test_p013.c index 00cf5fadde327f55d78f3584316a2f294cf9b6e9..0c235dbd6142d30cd3f1f259f767f3a6eb908d87 100644 --- a/test_pool/power_domain/test_p013.c +++ b/test_pool/power_domain/test_p013.c @@ -63,19 +63,19 @@ uint32_t power_domain_power_state_notify_unspported_domain_check(uint32_t versio switch (version) { case POWER_PROTOCOL_VERSION_1: case POWER_PROTOCOL_VERSION_2: - r_begin = 0; - r_end = 28; - break; + r_begin = 0; + r_end = 28; + break; case POWER_PROTOCOL_VERSION_2P1: - r_begin = 0; - r_end = 27; - break; + r_begin = 0; + r_end = 27; + break; case POWER_PROTOCOL_VERSION_3: case POWER_PROTOCOL_VERSION_3P1: default: - r_begin = 0; - r_end = 26; - break; + r_begin = 0; + r_end = 26; + break; } for (domain_id = 0; domain_id < num_domains; domain_id++) @@ -100,7 +100,7 @@ uint32_t power_domain_power_state_notify_unspported_domain_check(uint32_t versio attribute = return_values[ATTRIBUTE_OFFSET]; if (val_reserved_bits_check_is_zero(VAL_EXTRACT_BITS(attribute, r_begin, r_end)) != - VAL_STATUS_PASS) + VAL_STATUS_PASS) return VAL_STATUS_FAIL; state_change_notify = VAL_EXTRACT_BITS(attribute, 31, 31); diff --git a/test_pool/power_domain/test_p018.c b/test_pool/power_domain/test_p018.c index 93ab472c4bf92a143a18b10ef19d6fb522b6cb35..c759c260b1e13db6ee0d334ddf1e6c2da864aeb7 100644 --- a/test_pool/power_domain/test_p018.c +++ b/test_pool/power_domain/test_p018.c @@ -38,7 +38,8 @@ uint32_t power_query_ext_domain_name_invalid_domain(void) /* Get Extended name for invalid domain */ domain_id = val_power_domain_get_info(0, NUM_POWER_DOMAIN) + 1; - val_print(VAL_PRINT_TEST, "\n [Check 1] Get extended name for non existent domain %d", domain_id); + val_print(VAL_PRINT_TEST, + "\n [Check 1] Get extended name for non existent domain %d", domain_id); VAL_INIT_TEST_PARAM(param_count, rsp_msg_hdr, return_value_count, status); param_count++; diff --git a/test_pool/powercap/test_pc005_v2.c b/test_pool/powercap/test_pc005_v2.c index f693d14ef134b17991c7474ee75c5c3461f92678..91409130e789f5ff7e6576a8c269ed3de473b474 100644 --- a/test_pool/powercap/test_pc005_v2.c +++ b/test_pool/powercap/test_pc005_v2.c @@ -114,8 +114,8 @@ uint32_t powercap_query_domain_attributes_v2(void) /* Domain name */ if (val_compare_str("DOMAIN NAME", (char *)&return_values[NAME_OFFSET], - name, SCMI_NAME_STR_SIZE)) - return VAL_STATUS_FAIL; + name, SCMI_NAME_STR_SIZE)) + return VAL_STATUS_FAIL; /* PAI values */ min_pai = return_values[MIN_PAI_OFFSET]; diff --git a/test_pool/powercap/test_pc009.c b/test_pool/powercap/test_pc009.c index b4e8e0a53a4fef9ac5dd4e9b3de74aea19e03a44..33bb778d904e32920da126141175bab1fd282760 100644 --- a/test_pool/powercap/test_pc009.c +++ b/test_pool/powercap/test_pc009.c @@ -70,7 +70,7 @@ uint32_t powercap_set_power_cap_value(void) VAL_INIT_TEST_PARAM(param_count, rsp_msg_hdr, return_value_count, status) parameters[param_count++] = domain_id; - /* PC_CAP_SET_EXPECT will be ignored by the platform on a non-async request */ + /* PC_CAP_SET_EXPECT will be ignored by the platform on a non-async request */ parameters[param_count++] = val_get_cap_set_flag(PC_CAP_SET_SYNC, PC_CAP_SET_EXPECT); parameters[param_count++] = val_powercap_get_info(POWERCAP_POWERCAP, domain_id); @@ -90,7 +90,7 @@ uint32_t powercap_set_power_cap_value(void) val_print(VAL_PRINT_TEST, "\n [Check 2] Set Powercap [Sync + Ignore]"); VAL_INIT_TEST_PARAM(param_count, rsp_msg_hdr, return_value_count, status) parameters[param_count++] = domain_id; - /* PC_CAP_SET_EXPECT will be ignored by the platform on a non-async request */ + /* PC_CAP_SET_EXPECT will be ignored by the platform on a non-async request */ parameters[param_count++] = val_get_cap_set_flag(PC_CAP_SET_SYNC, PC_CAP_SET_IGNORE); parameters[param_count++] = val_powercap_get_info(POWERCAP_POWERCAP, domain_id); @@ -106,10 +106,10 @@ uint32_t powercap_set_power_cap_value(void) val_print_return_values(return_value_count, return_values); - if (val_get_powercap_attributes_flag(attributes, PC_ASYNC_PC_SET_SUPP) == 0) { - val_print(VAL_PRINT_TEST, "\n Async PC set NOT supported...skip."); - continue; - } + if (val_get_powercap_attributes_flag(attributes, PC_ASYNC_PC_SET_SUPP) == 0) { + val_print(VAL_PRINT_TEST, "\n Async PC set NOT supported...skip."); + continue; + } /* Step 3 : Set Powercap asynchronously and ignore delayed response */ val_print(VAL_PRINT_TEST, "\n [Check 3] Set Powercap [Async + Ignore]"); @@ -130,9 +130,9 @@ uint32_t powercap_set_power_cap_value(void) val_print_return_values(return_value_count, return_values); - /* Expect an error since on PC_CAP_SET_IGNORE the platform should NOT have sent - * any delayed response, and that will result in a timeout. - */ + /* Expect an error since on PC_CAP_SET_IGNORE the platform should NOT have sent + * any delayed response, and that will result in a timeout. + */ VAL_INIT_TEST_PARAM(param_count, rsp_msg_hdr, return_value_count, status); val_receive_delayed_response(&rsp_msg_hdr, &status, &return_value_count, return_values); if (val_compare_status(status, SCMI_GENERIC_ERROR) != VAL_STATUS_PASS) @@ -149,7 +149,7 @@ uint32_t powercap_set_power_cap_value(void) cmd_msg_hdr = val_msg_hdr_create(PROTOCOL_POWERCAP, POWERCAP_CAP_SET, COMMAND_MSG); val_send_message_async(cmd_msg_hdr, param_count, parameters, &rsp_msg_hdr, &status, - &return_value_count, return_values); + &return_value_count, return_values); if (val_compare_status(status, SCMI_SUCCESS) != VAL_STATUS_PASS) return VAL_STATUS_FAIL; diff --git a/test_pool/powercap/test_pc011.c b/test_pool/powercap/test_pc011.c index f6647a94e859c1c51324891f4febcf7f1845a98a..65ba99fddb92e4dde669068138b865ea3e8464a3 100644 --- a/test_pool/powercap/test_pc011.c +++ b/test_pool/powercap/test_pc011.c @@ -46,26 +46,26 @@ uint32_t powercap_invalid_data_set_power_cap_value(uint32_t version) val_print(VAL_PRINT_TEST, "\n [Check 1] Set ZERO power cap for valid domain"); if (version < POWERCAP_PROTOCOL_VERSION_2) { - VAL_INIT_TEST_PARAM(param_count, rsp_msg_hdr, return_value_count, status); + VAL_INIT_TEST_PARAM(param_count, rsp_msg_hdr, return_value_count, status); - parameters[param_count++] = domain_id; - parameters[param_count++] = 0x0; - parameters[param_count++] = 0x0; + parameters[param_count++] = domain_id; + parameters[param_count++] = 0x0; + parameters[param_count++] = 0x0; - cmd_msg_hdr = val_msg_hdr_create(PROTOCOL_POWERCAP, POWERCAP_CAP_SET, COMMAND_MSG); - val_send_message(cmd_msg_hdr, param_count, parameters, &rsp_msg_hdr, &status, - &return_value_count, return_values); + cmd_msg_hdr = val_msg_hdr_create(PROTOCOL_POWERCAP, POWERCAP_CAP_SET, COMMAND_MSG); + val_send_message(cmd_msg_hdr, param_count, parameters, &rsp_msg_hdr, &status, + &return_value_count, return_values); - if (val_compare_status(status, SCMI_INVALID_PARAMETERS) != VAL_STATUS_PASS) - return VAL_STATUS_FAIL; + if (val_compare_status(status, SCMI_INVALID_PARAMETERS) != VAL_STATUS_PASS) + return VAL_STATUS_FAIL; - if (val_compare_msg_hdr(cmd_msg_hdr, rsp_msg_hdr) != VAL_STATUS_PASS) - return VAL_STATUS_FAIL; + if (val_compare_msg_hdr(cmd_msg_hdr, rsp_msg_hdr) != VAL_STATUS_PASS) + return VAL_STATUS_FAIL; - val_print_return_values(return_value_count, return_values); + val_print_return_values(return_value_count, return_values); } else { - val_print(VAL_PRINT_TEST, "\n Powercap protocol version >= %d. Skip.\n", - POWERCAP_PROTOCOL_VERSION_2); + val_print(VAL_PRINT_TEST, "\n Powercap protocol version >= %d. Skip.\n", + POWERCAP_PROTOCOL_VERSION_2); } /* Set invalid reserved flags */ diff --git a/test_pool/voltage/test_v005_v2.c b/test_pool/voltage/test_v005_v2.c index 02d89901de2b68440b732892fb60f70f5286c183..6be0cc63c2df1d5e89df9d238623425bdce94498 100644 --- a/test_pool/voltage/test_v005_v2.c +++ b/test_pool/voltage/test_v005_v2.c @@ -79,8 +79,8 @@ uint32_t voltage_query_domain_attributes_v2(void) val_voltage_save_info(VOLTAGE_ATTRIBUTES, domain_id, attribute); if (val_compare_str("DOMAIN NAME", (char *)&return_values[NAME_OFFSET], - name, SCMI_NAME_STR_SIZE)) - return VAL_STATUS_FAIL; + name, SCMI_NAME_STR_SIZE)) + return VAL_STATUS_FAIL; } return VAL_STATUS_PASS; diff --git a/val/include/val_pin_control.h b/val/include/val_pin_control.h index b7a60196daee42ab35091213ae64b0ce30bc4dea..1a47fec6c3c910974458ff0946fe614465e2a1d7 100644 --- a/val/include/val_pin_control.h +++ b/val/include/val_pin_control.h @@ -47,8 +47,8 @@ #define SELECTOR_LOW 16 #define SKIP_CONFIGS_LOW 8 #define SET_CONFIGS_LOW 2 -#define SET_FUNCTION 1 -#define FUNCTION_ID_VALID 10 +#define SET_FUNCTION 1 +#define FUNCTION_ID_VALID 10 #define FUNCTION_IGNORED 0 #define PINCTRL_ACCESS_DENY 0 #define PINCTRL_ACCESS_ALLOW 1 diff --git a/val/include/val_power_domain.h b/val/include/val_power_domain.h index 05389b64627310ec0f8ce4aba797727103a684ba..acef81464042df07e86829813a7a0bf2e829f7f8 100644 --- a/val/include/val_power_domain.h +++ b/val/include/val_power_domain.h @@ -18,7 +18,7 @@ #ifndef __VAL_POWER_DOMAIN_H__ #define __VAL_POWER_DOMAIN_H__ -#define MAX_POWER_DOMAINS 10 +#define MAX_POWER_DOMAINS 15 #define VERSION_OFFSET 0 #define ATTRIBUTE_OFFSET 0 diff --git a/val/include/val_powercap.h b/val/include/val_powercap.h index 6d5ae9a128970c83ae2e041a113ebbce08c48818..842f19905696727b82fb722b1540f67104fd683a 100644 --- a/val/include/val_powercap.h +++ b/val/include/val_powercap.h @@ -105,7 +105,7 @@ uint32_t powercap_invalid_data_set_pai_value(void); uint32_t powercap_query_domain_name_invalid_domain(void); uint32_t powercap_cap_notification_invalid_query(void); uint32_t powercap_measurement_notification_invalid_query(void); -uint32_t powercap_invalid_data_set_power_cap_value(uint32_t); +uint32_t powercap_invalid_data_set_power_cap_value(uint32_t version); /* Version 2 */ uint32_t powercap_query_domain_attributes_v2(void); diff --git a/val/val_interface.c b/val/val_interface.c index 8162eb85142b73f78b782786f44a004a1460a611..88835df5cd06c8bb30ef3c7924262ac778361706 100644 --- a/val/val_interface.c +++ b/val/val_interface.c @@ -1,5 +1,5 @@ /** @file - * Copyright (c) 2019-2023, Arm Limited or its affiliates. All rights reserved. + * Copyright (c) 2019-2024, Arm Limited or its affiliates. All rights reserved. * SPDX-License-Identifier : Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/val/val_power_domain.c b/val/val_power_domain.c index 84208778daf9e3690eeea0d5c18b05411e4fdab2..ce87e70f86179b8a11667a9424c09fc1ae1303af 100644 --- a/val/val_power_domain.c +++ b/val/val_power_domain.c @@ -48,18 +48,18 @@ uint32_t val_power_domain_execute_tests(void) RUN_TEST(power_domain_invalid_messageid_call()); if (val_protocol_version_relaxed(PROTOCOL_POWER_DOMAIN, version, - POWER_PROTOCOL_VERSION_3) || - (val_protocol_version_relaxed(PROTOCOL_POWER_DOMAIN, version, + POWER_PROTOCOL_VERSION_3) || + (val_protocol_version_relaxed(PROTOCOL_POWER_DOMAIN, version, POWER_PROTOCOL_VERSION_3P1))) { RUN_TEST(power_domain_query_domain_attributes_scmi_v3_1()); RUN_TEST(power_query_ext_domain_name()); RUN_TEST(power_query_ext_domain_name_invalid_domain()); } else if (val_protocol_version_relaxed(PROTOCOL_POWER_DOMAIN, version, - POWER_PROTOCOL_VERSION_2P1)) { + POWER_PROTOCOL_VERSION_2P1)) { RUN_TEST(power_domain_query_domain_attributes_scmi_v3()); } else { - RUN_TEST(power_domain_query_domain_attributes()); - } + RUN_TEST(power_domain_query_domain_attributes()); + } RUN_TEST(power_domain_query_domain_attributes_invalid_doamin()); RUN_TEST(power_domain_set_power_state_check(version));