diff --git a/product/rdn2/scp_ramfw/CMakeLists.txt b/product/rdn2/scp_ramfw/CMakeLists.txt index f708071e3a0a22e0fe5a55e7689528f4ca7291ce..e09c30a1122e839b28c7369b5432e001368c2c4a 100644 --- a/product/rdn2/scp_ramfw/CMakeLists.txt +++ b/product/rdn2/scp_ramfw/CMakeLists.txt @@ -1,6 +1,6 @@ # # Arm SCP/MCP Software -# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved. +# Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -55,6 +55,10 @@ target_sources( "${CMAKE_CURRENT_SOURCE_DIR}/config_pcie_integ_ctrl.c" "${CMAKE_CURRENT_SOURCE_DIR}/config_apremap.c" "${CMAKE_CURRENT_SOURCE_DIR}/config_scmi_power_domain.c" + "${CMAKE_CURRENT_SOURCE_DIR}/config_psu.c" + "${CMAKE_CURRENT_SOURCE_DIR}/config_mock_psu.c" + "${CMAKE_CURRENT_SOURCE_DIR}/config_dvfs.c" + "${CMAKE_CURRENT_SOURCE_DIR}/config_scmi_perf.c" "${CMAKE_CURRENT_SOURCE_DIR}/../src/config_system_info.c" "${CMAKE_CURRENT_SOURCE_DIR}/../src/config_pl011.c" "${CMAKE_CURRENT_SOURCE_DIR}/../src/config_sid.c") diff --git a/product/rdn2/scp_ramfw/Firmware.cmake b/product/rdn2/scp_ramfw/Firmware.cmake index e54f2349ecb728fbb77bca31659c18c18d3fa594..419cf1223b38a2f2c2881c715470935c14ec7d70 100644 --- a/product/rdn2/scp_ramfw/Firmware.cmake +++ b/product/rdn2/scp_ramfw/Firmware.cmake @@ -24,6 +24,8 @@ set(SCP_ARCHITECTURE "arm-m") set(SCP_ENABLE_NEWLIB_NANO FALSE) +set(SCP_ENABLE_FAST_CHANNELS TRUE) + list(PREPEND SCP_MODULE_PATHS "${CMAKE_CURRENT_LIST_DIR}/../module/platform_system") list(PREPEND SCP_MODULE_PATHS @@ -62,3 +64,7 @@ list(APPEND SCP_MODULES "power-domain") list(APPEND SCP_MODULES "scmi-power-domain") list(APPEND SCP_MODULES "scmi-system-power") list(APPEND SCP_MODULES "platform-system") +list(APPEND SCP_MODULES "psu") +list(APPEND SCP_MODULES "mock-psu") +list(APPEND SCP_MODULES "dvfs") +list(APPEND SCP_MODULES "scmi-perf") diff --git a/product/rdn2/scp_ramfw/config_scmi_perf.c b/product/rdn2/scp_ramfw/config_scmi_perf.c index ca0a9a4d4a463aa5058888e34097b7e3d48cba9a..8d0818187fd77f99521f65f901cc2f2c013f07d8 100644 --- a/product/rdn2/scp_ramfw/config_scmi_perf.c +++ b/product/rdn2/scp_ramfw/config_scmi_perf.c @@ -101,6 +101,7 @@ static const struct mod_scmi_perf_domain_config domains[8] = { 0 }; const struct fwk_module_config config_scmi_perf = { .data = &((struct mod_scmi_perf_config){ .domains = &domains, + .perf_doms_count = FWK_ARRAY_SIZE(domains), #ifdef BUILD_HAS_SCMI_PERF_FAST_CHANNELS .fast_channels_alarm_id = FWK_ID_SUB_ELEMENT_INIT( FWK_MODULE_IDX_TIMER, diff --git a/product/rdv1/scp_ramfw/CMakeLists.txt b/product/rdv1/scp_ramfw/CMakeLists.txt index eee5d9b08538c88fd9f236a041c3bf8dc20fff68..fa6dd49312175b8aba58bfe601e8f2acf37a2084 100755 --- a/product/rdv1/scp_ramfw/CMakeLists.txt +++ b/product/rdv1/scp_ramfw/CMakeLists.txt @@ -1,6 +1,6 @@ # # Arm SCP/MCP Software -# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved. +# Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -37,6 +37,10 @@ target_sources( "config_clock.c" "config_apcontext.c" "config_scmi_power_domain.c" + "config_psu.c" + "config_mock_psu.c" + "config_dvfs.c" + "config_scmi_perf.c" "../src/config_system_info.c" "../src/config_pl011.c" "../src/config_sid.c") diff --git a/product/rdv1/scp_ramfw/Firmware.cmake b/product/rdv1/scp_ramfw/Firmware.cmake index 68e8203b916487f36046b76a6352f882a104be26..94f7d740cd7a9c41916d53115c5f905953d1f967 100755 --- a/product/rdv1/scp_ramfw/Firmware.cmake +++ b/product/rdv1/scp_ramfw/Firmware.cmake @@ -19,6 +19,8 @@ set(SCP_ENABLE_NOTIFICATIONS TRUE) set(SCP_ENABLE_IPO_INIT FALSE) +set(SCP_ENABLE_FAST_CHANNELS TRUE) + list(PREPEND SCP_MODULE_PATHS "${CMAKE_CURRENT_LIST_DIR}/../module/platform_system") @@ -52,3 +54,7 @@ list(APPEND SCP_MODULES "power-domain") list(APPEND SCP_MODULES "scmi-power-domain") list(APPEND SCP_MODULES "scmi-system-power") list(APPEND SCP_MODULES "platform-system") +list(APPEND SCP_MODULES "psu") +list(APPEND SCP_MODULES "mock-psu") +list(APPEND SCP_MODULES "dvfs") +list(APPEND SCP_MODULES "scmi-perf") diff --git a/product/rdv1/scp_ramfw/config_scmi_perf.c b/product/rdv1/scp_ramfw/config_scmi_perf.c index 2c4518b3fdb837f3e677bec2a52629bc6d478305..6308ef366c8e9c5b691163642a554fa8c13e5a33 100644 --- a/product/rdv1/scp_ramfw/config_scmi_perf.c +++ b/product/rdv1/scp_ramfw/config_scmi_perf.c @@ -95,6 +95,7 @@ static const struct mod_scmi_perf_domain_config domains[16] = { 0 }; const struct fwk_module_config config_scmi_perf = { .data = &((struct mod_scmi_perf_config){ .domains = &domains, + .perf_doms_count = FWK_ARRAY_SIZE(domains), #ifdef BUILD_HAS_SCMI_PERF_FAST_CHANNELS .fast_channels_alarm_id = FWK_ID_SUB_ELEMENT_INIT( FWK_MODULE_IDX_TIMER, diff --git a/product/rdv1mc/scp_ramfw/CMakeLists.txt b/product/rdv1mc/scp_ramfw/CMakeLists.txt index 314507707b6f2d134b20131aa5e1142e4d47fa66..ad41099ae684bc7f28d1fa7d5dfc78d5d936d2ca 100755 --- a/product/rdv1mc/scp_ramfw/CMakeLists.txt +++ b/product/rdv1mc/scp_ramfw/CMakeLists.txt @@ -1,6 +1,6 @@ # # Arm SCP/MCP Software -# Copyright (c) 2021, Arm Limited and Contributors. All rights reserved. +# Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -37,6 +37,10 @@ target_sources( "${CMAKE_CURRENT_SOURCE_DIR}/config_css_clock.c" "${CMAKE_CURRENT_SOURCE_DIR}/config_clock.c" "${CMAKE_CURRENT_SOURCE_DIR}/config_apcontext.c" + "${CMAKE_CURRENT_SOURCE_DIR}/config_psu.c" + "${CMAKE_CURRENT_SOURCE_DIR}/config_mock_psu.c" + "${CMAKE_CURRENT_SOURCE_DIR}/config_dvfs.c" + "${CMAKE_CURRENT_SOURCE_DIR}/config_scmi_perf.c" "${CMAKE_CURRENT_SOURCE_DIR}/../src/config_system_info.c" "${CMAKE_CURRENT_SOURCE_DIR}/../src/config_pl011.c" "${CMAKE_CURRENT_SOURCE_DIR}/../src/config_sid.c") diff --git a/product/rdv1mc/scp_ramfw/Firmware.cmake b/product/rdv1mc/scp_ramfw/Firmware.cmake index c0ee89b26defa05d259d8f9e1e4dc99c21675c6a..d49b178ddce5462c176a0b8957775d5bff9d2aab 100755 --- a/product/rdv1mc/scp_ramfw/Firmware.cmake +++ b/product/rdv1mc/scp_ramfw/Firmware.cmake @@ -23,6 +23,8 @@ set(SCP_ENABLE_IPO_INIT FALSE) set(SCP_ARCHITECTURE "arm-m") +set(SCP_ENABLE_FAST_CHANNELS TRUE) + list(PREPEND SCP_MODULE_PATHS "${CMAKE_CURRENT_LIST_DIR}/../module/platform_system") @@ -56,3 +58,7 @@ list(APPEND SCP_MODULES "power-domain") list(APPEND SCP_MODULES "scmi-power-domain") list(APPEND SCP_MODULES "scmi-system-power") list(APPEND SCP_MODULES "platform-system") +list(APPEND SCP_MODULES "psu") +list(APPEND SCP_MODULES "mock-psu") +list(APPEND SCP_MODULES "dvfs") +list(APPEND SCP_MODULES "scmi-perf") diff --git a/product/rdv1mc/scp_ramfw/config_scmi_perf.c b/product/rdv1mc/scp_ramfw/config_scmi_perf.c index eacb13a5194d7312e14a77fddbb2d9f5879061cf..12f88dd6b9881f7b6ebf7aef230fb4b3c74f65dd 100644 --- a/product/rdv1mc/scp_ramfw/config_scmi_perf.c +++ b/product/rdv1mc/scp_ramfw/config_scmi_perf.c @@ -71,6 +71,7 @@ static const struct mod_scmi_perf_domain_config domains[4] = { 0 }; const struct fwk_module_config config_scmi_perf = { .data = &((struct mod_scmi_perf_config){ .domains = &domains, + .perf_doms_count = FWK_ARRAY_SIZE(domains), #ifdef BUILD_HAS_SCMI_PERF_FAST_CHANNELS .fast_channels_alarm_id = FWK_ID_SUB_ELEMENT_INIT( FWK_MODULE_IDX_TIMER,