Support to Bluetooth RPC Host for nRF54H20

CODEOWNERS

@@ -236,6 +236,7 @@ Kconfig*                                  @tejlmand
 /snippets/tfm-enable-share-uart/          @nrfconnect/ncs-cia
 /snippets/nrf70-debug/                    @krish2718 @sachinthegreen
 /snippets/nrf70-fw-patch-ext-flash/       @krish2718 @sachinthegreen
+/snippets/nordic-bt-rpc/                  @ppryga-nordic
 /subsys/audio_module/                     @nrfconnect/ncs-audio
 /subsys/bluetooth/                        @alwa-nordic @jori-nordic @carlescufi @KAGA164
 /subsys/bluetooth/mesh/                   @ludvigsj

samples/bluetooth/peripheral_uart/Kconfig.sysbuild

@@ -8,6 +8,3 @@ source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
 
 config NRF_DEFAULT_IPC_RADIO
 	default y
-
-config NETCORE_IPC_RADIO_BT_HCI_IPC
-	default y

samples/bluetooth/peripheral_uart/sample.yaml

@@ -43,11 +43,13 @@ tests:
   sample.bluetooth.peripheral_uart_ble_rpc:
     sysbuild: true
     build_only: true
-    extra_configs:
-      - CONFIG_BT_RPC_STACK=y
+    extra_args:
+      - SNIPPET=nordic-bt-rpc
+      - FILE_SUFFIX=bt_rpc
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
-    platform_allow: nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
+    platform_allow: nrf5340dk/nrf5340/cpuapp nrf54h20dk/nrf54h20/cpuapp
     tags: bluetooth ci_build sysbuild
   sample.bluetooth.peripheral_uart.security_disabled:
     sysbuild: true

samples/bluetooth/peripheral_uart/sysbuild.conf

@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+SB_CONFIG_NETCORE_IPC_RADIO_BT_HCI_IPC=y

samples/bluetooth/peripheral_uart/sysbuild/ipc_radio/prj.conf

@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
+CONFIG_LOG=n

samples/bluetooth/peripheral_uart/sysbuild/ipc_radio/prj_bt_rpc.conf

@@ -0,0 +1,11 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_BT_DEVICE_NAME="Nordic_UART_Service"
+
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
+CONFIG_LOG=n

samples/bluetooth/peripheral_uart/sysbuild_bt_rpc.conf

@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+SB_CONFIG_NETCORE_IPC_RADIO_BT_RPC=y

snippets/nordic-bt-rpc/README.rst

@@ -0,0 +1,11 @@
+.. _nordic-rpc-host:
+
+Nordic RPC Host snippet (nordic-rpc-host)
+#########################################
+
+Overview
+********
+
+This snippet allows users to build Bluetooth applications with Bluetooth stack running on Radio
+core. The communication between an application and Bluetooth stack is handled over the Bluetooth
+RPC subsystem.

snippets/nordic-bt-rpc/boards/nrf5340dk_nrf5340_cpuapp.conf

@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_BT_RPC_STACK=y

snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20-mem-map-move.dtsi

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+/delete-node/ &cpuppr_code_partition;
+
+&cpuapp_rx_partitions {
+	cpuapp_slot0_partition: partition@a6000 {
+		reg = <0xa6000 DT_SIZE_K(488)>;
+	};
+
+	cpuppr_code_partition: partition@120000 {
+		reg = <0x120000 DT_SIZE_K(64)>;
+	};
+};
+
+/delete-node/ &storage_partition;
+
+&cpuapp_rw_partitions {
+	storage_partition: partition@130000 {
+		reg = <0x130000 DT_SIZE_K(24)>;
+	};
+};
+
+&mram1x {
+	cpurad_rw_partitions: cpurad-rw-partitions {
+		compatible = "nordic,owned-partitions", "fixed-partitions";
+		perm-read;
+		perm-write;
+		perm-secure;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cpurad_storage_partition: partition@136000 {
+			reg = <0x136000 DT_SIZE_K(24)>;
+		};
+	};
+};

snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20_cpuapp.conf

@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_BT_RPC_STACK=y

snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/* Included because partitions must be moved on both cores App and Rad cores to avoid memory
+ * regions overlapping.
+ */
+#include "nrf54h20dk_nrf54h20-mem-map-move.dtsi"

