From 8b0954e9a433e03fa7beeb998c6d16a4c6c51cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Fri, 27 Sep 2024 12:07:18 +0200 Subject: [PATCH] tests: multicore: Use power states definition from SOC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of defining power states per test, add power states to the nrf54h20/cpuapp target definition. Remove power states from tests overlays to prevent build failures due to duplicated node definitions. Signed-off-by: Sebastian Głąb --- .../nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay | 25 ------------------- tests/benchmarks/multicore/idle/testcase.yaml | 5 ++-- .../nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay | 17 ------------- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 25 ------------------- west.yml | 2 +- 5 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay delete mode 100644 tests/benchmarks/multicore/idle_with_pwm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay diff --git a/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay b/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay deleted file mode 100644 index c9b5aee2aa9..00000000000 --- a/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - power-states { - idle: idle { - compatible = "zephyr,power-state"; - power-state-name = "suspend-to-idle"; - min-residency-us = <100000>; - }; - - s2ram: s2ram { - compatible = "zephyr,power-state"; - power-state-name = "suspend-to-ram"; - min-residency-us = <800000>; - }; - }; -}; - -&cpu { - cpu-power-states = <&idle &s2ram>; -}; diff --git a/tests/benchmarks/multicore/idle/testcase.yaml b/tests/benchmarks/multicore/idle/testcase.yaml index 6568c6c69b3..d7396e436c4 100644 --- a/tests/benchmarks/multicore/idle/testcase.yaml +++ b/tests/benchmarks/multicore/idle/testcase.yaml @@ -76,7 +76,6 @@ tests: remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n remote_CONFIG_BOOT_BANNER=n remote_CONFIG_NRFS_MRAM_SERVICE_ENABLED=n - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay" harness: pytest harness_config: fixture: ppk_power_measure @@ -98,7 +97,7 @@ tests: remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n remote_CONFIG_BOOT_BANNER=n remote_CONFIG_NRFS_MRAM_SERVICE_ENABLED=n - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay;boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay" + DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay" harness: pytest harness_config: fixture: ppk_power_measure @@ -120,7 +119,7 @@ tests: remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n remote_CONFIG_BOOT_BANNER=n remote_CONFIG_NRFS_MRAM_SERVICE_ENABLED=n - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay;boards/nrf54h20dk_nrf54h20_cpuapp_ram_low_usage.overlay" + DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_ram_low_usage.overlay" harness: pytest harness_config: fixture: ppk_power_measure diff --git a/tests/benchmarks/multicore/idle_gpio/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay b/tests/benchmarks/multicore/idle_gpio/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay index 05e508acb88..1255cbde1ef 100644 --- a/tests/benchmarks/multicore/idle_gpio/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay +++ b/tests/benchmarks/multicore/idle_gpio/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay @@ -5,19 +5,6 @@ */ / { - power-states { - idle: idle { - compatible = "zephyr,power-state"; - power-state-name = "suspend-to-idle"; - min-residency-us = <100000>; - }; - - s2ram: s2ram { - compatible = "zephyr,power-state"; - power-state-name = "suspend-to-ram"; - min-residency-us = <800000>; - }; - }; aliases { /delete-property/ sw1; }; @@ -25,10 +12,6 @@ /delete-node/ &button1; -&cpu { - cpu-power-states = <&idle &s2ram>; -}; - &gpiote130 { status = "okay"; owned-channels = <0>; diff --git a/tests/benchmarks/multicore/idle_with_pwm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_with_pwm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index a1e708928fc..00000000000 --- a/tests/benchmarks/multicore/idle_with_pwm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - power-states { - idle: idle { - compatible = "zephyr,power-state"; - power-state-name = "suspend-to-idle"; - min-residency-us = <100000>; - }; - - s2ram: s2ram { - compatible = "zephyr,power-state"; - power-state-name = "suspend-to-ram"; - min-residency-us = <800000>; - }; - }; -}; - -&cpu { - cpu-power-states = <&idle &s2ram>; -}; diff --git a/west.yml b/west.yml index a269cfee551..b6bd803253f 100644 --- a/west.yml +++ b/west.yml @@ -72,7 +72,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 4322f5169f4c0f24e3712de061a2fec5a29098a7 + revision: pull/2052/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above