Skip to content

Commit baaad1a

Browse files
sean-madigananangl
authored andcommitted
[nrf fromlist] dts: nordic: nrf5340: Revert nRF5340 IPC backend to rpmsg
This reverts commit 70419bd. This is because there are issues around slow IPC thoughput with icbmsg, which is causing issues with BLE when lots of data is required to be exchanged, e.g. with ISO. Also there is an assert icmsg.c#L190 which occurs when initializing bluetooth and IPC in certain circumstances. Upstream PR #: 85621 Signed-off-by: Sean Madigan <[email protected]>
1 parent b2af352 commit baaad1a

File tree

6 files changed

+44
-29
lines changed

6 files changed

+44
-29
lines changed

boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_partition_conf.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@
5757
reg = <0x20040000 0x30000>;
5858
};
5959

60-
/* Include default shared RAM configuration file */
61-
#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
60+
/* Include shared RAM configuration file */
61+
#include "bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi"

boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_common.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@
6363
};
6464
};
6565

66-
/* Include default shared RAM configuration file */
67-
#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
66+
/* Include shared RAM configuration file */
67+
#include "bl5340_dvk_nrf5340_shared_sram_planning_conf.dtsi"
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* Copyright (c) 2019 Nordic Semiconductor ASA
3+
* Copyright (c) 2021 Laird Connectivity
4+
*
5+
* SPDX-License-Identifier: Apache-2.0
6+
*/
7+
8+
/* Default shared SRAM planning when building for BL5340 DVK.
9+
* This file is included by both nRF5340 CPUAPP (Application MCU)
10+
* and nRF5340 CPUNET (Network MCU).
11+
* - 64 kB SRAM allocated as Shared memory (sram0_shared)
12+
* - Region defined after the image SRAM of Application MCU
13+
*/
14+
15+
/ {
16+
chosen {
17+
/* shared memory reserved for the inter-processor communication */
18+
zephyr,ipc_shm = &sram0_shared;
19+
};
20+
21+
reserved-memory {
22+
#address-cells = <1>;
23+
#size-cells = <1>;
24+
ranges;
25+
26+
sram0_shared: memory@20070000 {
27+
/* SRAM allocated to shared memory */
28+
reg = <0x20070000 0x10000>;
29+
};
30+
};
31+
};

dts/arm/nordic/nrf5340_cpuapp_ipc.dtsi

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
*/
66

77
ipc0: ipc0 {
8-
compatible = "zephyr,ipc-icbmsg";
9-
status = "okay";
8+
compatible = "zephyr,ipc-openamp-static-vrings";
9+
memory-region = <&sram0_shared>;
1010
mboxes = <&mbox 0>, <&mbox 1>;
1111
mbox-names = "tx", "rx";
12-
tx-region = <&cpuapp_cpunet_ipc_shm>;
13-
rx-region = <&cpunet_cpuapp_ipc_shm>;
14-
tx-blocks = <32>;
15-
rx-blocks = <32>;
12+
role = "host";
13+
status = "okay";
1614

1715
bt_hci_ipc0: bt_hci_ipc0 {
1816
compatible = "zephyr,bt-hci-ipc";

dts/arm/nordic/nrf5340_cpunet.dtsi

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,14 +348,12 @@
348348
/* Default IPC description */
349349
ipc {
350350
ipc0: ipc0 {
351-
compatible = "zephyr,ipc-icbmsg";
352-
status = "okay";
351+
compatible = "zephyr,ipc-openamp-static-vrings";
352+
memory-region = <&sram0_shared>;
353353
mboxes = <&mbox 0>, <&mbox 1>;
354354
mbox-names = "rx", "tx";
355-
tx-region = <&cpunet_cpuapp_ipc_shm>;
356-
rx-region = <&cpuapp_cpunet_ipc_shm>;
357-
tx-blocks = <32>;
358-
rx-blocks = <32>;
355+
role = "remote";
356+
status = "okay";
359357
};
360358
};
361359
};

dts/common/nordic/nrf5340_shared_sram_partition.dtsi

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
* the memory range allocated to the non-secure image (sram0_ns).
1515
*
1616
* By default the last 64 kB of application core SRAM is allocated as shared
17-
* memory (sram0_shared) which is divided in:
18-
* - 32 kB CPUAPP to CPUNET communication (cpuapp_cpunet_ipc_shm)
19-
* - 32 kB CPUNET to CPUAPP communication (cpunet_cpuapp_ipc_shm)
17+
* memory (sram0_shared).
2018
*/
2119

2220
/ {
@@ -30,18 +28,8 @@
3028
ranges;
3129

3230
sram0_shared: memory@20070000 {
33-
#address-cells = <1>;
34-
#size-cells = <1>;
3531
/* Last 64 kB of sram0 */
3632
reg = <0x20070000 0x10000>;
37-
38-
cpuapp_cpunet_ipc_shm: memory@20070000 {
39-
reg = <0x20070000 DT_SIZE_K(32)>;
40-
};
41-
42-
cpunet_cpuapp_ipc_shm: memory@20078000 {
43-
reg = <0x20078000 DT_SIZE_K(32)>;
44-
};
4533
};
4634
};
4735
};

0 commit comments

Comments
 (0)