snippets/nordic-bt-rpc/boards/nrf54h20dk_nrf54h20_cpurad.overlay

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/* Included because partitions must be moved on both cores App and Rad cores to avoid memory
+ * regions overlapping.
+ */
+#include "nrf54h20dk_nrf54h20-mem-map-move.dtsi"
+
+&cpurad_rw_partitions {
+	status = "okay";
+};
+
+/ {
+	chosen {
+		zephyr,settings_partition = &cpurad_storage_partition;
+	};
+};

snippets/nordic-bt-rpc/snippet.yml

@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+name: nordic-bt-rpc
+
+boards:
+  nrf54h20dk/nrf54h20/cpurad:
+    append:
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpurad.overlay
+  nrf54h20dk/nrf54h20/cpuapp:
+    append:
+      EXTRA_CONF_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.conf
+      EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+  nrf5340dk/nrf5340/cpuapp:
+    append:
+      EXTRA_CONF_FILE: boards/nrf5340dk_nrf5340_cpuapp.conf

subsys/bluetooth/rpc/client/bt_rpc_gap_client.c

@@ -139,15 +139,11 @@ int bt_enable(bt_ready_cb_t cb)
 
 
 	if (IS_ENABLED(CONFIG_SETTINGS)) {
-		int network_load = 1;
-
-		result = settings_subsys_init();
-		if (result) {
-			return result;
-		}
+		buffer_size_max = 0;
+		NRF_RPC_CBOR_ALLOC(&bt_rpc_grp, ctx, buffer_size_max);
 
-		result = settings_save_one("bt_rpc/network",
-					   &network_load, sizeof(network_load));
+		nrf_rpc_cbor_cmd_no_err(&bt_rpc_grp, BT_SETTINGS_LOAD_RPC_CMD,
+					&ctx, ser_rsp_decode_void, NULL);
 	}
 
 	return result;
@@ -2038,32 +2034,3 @@ void bt_foreach_bond(uint8_t id, void (*func)(const struct bt_bond_info *info,
 				&ctx, ser_rsp_decode_void, NULL);
 }
 #endif /* (defined(CONFIG_BT_CONN) && defined(CONFIG_BT_SMP)) */
-
-static int rpc_settings_set(const char *key, size_t len_rd, settings_read_cb read_cb,
-				    void *cb_arg)
-{
-	struct nrf_rpc_cbor_ctx ctx;
-	size_t buffer_size_max = 0;
-	ssize_t len;
-	const char *next;
-
-	if (!key) {
-		LOG_ERR("Insufficient number of arguments");
-		return -ENOENT;
-	}
-
-	len = settings_name_next(key, &next);
-
-	if (!strncmp(key, "network", len)) {
-		NRF_RPC_CBOR_ALLOC(&bt_rpc_grp, ctx, buffer_size_max);
-
-		nrf_rpc_cbor_cmd_no_err(&bt_rpc_grp, BT_SETTINGS_LOAD_RPC_CMD,
-					&ctx, ser_rsp_decode_void, NULL);
-
-	}
-
-	return 0;
-}
-
-SETTINGS_STATIC_HANDLER_DEFINE(bt_gatt_rpc, "bt_rpc", NULL, rpc_settings_set,
-			       NULL, NULL);

sysbuild/Kconfig.netcore

@@ -54,6 +54,9 @@ config NRF_DEFAULT_EMPTY
 config NRF_DEFAULT_BLUETOOTH
 	bool
 
+config NRF_DEFAULT_RPC_HOST
+	bool
+
 config NRF_DEFAULT_802154
 	bool
 
@@ -66,6 +69,7 @@ config NRF_DEFAULT_IPC_RADIO
 choice NETCORE
 	prompt "Netcore image"
 	default NETCORE_HCI_IPC if NRF_DEFAULT_BLUETOOTH && NETCORE_REMOTE_BOARD_NAME != ""
+	default NETCORE_RPC_HOST if NRF_DEFAULT_RPC_HOST && NETCORE_REMOTE_BOARD_NAME != ""
 	default NETCORE_802154_RPMSG if NRF_DEFAULT_802154 && NETCORE_REMOTE_BOARD_NAME != ""
 	default NETCORE_MULTIPROTOCOL_RPMSG if NRF_DEFAULT_MULTIPROTOCOL && NETCORE_REMOTE_BOARD_NAME != ""
 	default NETCORE_IPC_RADIO if NRF_DEFAULT_IPC_RADIO && NETCORE_REMOTE_BOARD_NAME != ""