diff --git a/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_icmsg.overlay b/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_icmsg.overlay index d446a389f227..6269516a4f9e 100644 --- a/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_icmsg.overlay +++ b/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_icmsg.overlay @@ -12,22 +12,10 @@ /delete-property/ zephyr,bt-hci; }; - reserved-memory { - /delete-node/ memory@20070000; - - sram_tx: memory@20070000 { - reg = <0x20070000 0x8000>; - }; - - sram_rx: memory@20078000 { - reg = <0x20078000 0x8000>; - }; - }; - ipc0: ipc0 { compatible = "zephyr,ipc-icmsg"; - tx-region = <&sram_tx>; - rx-region = <&sram_rx>; + tx-region = <&cpuapp_cpunet_ipc_shm>; + rx-region = <&cpunet_cpuapp_ipc_shm>; mboxes = <&mbox 0>, <&mbox 1>; mbox-names = "tx", "rx"; status = "okay"; diff --git a/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_ns_rpmsg.conf similarity index 100% rename from samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp.conf rename to samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_ns_rpmsg.conf diff --git a/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_rpmsg.conf similarity index 100% rename from samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_ns.conf rename to samples/ipc/ipc_service/boards/nrf5340dk_nrf5340_cpuapp_rpmsg.conf diff --git a/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_icmsg.overlay b/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_icmsg.overlay index 57d62e331597..494da6b2f31c 100644 --- a/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_icmsg.overlay +++ b/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_icmsg.overlay @@ -11,22 +11,10 @@ /delete-property/ zephyr,ipc_shm; }; - reserved-memory { - /delete-node/ memory@20070000; - - sram_rx: memory@20070000 { - reg = <0x20070000 0x8000>; - }; - - sram_tx: memory@20078000 { - reg = <0x20078000 0x8000>; - }; - }; - ipc0: ipc0 { compatible = "zephyr,ipc-icmsg"; - tx-region = <&sram_tx>; - rx-region = <&sram_rx>; + tx-region = <&cpunet_cpuapp_ipc_shm>; + rx-region = <&cpuapp_cpunet_ipc_shm>; mboxes = <&mbox 0>, <&mbox 1>; mbox-names = "rx", "tx"; status = "okay"; diff --git a/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_rpmsg.conf similarity index 100% rename from samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet.conf rename to samples/ipc/ipc_service/remote/boards/nrf5340dk_nrf5340_cpunet_rpmsg.conf diff --git a/samples/ipc/ipc_service/sample.yaml b/samples/ipc/ipc_service/sample.yaml index 76da955e44e7..faf3e0adbd9a 100644 --- a/samples/ipc/ipc_service/sample.yaml +++ b/samples/ipc/ipc_service/sample.yaml @@ -21,6 +21,9 @@ tests: - nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp + extra_args: + - FILE_SUFFIX=rpmsg + - SNIPPET=nrf53-legacy-rpmsg sample.ipc.ipc_service.nrf5340dk_rpmsg_cpuapp_sending: platform_allow: - nrf5340dk/nrf5340/cpuapp @@ -28,8 +31,10 @@ tests: - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1 - extra_args: > - remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000 + extra_args: + - FILE_SUFFIX=rpmsg + - remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000 + - SNIPPET=nrf53-legacy-rpmsg sample.ipc.ipc_service.nrf5340dk_rpmsg_cpunet_sending: platform_allow: - nrf5340dk/nrf5340/cpuapp @@ -37,8 +42,10 @@ tests: - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000 - extra_args: > - remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1 + extra_args: + - FILE_SUFFIX=rpmsg + - remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1 + - SNIPPET=nrf53-legacy-rpmsg harness_config: type: multi_line ordered: true @@ -53,8 +60,8 @@ tests: - nrf5340dk/nrf5340/cpuapp integration_platforms: - nrf5340dk/nrf5340/cpuapp - extra_args: > - FILE_SUFFIX=icmsg + extra_args: + - FILE_SUFFIX=icmsg sample.ipc.ipc_service.nrf5340dk_icmsg_cpuapp_sending: platform_allow: - nrf5340dk/nrf5340/cpuapp @@ -62,9 +69,9 @@ tests: - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=35 - extra_args: > - FILE_SUFFIX=icmsg - remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000 + extra_args: + - FILE_SUFFIX=icmsg + - remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000 sample.ipc.ipc_service.nrf5340dk_icmsg_cpunet_sending: platform_allow: - nrf5340dk/nrf5340/cpuapp @@ -72,9 +79,41 @@ tests: - nrf5340dk/nrf5340/cpuapp extra_configs: - CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000 - extra_args: > - FILE_SUFFIX=icmsg - remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1 + extra_args: + - FILE_SUFFIX=icmsg + - remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1 + harness_config: + type: multi_line + ordered: true + regex: + - "IPC-service .* demo started" + # there will be only single tranfser from this core + - "Δpkt: (?!0)\\d+ ((?!0)\\d+ B/pkt) | throughput: (?!0)\\d+ bit/s" + - "Δpkt: \\d+ (\\d+ B/pkt) | throughput: \\d+ bit/s" + - "Δpkt: \\d+ (\\d+ B/pkt) | throughput: \\d+ bit/s" + sample.ipc.ipc_service.nrf5340dk_icbmsg_default: + platform_allow: + - nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + sample.ipc.ipc_service.nrf5340dk_icbmsg_cpuapp_sending: + platform_allow: + - nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + extra_configs: + - CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=35 + extra_args: + - remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000 + sample.ipc.ipc_service.nrf5340dk_icbmsg_cpunet_sending: + platform_allow: + - nrf5340dk/nrf5340/cpuapp + integration_platforms: + - nrf5340dk/nrf5340/cpuapp + extra_configs: + - CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=200000000 + extra_args: + - remote_CONFIG_APP_IPC_SERVICE_SEND_INTERVAL=1 harness_config: type: multi_line ordered: true @@ -94,6 +133,6 @@ tests: - nrf54h20dk/nrf54h20/cpuapp integration_platforms: - nrf54h20dk/nrf54h20/cpuapp - extra_args: > - FILE_SUFFIX=cpuppr - ipc_service_SNIPPET=nordic-ppr + extra_args: + - FILE_SUFFIX=cpuppr + - ipc_service_SNIPPET=nordic-ppr