Skip to content

Commit dab73b7

Browse files
nordic-seglnordic-piks
authored andcommitted
samples: mbox: Fix APP belboard channel on nrf9251dk
Regression after nrfconnect@49a7b3a Bell 18 shall be rang by cpurad. Since, there is no Radio core on nrf9251dk, bell 18 was disabled. MOBX samples and tests were using bell 18 to communicate with PPR core. Fix overlays by using dedicated bell 13 instead. Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
1 parent 21cc4df commit dab73b7

5 files changed

Lines changed: 13 additions & 5 deletions

File tree

samples/zephyr/drivers/mbox/boards/nrf9251dk_nrf9251_cpuapp.overlay

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/ {
77
mbox-consumer {
88
compatible = "vnd,mbox-consumer";
9-
mboxes = <&cpuppr_vevif 15>, <&cpuapp_bellboard 18>;
9+
mboxes = <&cpuppr_vevif 15>, <&cpuapp_bellboard 13>;
1010
mbox-names = "tx", "rx";
1111
};
1212
};

samples/zephyr/drivers/mbox/remote/boards/nrf9251dk_nrf9251_cpuppr.overlay

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/ {
77
mbox-consumer {
88
compatible = "vnd,mbox-consumer";
9-
mboxes = <&cpuppr_vevif 15>, <&cpuapp_bellboard 18>;
9+
mboxes = <&cpuppr_vevif 15>, <&cpuapp_bellboard 13>;
1010
mbox-names = "rx", "tx";
1111
};
1212
};

samples/zephyr/drivers/mbox/sample.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ tests:
7474
ordered: false
7575
regex:
7676
- "Ping \\(on channel 15\\)"
77-
- "Pong \\(on channel 18\\)"
77+
- "Pong \\(on channel 13\\)"
7878

7979
nrf.extended.sample.drivers.mbox.nrf9251_app_flpr:
8080
platform_allow:

tests/zephyr/drivers/mbox/mbox_error_cases/boards/nrf9251dk_nrf9251_cpuapp.overlay

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,22 @@
77
mbox-consumer {
88
compatible = "vnd,mbox-consumer";
99
mboxes = <&cpuppr_vevif 15>, <&cpuppr_vevif 32>,
10-
<&cpuapp_bellboard 18>, <&cpuapp_bellboard 32>;
10+
<&cpuapp_bellboard 13>, <&cpuapp_bellboard 32>;
1111
mbox-names = "remote_valid", "remote_incorrect",
1212
"local_valid", "local_incorrect";
1313
};
1414
};
1515

1616
&cpuapp_bellboard {
1717
status = "okay";
18+
/* The following bells on this bellboard are rang by these cores
19+
* - Bell 0: cpusec
20+
* - Bell 6: cpusys
21+
* - Bell 13: cpuppr
22+
* - Bell 14: cpuflpr
23+
* - Bells 24, 25, 29, 31: cpucell
24+
*/
25+
nordic,interrupt-mapping = <0xa3006041 0>;
1826
};
1927

2028
&cpuppr_vevif {

tests/zephyr/drivers/mbox/mbox_error_cases/boards/nrf9251dk_nrf9251_cpuppr.overlay

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/ {
77
mbox-consumer {
88
compatible = "vnd,mbox-consumer";
9-
mboxes = <&cpuapp_bellboard 18>, <&cpuapp_bellboard 32>,
9+
mboxes = <&cpuapp_bellboard 13>, <&cpuapp_bellboard 32>,
1010
<&cpuppr_vevif 15>, <&cpuppr_vevif 32>;
1111
mbox-names = "remote_valid", "remote_incorrect",
1212
"local_valid", "local_incorrect";

0 commit comments

Comments
 (0)