benchmarks: multicore: idle_pwm_loopback: Remove GD freq changes

Global domain frequency (hsfll120) is no longer managed by drivers.

Test shall not request global domain frequency change.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>

Author: bjarki-andreasen

tests/benchmarks/multicore/idle_pwm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

@@ -58,7 +58,3 @@
 	pinctrl-names = "default", "sleep";
 	memory-regions = <&cpuapp_dma_region>;
 };
-
-&hsfll120 {
-	status = "okay";
-};

tests/benchmarks/multicore/idle_pwm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay

@@ -65,7 +65,3 @@
 &pwm130 {
 	status = "disabled";
 };
-
-&hsfll120 {
-	status = "okay";
-};

tests/benchmarks/multicore/idle_pwm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast_slow_pins.overlay

@@ -89,7 +89,3 @@
 	current-speed = <115200>;
 	/delete-property/ hw-flow-control;
 };
-
-&hsfll120 {
-	status = "okay";
-};

tests/benchmarks/multicore/idle_pwm_loopback/src/main.c

@@ -13,11 +13,6 @@ LOG_MODULE_REGISTER(idle_pwm_loop, LOG_LEVEL_INF);
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/pm/device_runtime.h>
 
-#if defined(CONFIG_CLOCK_CONTROL)
-#include <zephyr/devicetree/clocks.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#endif
-
 #if !DT_NODE_EXISTS(DT_NODELABEL(pwm_to_gpio_loopback))
 #error "Unsupported board: pwm_to_gpio_loopback node is not defined"
 #endif
@@ -42,34 +37,6 @@ static volatile uint32_t high, low;
 static struct k_timer my_timer;
 static bool timer_expired;
 
-
-#if defined(CONFIG_CLOCK_CONTROL)
-const uint32_t freq[] = {320, 256, 128, 64};
-
-/*
- * Set Global Domain frequency (HSFLL120)
- */
-void set_global_domain_frequency(uint32_t freq)
-{
-	int err;
-	int res;
-	struct onoff_client cli;
-	const struct device *hsfll_dev = DEVICE_DT_GET(DT_NODELABEL(hsfll120));
-	const struct nrf_clock_spec clk_spec_global_hsfll = {.frequency = MHZ(freq)};
-
-	printk("Requested frequency [Hz]: %d\n", clk_spec_global_hsfll.frequency);
-	sys_notify_init_spinwait(&cli.notify);
-	err = nrf_clock_control_request(hsfll_dev, &clk_spec_global_hsfll, &cli);
-	__ASSERT((err >= 0 && err < 3), "Wrong nrf_clock_control_request return code");
-	do {
-		err = sys_notify_fetch_result(&cli.notify, &res);
-		k_yield();
-	} while (err == -EAGAIN);
-	__ASSERT(err == 0, "Wrong clock control request return code");
-	__ASSERT(res == 0, "Wrong clock control request response");
-}
-#endif /* CONFIG_CLOCK_CONTROL */
-
 void my_timer_handler(struct k_timer *dummy)
 {
 	timer_expired = true;
@@ -108,10 +75,6 @@ int main(void)
 	/* Wait a bit to solve NRFS request timeout issue. */
 	k_msleep(100);
 
-#if defined(CONFIG_CLOCK_CONTROL)
-	set_global_domain_frequency(CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_MHZ);
-#endif
-
 	/* Set PWM fill ratio to 50% */
 	pulse = pwm_out.period >> 1;
 
@@ -229,10 +192,6 @@ int main(void)
 		}
 		__ASSERT_NO_MSG(ret == 0);
 
-#if defined(CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING)
-			k_busy_wait(100000);
-			set_global_domain_frequency(freq[counter % ARRAY_SIZE(freq)]);
-#endif
 		/* Keep PWM active for ~ 1 second */
 		while (!timer_expired) {
 			/* GPIOTE shall count edges here */

tests/benchmarks/multicore/idle_pwm_loopback/testcase.yaml

@@ -137,94 +137,6 @@ tests:
       pytest_root:
         - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram"
 
-  benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.s2ram_fast.remote_gd_freq_switching:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_pwm_loopback_CONF_FILE=prj_s2ram.conf
-      - idle_pwm_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay"
-      - SB_CONFIG_REMOTE_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram"
-
-  benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.s2ram_fast.gd_freq_320MHz:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_pwm_loopback_CONF_FILE=prj_s2ram.conf
-      - remote_CONF_FILE=prj_s2ram.conf
-      - idle_pwm_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay"
-      - idle_pwm_loopback_CONFIG_CLOCK_CONTROL=y
-      - idle_pwm_loopback_CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_320MHZ=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram_with_clock_control"
-
-  benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.s2ram_fast.gd_freq_256MHz:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_pwm_loopback_CONF_FILE=prj_s2ram.conf
-      - remote_CONF_FILE=prj_s2ram.conf
-      - idle_pwm_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay"
-      - idle_pwm_loopback_CONFIG_CLOCK_CONTROL=y
-      - idle_pwm_loopback_CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_256MHZ=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram_with_clock_control"
-
-  benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.s2ram_fast.gd_freq_128MHz:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_pwm_loopback_CONF_FILE=prj_s2ram.conf
-      - remote_CONF_FILE=prj_s2ram.conf
-      - idle_pwm_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay"
-      - idle_pwm_loopback_CONFIG_CLOCK_CONTROL=y
-      - idle_pwm_loopback_CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_128MHZ=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram_with_clock_control"
-
-  benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.s2ram_fast.gd_freq_64MHz:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_pwm_loopback_CONF_FILE=prj_s2ram.conf
-      - remote_CONF_FILE=prj_s2ram.conf
-      - idle_pwm_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay"
-      - idle_pwm_loopback_CONFIG_CLOCK_CONTROL=y
-      - idle_pwm_loopback_CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_64MHZ=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram_with_clock_control"
-
-  benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.s2ram_fast.gd_freq_switching:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_pwm_loopback_CONF_FILE=prj_s2ram.conf
-      - remote_CONF_FILE=prj_s2ram.conf
-      - idle_pwm_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay"
-      - idle_pwm_loopback_CONFIG_CLOCK_CONTROL=y
-      - CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram_with_clock_control"
-
   benchmarks.multicore.idle_pwm_loopback.nrf54h20dk_cpuapp_cpurad.coverage:
     filter: CONFIG_COVERAGE
     extra_args: