From 3142907b79aae74d7d02b0c58cf657355ba0eaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20St=C4=99pnicki?= Date: Thu, 27 Nov 2025 12:47:16 +0100 Subject: [PATCH 1/2] [nrf fromtree] tests: drivers: counter: nrf54h20/cpuflpr support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added new target nrf54h20/cpuflpr/xip to counter basic api tests. Only XIP is supported for cpuflpr since RAM memory for this cpu is too small to fit whole counter basic test code and data. Signed-off-by: Łukasz Stępnicki (cherry picked from commit 1cb7671248f578b739480315f505a8c3180a2ac9) --- .../nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml | 1 - ...nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml | 1 + .../nrf54h20dk_nrf54h20_cpuflpr_xip.overlay | 44 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 10 +++++ 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 tests/drivers/counter/counter_basic_api/boards/nrf54h20dk_nrf54h20_cpuflpr_xip.overlay diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml index ff9513fd593b..11a0e7271671 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml @@ -11,7 +11,6 @@ sysbuild: true ram: 46 flash: 46 supported: - - counter - gpio - i2c - pwm diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml index e2880af9be35..39f81211a0b1 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml @@ -12,3 +12,4 @@ ram: 46 flash: 48 supported: - gpio + - counter diff --git a/tests/drivers/counter/counter_basic_api/boards/nrf54h20dk_nrf54h20_cpuflpr_xip.overlay b/tests/drivers/counter/counter_basic_api/boards/nrf54h20dk_nrf54h20_cpuflpr_xip.overlay new file mode 100644 index 000000000000..bc24f669d92d --- /dev/null +++ b/tests/drivers/counter/counter_basic_api/boards/nrf54h20dk_nrf54h20_cpuflpr_xip.overlay @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +#include "nrf54h20dk_nrf54h20_common.dtsi" + +/* FLPR does not have interrupts for slow peripherals. */ +&timer130 { + status = "disabled"; +}; + +&timer131 { + status = "disabled"; +}; + +&timer132 { + status = "disabled"; +}; + +&timer133 { + status = "disabled"; +}; + +&timer134 { + status = "disabled"; +}; + +&timer135 { + status = "disabled"; +}; + +&timer136 { + status = "disabled"; +}; + +&timer137 { + status = "disabled"; +}; + +&rtc130 { + status = "disabled"; +}; + +&rtc131 { + status = "disabled"; +}; diff --git a/tests/drivers/counter/counter_basic_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/counter/counter_basic_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index cf3a4cf12587..71776f1d375c 100644 --- a/tests/drivers/counter/counter_basic_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/drivers/counter/counter_basic_api/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -1,5 +1,15 @@ /* SPDX-License-Identifier: Apache-2.0 */ +&timer120 { + status = "reserved"; + interrupt-parent = <&cpuflpr_clic>; +}; + +&timer121 { + status = "reserved"; + interrupt-parent = <&cpuflpr_clic>; +}; + &timer130 { status = "reserved"; interrupt-parent = <&cpuppr_clic>; From a8810c01e38789d5ce3bf8ddda2e03041fd9208c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20St=C4=99pnicki?= Date: Thu, 27 Nov 2025 11:32:39 +0100 Subject: [PATCH 2/2] [nrf fromtree] tests: arch: common: nrf54h20/cpuflpr needs different isr offset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NRF54H20 cpuflpr and cpuppr do not share common interrupts (VEVIF TASKS) that can be used in this test, so they need to be separated. Signed-off-by: Łukasz Stępnicki (cherry picked from commit c00dd68c9d12a4f62d3cc054f7c4951d948f0610) --- tests/arch/common/gen_isr_table/src/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/arch/common/gen_isr_table/src/main.c b/tests/arch/common/gen_isr_table/src/main.c index ed764e05b4bf..1b28682eb18f 100644 --- a/tests/arch/common/gen_isr_table/src/main.c +++ b/tests/arch/common/gen_isr_table/src/main.c @@ -27,7 +27,8 @@ extern const uintptr_t _irq_vector_table[]; #if defined(CONFIG_NRFX_CLIC) -#if defined(CONFIG_SOC_SERIES_NRF54LX) && defined(CONFIG_RISCV_CORE_NORDIC_VPR) +#if (defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_NRF54H20_CPUFLPR)) && \ + defined(CONFIG_RISCV_CORE_NORDIC_VPR) #define ISR1_OFFSET 16 #define ISR3_OFFSET 17 #define ISR5_OFFSET 18