diff --git a/doc/connectivity/bluetooth/api/mesh.rst b/doc/connectivity/bluetooth/api/mesh.rst
index f234ff7cedc..358ba3dc62e 100644
--- a/doc/connectivity/bluetooth/api/mesh.rst
+++ b/doc/connectivity/bluetooth/api/mesh.rst
@@ -5,10 +5,7 @@ Bluetooth Mesh Profile
The Bluetooth Mesh profile adds secure wireless multi-hop communication for
Bluetooth Low Energy. This module implements the
-`Bluetooth Mesh Profile Specification v1.0.1 `_.
-
-Implementation of the `Bluetooth Mesh Protocol Specification v1.1 `_
-is in experimental state.
+`Bluetooth Mesh Protocol Specification v1.1 `_.
Read more about Bluetooth Mesh on the
`Bluetooth SIG Website `_.
diff --git a/doc/connectivity/bluetooth/api/mesh/access.rst b/doc/connectivity/bluetooth/api/mesh/access.rst
index cb02028b697..7af8ca7ec68 100644
--- a/doc/connectivity/bluetooth/api/mesh/access.rst
+++ b/doc/connectivity/bluetooth/api/mesh/access.rst
@@ -168,15 +168,6 @@ needs to be stored.
Composition Data
================
-.. note::
-
- The implementation of the Bluetooth Mesh Protocol Specification version 1.1
- is currently in an experimental state. For Bluetooth Mesh Profile Specification
- version 1.0.1, only Composition Data Page 0 is supported. Users that are developing
- for Bluetooth Mesh Profile Specification version 1.0.1 may therefore disregard all
- parts of the following section mentioning the :ref:`bluetooth_mesh_lcd_srv`
- model and Composition Data Pages 1, 2, 128, 129 and 130.
-
The Composition Data provides information about a mesh device.
A device's Composition Data holds information about the elements on the
device, the models that it supports, and other features. The Composition
diff --git a/doc/connectivity/bluetooth/api/mesh/sar_cfg.rst b/doc/connectivity/bluetooth/api/mesh/sar_cfg.rst
index 4f3354945c9..76bd0330a98 100644
--- a/doc/connectivity/bluetooth/api/mesh/sar_cfg.rst
+++ b/doc/connectivity/bluetooth/api/mesh/sar_cfg.rst
@@ -43,36 +43,8 @@ Keep this in mind when defining the size of the buffers.
SAR does not impose extra overhead on the access layer payload per segment.
-Intervals, timers and retransmission counters
-*********************************************
-
-The current stable stack implementation allows you to configure the following SAR behavior.
-
-When sending a segmented message to a unicast address, the unacknowledged segments are repeated
-the :kconfig:option:`CONFIG_BT_MESH_TX_SEG_RETRANS_COUNT` number of times before the transmission
-is considered as failed. The same option configures a number of retransmissions to a group or
-virtual address, but the transmission always succeedes after retransmitting all segments the
-configured number of times.
-
-The timeout between each retransmission to a unicast address is configured by the Kconfig option
-:kconfig:option:`CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_UNICAST`. The timeout between each
-retransmission to a group or a virtual address is configured by the Kconfig option
-:kconfig:option:`CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_GROUP`.
-
-The time before sending a Segment Acknowledgment message is controlled by the Kconfig options
-:kconfig:option:`CONFIG_BT_MESH_SEG_ACK_BASE_TIMEOUT`,
-:kconfig:option:`CONFIG_BT_MESH_SEG_ACK_PER_HOP_TIMEOUT` and
-:kconfig:option:`CONFIG_BT_MESH_SEG_ACK_PER_SEGMENT_TIMEOUT`, and is defined as:
-
-.. math::
- \begin{aligned}
- \max(&\mathtt{CONFIG\_BT\_MESH\_SEG\_ACK\_BASE\_TIMEOUT} \\
- &+ \text{TTL} \times \mathtt{CONFIG\_BT\_MESH\_SEG\_ACK\_PER\_HOP\_TIMEOUT} \\
- &+ \text{number of un-acked segments} \times \mathtt{CONFIG\_BT\_MESH\_SEG\_ACK\_PER\_SEGMENT\_TIMEOUT} , 400)
- \end{aligned}
-
Segmentation and reassembly (SAR) Configuration models
-======================================================
+******************************************************
With Bluetooth Mesh Protocol Specification version 1.1, it became possible to configure SAR
behavior, such as intervals, timers and retransmission counters, over a mesh network using SAR
@@ -139,7 +111,7 @@ of the `SAR Acknowledgment Retransmissions Count`_ state.
.. _bt_mesh_sar_cfg_states:
SAR states
-==========
+**********
There are two states defined related to segmentation and reassembly:
@@ -168,7 +140,7 @@ the following states:
* SAR Receiver Segment Interval Step
SAR Segment Interval Step
--------------------------
+=========================
SAR Segment Interval Step state holds a value that controls the interval between transmissions of
segments of a segmented message. The interval is measured in milliseconds.
@@ -182,7 +154,7 @@ value. Segment transmission interval is then calculated using the following form
SAR Unicast Retransmissions Count
----------------------------------
+=================================
SAR Unicast Retransmissions Count holds a value that defines the maximum number of retransmissions
of a segmented message to a unicast destination. Use the
@@ -190,7 +162,7 @@ of a segmented message to a unicast destination. Use the
value for this state.
SAR Unicast Retransmissions Without Progress Count
---------------------------------------------------
+==================================================
This state holds a value that defines the maximum number of retransmissions of a segmented message
to a unicast address that will be sent if no acknowledgment was received during the timeout, or if
@@ -199,7 +171,7 @@ an acknowledgment with already confirmed segments was received. Use the Kconfig
of retransmissions.
SAR Unicast Retransmissions Interval Step
------------------------------------------
+=========================================
The value of this state controls the interval step used for delaying the retransmissions of
unacknowledged segments of a segmented message to a unicast address. The interval step is measured
@@ -214,7 +186,7 @@ default value. This value is then used to calculate the interval step using the
SAR Unicast Retransmissions Interval Increment
-----------------------------------------------
+==============================================
SAR Unicast Retransmissions Interval Increment holds a value that controls the interval increment
used for delaying the retransmissions of unacknowledged segments of a segmented message to a unicast
@@ -230,7 +202,7 @@ formula:
SAR Multicast Retransmissions Count
------------------------------------
+===================================
The state holds a value that controls the total number of retransmissions of a segmented message to
a multicast address. Use the Kconfig option
@@ -238,7 +210,7 @@ a multicast address. Use the Kconfig option
retransmissions.
SAR Multicast Retransmissions Interval Step
--------------------------------------------
+===========================================
This state holds a value that controls the interval between retransmissions of all segments in a
segmented message to a multicast address. The interval is measured in milliseconds.
@@ -252,7 +224,7 @@ default value that is used to calculate the interval using the following formula
SAR Discard Timeout
--------------------
+===================
The value of this state defines the time in seconds that the lower transport layer waits after
receiving segments of a segmented message before discarding that segmented message. Use the Kconfig
@@ -265,7 +237,7 @@ timeout will be calculated using the following formula:
SAR Acknowledgment Delay Increment
-----------------------------------
+==================================
This state holds a value that controls the delay increment of an interval used for delaying the
transmission of an acknowledgment message after receiving a new segment. The increment is measured
@@ -276,7 +248,7 @@ value. The increment value is calculated to be
:math:`\verb|CONFIG_BT_MESH_SAR_RX_ACK_DELAY_INC| + 1.5`.
SAR Segments Threshold
-----------------------
+======================
SAR Segments Threshold state holds a value that defines a threshold in number of segments of a
segmented message for acknowledgment retransmissions. Use the Kconfig option
@@ -287,7 +259,7 @@ additionally retransmit every acknowledgment message the number of times given b
:kconfig:option:`CONFIG_BT_MESH_SAR_RX_ACK_RETRANS_COUNT`.
SAR Acknowledgment Retransmissions Count
-----------------------------------------
+========================================
The SAR Acknowledgment Retransmissions Count state controls the number of retransmissions of Segment
Acknowledgment messages sent by the lower transport layer. It gives the total number of
@@ -300,7 +272,7 @@ value for this state. The maximum number of transmissions of a Segment Acknowle
:math:`\verb|CONFIG_BT_MESH_SAR_RX_ACK_RETRANS_COUNT| + 1`.
SAR Receiver Segment Interval Step
-----------------------------------
+==================================
The SAR Receiver Segment Interval Step defines the segments reception interval step used for
delaying the transmission of an acknowledgment message after receiving a new segment. The interval
diff --git a/doc/releases/migration-guide-3.6.rst b/doc/releases/migration-guide-3.6.rst
index e5acef50825..53ad073a06b 100644
--- a/doc/releases/migration-guide-3.6.rst
+++ b/doc/releases/migration-guide-3.6.rst
@@ -302,6 +302,25 @@ Bluetooth
* Deprecated :kconfig:option:`CONFIG_BT_MESH_PROV_DEVICE`. This option is
replaced by new option :kconfig:option:`CONFIG_BT_MESH_PROVISIONEE` to
be aligned with Mesh Protocol Specification v1.1, section 5.4. (:github:`64252`)
+ * Removed the ``CONFIG_BT_MESH_V1d1`` Kconfig option.
+ * Removed the ``CONFIG_BT_MESH_TX_SEG_RETRANS_COUNT``,
+ ``CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_UNICAST``,
+ ``CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_GROUP``, ``CONFIG_BT_MESH_SEG_ACK_BASE_TIMEOUT``,
+ ``CONFIG_BT_MESH_SEG_ACK_PER_HOP_TIMEOUT``, ``BT_MESH_SEG_ACK_PER_SEGMENT_TIMEOUT``
+ Kconfig options. They are superseded by the
+ :kconfig:option:`CONFIG_BT_MESH_SAR_TX_SEG_INT_STEP`,
+ :kconfig:option:`CONFIG_BT_MESH_SAR_TX_UNICAST_RETRANS_COUNT`,
+ :kconfig:option:`CONFIG_BT_MESH_SAR_TX_UNICAST_RETRANS_WITHOUT_PROG_COUNT`,
+ :kconfig:option:`CONFIG_BT_MESH_SAR_TX_UNICAST_RETRANS_INT_STEP`,
+ :kconfig:option:`CONFIG_BT_MESH_SAR_TX_UNICAST_RETRANS_INT_INC`,
+ :kconfig:option:`CONFIG_BT_MESH_SAR_TX_MULTICAST_RETRANS_COUNT`,
+ :kconfig:option:`CONFIG_BT_MESH_SAR_TX_MULTICAST_RETRANS_INT`,
+ :kconfig:option:`CONFIG_BT_MESH_SAR_RX_SEG_THRESHOLD`,
+ :kconfig:option:`CONFIG_BT_MESH_SAR_RX_ACK_DELAY_INC`,
+ :kconfig:option:`CONFIG_BT_MESH_SAR_RX_SEG_INT_STEP`,
+ :kconfig:option:`CONFIG_BT_MESH_SAR_RX_DISCARD_TIMEOUT`,
+ :kconfig:option:`CONFIG_BT_MESH_SAR_RX_ACK_RETRANS_COUNT` Kconfig options.
+
LoRaWAN
=======
diff --git a/doc/releases/release-notes-3.6.rst b/doc/releases/release-notes-3.6.rst
index dfc69a17c9f..6fc4b7060d2 100644
--- a/doc/releases/release-notes-3.6.rst
+++ b/doc/releases/release-notes-3.6.rst
@@ -58,6 +58,7 @@ Bluetooth
the transmitted responses on the Access layer.
The functionality is enabled by the :kconfig:option:`CONFIG_BT_MESH_ACCESS_DELAYABLE_MSG`
Kconfig option.
+ * The Bluetooth Mesh Protocol 1.1 is now supported by default.
* Controller
diff --git a/include/zephyr/bluetooth/mesh/main.h b/include/zephyr/bluetooth/mesh/main.h
index a213e8ce22c..1622ccebbd8 100644
--- a/include/zephyr/bluetooth/mesh/main.h
+++ b/include/zephyr/bluetooth/mesh/main.h
@@ -783,7 +783,6 @@ struct bt_mesh_snb {
uint64_t auth_val;
};
-#if defined(CONFIG_BT_MESH_V1d1)
struct bt_mesh_prb {
/** Random */
uint8_t random[13];
@@ -797,7 +796,6 @@ struct bt_mesh_prb {
/** Authentication tag */
uint64_t auth_tag;
};
-#endif
/** Beacon callback functions. */
struct bt_mesh_beacon_cb {
@@ -810,7 +808,6 @@ struct bt_mesh_beacon_cb {
*/
void (*snb_received)(const struct bt_mesh_snb *snb);
-#if defined(CONFIG_BT_MESH_V1d1)
/** @brief Private Beacon received.
*
* This callback notifies the application that Private Beacon
@@ -819,7 +816,6 @@ struct bt_mesh_beacon_cb {
* @param prb Structure describing received Private Beacon
*/
void (*priv_received)(const struct bt_mesh_prb *prb);
-#endif
};
/**
diff --git a/subsys/bluetooth/mesh/CMakeLists.txt b/subsys/bluetooth/mesh/CMakeLists.txt
index 4c597c12a68..c628fb6d9db 100644
--- a/subsys/bluetooth/mesh/CMakeLists.txt
+++ b/subsys/bluetooth/mesh/CMakeLists.txt
@@ -18,14 +18,9 @@ zephyr_library_sources_ifdef(CONFIG_BT_MESH
cfg_srv.c
health_srv.c
va.c
+ transport.c
)
-if (CONFIG_BT_MESH_V1d1)
- zephyr_library_sources(transport.c)
-else()
- zephyr_library_sources(transport_legacy.c)
-endif()
-
zephyr_library_sources_ifdef(CONFIG_BT_MESH_ADV_LEGACY adv_legacy.c)
zephyr_library_sources_ifdef(CONFIG_BT_MESH_ADV_EXT adv_ext.c)
diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 50d7ca3fb83..5f59e7f9be8 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -512,56 +512,6 @@ config BT_MESH_TX_SEG_MAX
which leaves 56 bytes for application layer data using a
4-byte MIC and 52 bytes using an 8-byte MIC.
-if !BT_MESH_V1d1
-
-config BT_MESH_TX_SEG_RETRANS_COUNT
- int "Transport message segment retransmit attempts"
- default 4
- range 1 8
- help
- Maximum number of transport message segment retransmit attempts
- for outgoing segment message.
-
-config BT_MESH_TX_SEG_RETRANS_TIMEOUT_UNICAST
- int "Transport message segment retransmit interval for unicast messages"
- default 400
- range 200 500
- help
- Maximum time of retransmit segment message to unicast address.
-
-config BT_MESH_TX_SEG_RETRANS_TIMEOUT_GROUP
- int "Transport message segment retransmit interval for group messages"
- default 50
- range 20 200
- help
- Maximum time of retransmit segment message to group address.
-
-config BT_MESH_SEG_ACK_BASE_TIMEOUT
- int "SegAck transmission base timeout"
- default 150
- range 150 400
- help
- Defines a base timeout for the acknowledgment timer used to delay
- transmission of the Segmented Acknowledgment message.
-
-config BT_MESH_SEG_ACK_PER_HOP_TIMEOUT
- int "SegAck transmission timeout per hop"
- default 50
- range 50 250
- help
- Defines an additional per-hop timeout for the acknowledgment timer
- used to delay transmission of the Segmented Acknowledgment message.
-
-config BT_MESH_SEG_ACK_PER_SEGMENT_TIMEOUT
- int "SegAck transmission timeout per segment not yet received"
- default 0
- range 0 100
- help
- Defines an additional timeout for the acknowledgment timer for every
- segment not yet received.
-
-endif # !BT_MESH_V1d1
-
endmenu # Transport SAR configuration
config BT_MESH_DEFAULT_TTL
@@ -1112,21 +1062,13 @@ config BT_MESH_FRIEND_ADV_LATENCY
endif # BT_MESH_FRIEND
-menuconfig BT_MESH_V1d1
- bool "Bluetooth Mesh v1.1 support"
- help
- This option enables Bluetooth Mesh v1.1 support. Bluetooth Mesh v1.1
- is backward compatible with v1.0.1.
-
config BT_MESH_ECDH_P256_CMAC_AES128_AES_CCM
- bool "Support CMAC AES128 for OOB authentication" if BT_MESH_V1d1
+ bool "Support CMAC AES128 for OOB authentication"
depends on BT_MESH_PROV
default y
help
Enable this option to support CMAC AES128 for OOB authentication.
-if BT_MESH_V1d1
-
config BT_MESH_ECDH_P256_HMAC_SHA256_AES_CCM
bool "Support HMAC SHA256 for OOB authentication"
depends on BT_MESH_PROV
@@ -1696,8 +1638,6 @@ config BT_MESH_SAR_RX_ACK_RETRANS_COUNT
endmenu
-endif # BT_MESH_V1d1
-
menu "Capabilities"
config BT_MESH_SUBNET_COUNT
diff --git a/subsys/bluetooth/mesh/access.c b/subsys/bluetooth/mesh/access.c
index 23fbb8e82c2..4ff80333187 100644
--- a/subsys/bluetooth/mesh/access.c
+++ b/subsys/bluetooth/mesh/access.c
@@ -2380,7 +2380,6 @@ size_t bt_mesh_comp_page_size(uint8_t page)
int bt_mesh_comp_store(void)
{
-#if IS_ENABLED(CONFIG_BT_MESH_V1d1)
NET_BUF_SIMPLE_DEFINE(buf, CONFIG_BT_MESH_COMP_PST_BUF_SIZE);
int err;
@@ -2410,7 +2409,7 @@ int bt_mesh_comp_store(void)
LOG_DBG("Stored CDP%d", comp_data_pages[i].page);
}
-#endif
+
return 0;
}
diff --git a/subsys/bluetooth/mesh/beacon.c b/subsys/bluetooth/mesh/beacon.c
index ef337f9f510..6eb2c9be3a7 100644
--- a/subsys/bluetooth/mesh/beacon.c
+++ b/subsys/bluetooth/mesh/beacon.c
@@ -528,7 +528,6 @@ static bool secure_beacon_authenticate(struct bt_mesh_subnet *sub, void *cb_data
return false;
}
-#if defined(CONFIG_BT_MESH_V1d1)
static bool priv_beacon_decrypt(struct bt_mesh_subnet *sub, void *cb_data)
{
struct beacon_params *params = cb_data;
@@ -567,7 +566,6 @@ static bool priv_beacon_decrypt(struct bt_mesh_subnet *sub, void *cb_data)
return false;
}
-#endif
static void net_beacon_register(struct bt_mesh_beacon *beacon, bool priv)
{
@@ -658,7 +656,6 @@ static void secure_beacon_recv(struct net_buf_simple *buf)
net_beacon_resolve(¶ms, secure_beacon_authenticate);
}
-#if defined(CONFIG_BT_MESH_V1d1)
static void private_beacon_recv(struct net_buf_simple *buf)
{
struct beacon_params params;
@@ -675,7 +672,6 @@ static void private_beacon_recv(struct net_buf_simple *buf)
net_beacon_resolve(¶ms, priv_beacon_decrypt);
}
-#endif
void bt_mesh_beacon_recv(struct net_buf_simple *buf)
{
@@ -699,9 +695,7 @@ void bt_mesh_beacon_recv(struct net_buf_simple *buf)
secure_beacon_recv(buf);
break;
case BEACON_TYPE_PRIVATE:
-#if defined(CONFIG_BT_MESH_V1d1)
private_beacon_recv(buf);
-#endif
break;
default:
LOG_WRN("Unknown beacon type 0x%02x", type);
diff --git a/subsys/bluetooth/mesh/net.c b/subsys/bluetooth/mesh/net.c
index 943a5e83c23..07c6f1aa18a 100644
--- a/subsys/bluetooth/mesh/net.c
+++ b/subsys/bluetooth/mesh/net.c
@@ -35,10 +35,7 @@
#include "prov.h"
#include "cfg.h"
#include "statistic.h"
-
-#ifdef CONFIG_BT_MESH_V1d1
#include "sar_cfg_internal.h"
-#endif
#define LOG_LEVEL CONFIG_BT_MESH_NET_LOG_LEVEL
#include
@@ -84,10 +81,8 @@ static uint16_t msg_cache_next;
/* Singleton network context (the implementation only supports one) */
struct bt_mesh_net bt_mesh = {
.local_queue = SYS_SLIST_STATIC_INIT(&bt_mesh.local_queue),
-#ifdef CONFIG_BT_MESH_V1d1
.sar_tx = BT_MESH_SAR_TX_INIT,
.sar_rx = BT_MESH_SAR_RX_INIT,
-#endif
#if defined(CONFIG_BT_MESH_PRIV_BEACONS)
.priv_beacon_int = 0x3c,
diff --git a/subsys/bluetooth/mesh/subnet.h b/subsys/bluetooth/mesh/subnet.h
index f19b1d2abea..e04f9855b66 100644
--- a/subsys/bluetooth/mesh/subnet.h
+++ b/subsys/bluetooth/mesh/subnet.h
@@ -76,9 +76,7 @@ struct bt_mesh_subnet {
struct bt_mesh_key identity; /* IdentityKey */
#endif
struct bt_mesh_key beacon; /* BeaconKey */
-#if defined(CONFIG_BT_MESH_V1d1)
struct bt_mesh_key priv_beacon; /* PrivateBeaconKey */
-#endif
} keys[2];
#if defined(CONFIG_BT_MESH_PROXY_SOLICITATION)
bool sol_tx;
diff --git a/subsys/bluetooth/mesh/transport_legacy.c b/subsys/bluetooth/mesh/transport_legacy.c
deleted file mode 100644
index 1a826db4ac4..00000000000
--- a/subsys/bluetooth/mesh/transport_legacy.c
+++ /dev/null
@@ -1,1656 +0,0 @@
-/*
- * Copyright (c) 2017 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-#include
-#include
-
-#include "common/bt_str.h"
-
-#include "host/testing.h"
-
-#include "crypto.h"
-#include "mesh.h"
-#include "net.h"
-#include "app_keys.h"
-#include "lpn.h"
-#include "rpl.h"
-#include "friend.h"
-#include "access.h"
-#include "foundation.h"
-#include "settings.h"
-#include "heartbeat.h"
-#include "transport.h"
-#include "va.h"
-
-#define LOG_LEVEL CONFIG_BT_MESH_TRANS_LOG_LEVEL
-#include
-LOG_MODULE_REGISTER(bt_mesh_transport);
-
-#define AID_MASK ((uint8_t)(BIT_MASK(6)))
-
-#define SEG(data) ((data)[0] >> 7)
-#define AKF(data) (((data)[0] >> 6) & 0x01)
-#define AID(data) ((data)[0] & AID_MASK)
-#define ASZMIC(data) (((data)[1] >> 7) & 1)
-
-#define APP_MIC_LEN(aszmic) ((aszmic) ? BT_MESH_MIC_LONG : BT_MESH_MIC_SHORT)
-
-#define UNSEG_HDR(akf, aid) ((akf << 6) | (aid & AID_MASK))
-#define SEG_HDR(akf, aid) (UNSEG_HDR(akf, aid) | 0x80)
-
-#define BLOCK_COMPLETE(seg_n) (uint32_t)(((uint64_t)1 << (seg_n + 1)) - 1)
-
-#define SEQ_AUTH(iv_index, seq) (((uint64_t)iv_index) << 24 | (uint64_t)seq)
-
-/* Number of retransmit attempts (after the initial transmit) per segment */
-#define SEG_RETRANSMIT_ATTEMPTS CONFIG_BT_MESH_TX_SEG_RETRANS_COUNT
-
-/* "This timer shall be set to a minimum of 200 + 50 * TTL milliseconds.".
- * We use 400 since 300 is a common send duration for standard HCI, and we
- * need to have a timeout that's bigger than that.
- */
-#define SEG_RETRANSMIT_TIMEOUT_UNICAST(tx) \
- (CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_UNICAST + 50 * (tx)->ttl)
-
-/* When sending to a group, the messages are not acknowledged, and there's no
- * reason to delay the repetitions significantly. Delaying by more than 0 ms
- * to avoid flooding the network.
- */
-#define SEG_RETRANSMIT_TIMEOUT_GROUP CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_GROUP
-
-#define SEG_RETRANSMIT_TIMEOUT(tx) \
- (BT_MESH_ADDR_IS_UNICAST(tx->dst) ? \
- SEG_RETRANSMIT_TIMEOUT_UNICAST(tx) : \
- SEG_RETRANSMIT_TIMEOUT_GROUP)
-/* How long to wait for available buffers before giving up */
-#define BUF_TIMEOUT K_NO_WAIT
-
-static struct seg_tx {
- struct bt_mesh_subnet *sub;
- void *seg[BT_MESH_TX_SEG_MAX];
- uint64_t seq_auth;
- uint16_t src;
- uint16_t dst;
- uint16_t ack_src;
- uint16_t len;
- uint8_t hdr;
- uint8_t xmit;
- uint8_t seg_n; /* Last segment index */
- uint8_t seg_o; /* Segment being sent */
- uint8_t nack_count; /* Number of unacked segs */
- uint8_t attempts; /* Remaining tx attempts */
- uint8_t ttl; /* Transmitted TTL value */
- uint8_t blocked:1, /* Blocked by ongoing tx */
- ctl:1, /* Control packet */
- aszmic:1, /* MIC size */
- started:1, /* Start cb called */
- friend_cred:1, /* Using Friend credentials */
- seg_send_started:1; /* Used to check if seg_send_start cb is called */
- const struct bt_mesh_send_cb *cb;
- void *cb_data;
- struct k_work_delayable retransmit; /* Retransmit timer */
-} seg_tx[CONFIG_BT_MESH_TX_SEG_MSG_COUNT];
-
-static struct seg_rx {
- struct bt_mesh_subnet *sub;
- void *seg[BT_MESH_RX_SEG_MAX];
- uint64_t seq_auth;
- uint16_t src;
- uint16_t dst;
- uint16_t len;
- uint8_t hdr;
- uint8_t seg_n:5,
- ctl:1,
- in_use:1,
- obo:1;
- uint8_t ttl;
- uint32_t block;
- uint32_t last;
- struct k_work_delayable ack;
-} seg_rx[CONFIG_BT_MESH_RX_SEG_MSG_COUNT];
-
-K_MEM_SLAB_DEFINE(segs, BT_MESH_APP_SEG_SDU_MAX, CONFIG_BT_MESH_SEG_BUFS, 4);
-
-static int send_unseg(struct bt_mesh_net_tx *tx, struct net_buf_simple *sdu,
- const struct bt_mesh_send_cb *cb, void *cb_data,
- const uint8_t *ctl_op)
-{
- struct bt_mesh_adv *adv;
-
- adv = bt_mesh_adv_create(BT_MESH_ADV_DATA, BT_MESH_ADV_TAG_LOCAL,
- tx->xmit, BUF_TIMEOUT);
- if (!adv) {
- LOG_ERR("Out of network advs");
- return -ENOBUFS;
- }
-
- net_buf_simple_reserve(&adv->b, BT_MESH_NET_HDR_LEN);
-
- if (ctl_op) {
- net_buf_simple_add_u8(&adv->b, TRANS_CTL_HDR(*ctl_op, 0));
- } else if (BT_MESH_IS_DEV_KEY(tx->ctx->app_idx)) {
- net_buf_simple_add_u8(&adv->b, UNSEG_HDR(0, 0));
- } else {
- net_buf_simple_add_u8(&adv->b, UNSEG_HDR(1, tx->aid));
- }
-
- net_buf_simple_add_mem(&adv->b, sdu->data, sdu->len);
-
- if (IS_ENABLED(CONFIG_BT_MESH_FRIEND)) {
- if (!bt_mesh_friend_queue_has_space(tx->sub->net_idx,
- tx->src, tx->ctx->addr,
- NULL, 1)) {
- if (BT_MESH_ADDR_IS_UNICAST(tx->ctx->addr)) {
- LOG_ERR("Not enough space in Friend Queue");
- bt_mesh_adv_unref(adv);
- return -ENOBUFS;
- }
-
- LOG_WRN("No space in Friend Queue");
- goto send;
- }
-
- if (bt_mesh_friend_enqueue_tx(tx, BT_MESH_FRIEND_PDU_SINGLE,
- NULL, 1, &adv->b) &&
- BT_MESH_ADDR_IS_UNICAST(tx->ctx->addr)) {
- /* PDUs for a specific Friend should only go
- * out through the Friend Queue.
- */
- bt_mesh_adv_unref(adv);
- send_cb_finalize(cb, cb_data);
- return 0;
- }
- }
-
-send:
- return bt_mesh_net_send(tx, adv, cb, cb_data);
-}
-
-static inline uint8_t seg_len(bool ctl)
-{
- if (ctl) {
- return BT_MESH_CTL_SEG_SDU_MAX;
- } else {
- return BT_MESH_APP_SEG_SDU_MAX;
- }
-}
-
-bool bt_mesh_tx_in_progress(void)
-{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(seg_tx); i++) {
- if (seg_tx[i].nack_count) {
- return true;
- }
- }
-
- return false;
-}
-
-static void seg_tx_done(struct seg_tx *tx, uint8_t seg_idx)
-{
- k_mem_slab_free(&segs, (void *)tx->seg[seg_idx]);
- tx->seg[seg_idx] = NULL;
- tx->nack_count--;
-}
-
-static bool seg_tx_blocks(struct seg_tx *tx, uint16_t src, uint16_t dst)
-{
- return (tx->src == src) && (tx->dst == dst);
-}
-
-static void seg_tx_unblock_check(struct seg_tx *tx)
-{
- struct seg_tx *blocked = NULL;
- int i;
-
- /* Unblock the first blocked tx with the same params. */
- for (i = 0; i < ARRAY_SIZE(seg_tx); ++i) {
- if (&seg_tx[i] != tx &&
- seg_tx[i].blocked &&
- seg_tx_blocks(tx, seg_tx[i].src, seg_tx[i].dst) &&
- (!blocked || seg_tx[i].seq_auth < blocked->seq_auth)) {
- blocked = &seg_tx[i];
- }
- }
-
- if (blocked) {
- LOG_DBG("Unblocked 0x%04x", (uint16_t)(blocked->seq_auth & TRANS_SEQ_ZERO_MASK));
- blocked->blocked = false;
- k_work_reschedule(&blocked->retransmit, K_NO_WAIT);
- }
-}
-
-static void seg_tx_reset(struct seg_tx *tx)
-{
- int i;
-
- /* If this call fails, the handler will exit early, as nack_count is 0. */
- (void)k_work_cancel_delayable(&tx->retransmit);
-
- tx->cb = NULL;
- tx->cb_data = NULL;
- tx->seq_auth = 0U;
- tx->sub = NULL;
- tx->src = BT_MESH_ADDR_UNASSIGNED;
- tx->dst = BT_MESH_ADDR_UNASSIGNED;
- tx->ack_src = BT_MESH_ADDR_UNASSIGNED;
- tx->blocked = false;
-
- for (i = 0; i <= tx->seg_n && tx->nack_count; i++) {
- if (!tx->seg[i]) {
- continue;
- }
-
- seg_tx_done(tx, i);
- }
-
- tx->nack_count = 0;
- tx->seg_send_started = 0;
-
- if (atomic_test_and_clear_bit(bt_mesh.flags, BT_MESH_IVU_PENDING)) {
- LOG_DBG("Proceeding with pending IV Update");
- /* bt_mesh_net_iv_update() will re-enable the flag if this
- * wasn't the only transfer.
- */
- bt_mesh_net_iv_update(bt_mesh.iv_index, false);
- }
-}
-
-static inline void seg_tx_complete(struct seg_tx *tx, int err)
-{
- const struct bt_mesh_send_cb *cb = tx->cb;
- void *cb_data = tx->cb_data;
-
- seg_tx_unblock_check(tx);
-
- seg_tx_reset(tx);
-
- if (cb && cb->end) {
- cb->end(err, cb_data);
- }
-}
-
-static void schedule_retransmit(struct seg_tx *tx)
-{
- if (!tx->nack_count) {
- return;
- }
-
- LOG_DBG("");
-
- /* If we haven't gone through all the segments for this attempt yet,
- * (likely because of a buffer allocation failure or because we
- * called this from inside bt_mesh_net_send), we should continue the
- * retransmit immediately, as we just freed up a tx buffer.
- */
- k_work_reschedule(&tx->retransmit, K_NO_WAIT);
-}
-
-static void seg_send_start(uint16_t duration, int err, void *user_data)
-{
- struct seg_tx *tx = user_data;
-
- if (!tx->started && tx->cb && tx->cb->start) {
- tx->cb->start(duration, err, tx->cb_data);
- tx->started = 1U;
- }
-
- tx->seg_send_started = 1U;
-
- /* If there's an error in transmitting the 'sent' callback will never
- * be called. Make sure that we kick the retransmit timer also in this
- * case since otherwise we risk the transmission of becoming stale.
- */
- if (err) {
- schedule_retransmit(tx);
- }
-}
-
-static void seg_sent(int err, void *user_data)
-{
- struct seg_tx *tx = user_data;
-
- if (!tx->seg_send_started) {
- return;
- }
-
- schedule_retransmit(tx);
-}
-
-static const struct bt_mesh_send_cb seg_sent_cb = {
- .start = seg_send_start,
- .end = seg_sent,
-};
-
-static void seg_tx_buf_build(struct seg_tx *tx, uint8_t seg_o,
- struct net_buf_simple *buf)
-{
- uint16_t seq_zero = tx->seq_auth & TRANS_SEQ_ZERO_MASK;
- uint8_t len = MIN(seg_len(tx->ctl), tx->len - (seg_len(tx->ctl) * seg_o));
-
- net_buf_simple_add_u8(buf, tx->hdr);
- net_buf_simple_add_u8(buf, (tx->aszmic << 7) | seq_zero >> 6);
- net_buf_simple_add_u8(buf, (((seq_zero & 0x3f) << 2) | (seg_o >> 3)));
- net_buf_simple_add_u8(buf, ((seg_o & 0x07) << 5) | tx->seg_n);
- net_buf_simple_add_mem(buf, tx->seg[seg_o], len);
-}
-
-static void seg_tx_send_unacked(struct seg_tx *tx)
-{
- if (!tx->nack_count) {
- return;
- }
-
- struct bt_mesh_msg_ctx ctx = {
- .net_idx = tx->sub->net_idx,
- /* App idx only used by network to detect control messages: */
- .app_idx = (tx->ctl ? BT_MESH_KEY_UNUSED : 0),
- .addr = tx->dst,
- .send_rel = true,
- .send_ttl = tx->ttl,
- };
- struct bt_mesh_net_tx net_tx = {
- .sub = tx->sub,
- .ctx = &ctx,
- .src = tx->src,
- .xmit = tx->xmit,
- .friend_cred = tx->friend_cred,
- .aid = tx->hdr & AID_MASK,
- };
-
- if (!tx->attempts) {
- if (BT_MESH_ADDR_IS_UNICAST(tx->dst)) {
- LOG_ERR("Ran out of retransmit attempts");
- seg_tx_complete(tx, -ETIMEDOUT);
- } else {
- /* Segmented sending to groups doesn't have acks, so
- * running out of attempts is the expected behavior.
- */
- seg_tx_complete(tx, 0);
- }
-
- return;
- }
-
- LOG_DBG("SeqZero: 0x%04x Attempts: %u", (uint16_t)(tx->seq_auth & TRANS_SEQ_ZERO_MASK),
- tx->attempts);
-
- while (tx->seg_o <= tx->seg_n) {
- struct bt_mesh_adv *seg;
- int err;
-
- if (!tx->seg[tx->seg_o]) {
- /* Move on to the next segment */
- tx->seg_o++;
- continue;
- }
-
- seg = bt_mesh_adv_create(BT_MESH_ADV_DATA, BT_MESH_ADV_TAG_LOCAL,
- tx->xmit, BUF_TIMEOUT);
- if (!seg) {
- LOG_DBG("Allocating segment failed");
- goto end;
- }
-
- net_buf_simple_reserve(&seg->b, BT_MESH_NET_HDR_LEN);
- seg_tx_buf_build(tx, tx->seg_o, &seg->b);
-
- LOG_DBG("Sending %u/%u", tx->seg_o, tx->seg_n);
-
- err = bt_mesh_net_send(&net_tx, seg, &seg_sent_cb, tx);
- if (err) {
- LOG_DBG("Sending segment failed");
- goto end;
- }
-
- /* Move on to the next segment */
- tx->seg_o++;
-
- return;
- }
-
- tx->seg_o = 0U;
- tx->attempts--;
-
-end:
- if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER) &&
- bt_mesh_lpn_established() && !bt_mesh_has_addr(ctx.addr)) {
- bt_mesh_lpn_poll();
- }
-
- k_work_reschedule(&tx->retransmit, K_MSEC(SEG_RETRANSMIT_TIMEOUT(tx)));
-}
-
-static void seg_retransmit(struct k_work *work)
-{
- struct k_work_delayable *dwork = k_work_delayable_from_work(work);
- struct seg_tx *tx = CONTAINER_OF(dwork, struct seg_tx, retransmit);
-
- seg_tx_send_unacked(tx);
-}
-
-static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
- const struct bt_mesh_send_cb *cb, void *cb_data,
- uint8_t *ctl_op)
-{
- bool blocked = false;
- struct seg_tx *tx;
- uint8_t seg_o;
- int i;
-
- LOG_DBG("src 0x%04x dst 0x%04x app_idx 0x%04x aszmic %u sdu_len %u", net_tx->src,
- net_tx->ctx->addr, net_tx->ctx->app_idx, net_tx->aszmic, sdu->len);
-
- for (tx = NULL, i = 0; i < ARRAY_SIZE(seg_tx); i++) {
- if (seg_tx[i].nack_count) {
- blocked |= seg_tx_blocks(&seg_tx[i], net_tx->src,
- net_tx->ctx->addr);
- } else if (!tx) {
- tx = &seg_tx[i];
- }
- }
-
- if (!tx) {
- LOG_ERR("No multi-segment message contexts available");
- return -EBUSY;
- }
-
- if (ctl_op) {
- tx->hdr = TRANS_CTL_HDR(*ctl_op, 1);
- } else if (BT_MESH_IS_DEV_KEY(net_tx->ctx->app_idx)) {
- tx->hdr = SEG_HDR(0, 0);
- } else {
- tx->hdr = SEG_HDR(1, net_tx->aid);
- }
-
- tx->src = net_tx->src;
- tx->dst = net_tx->ctx->addr;
- tx->seg_n = (sdu->len - 1) / seg_len(!!ctl_op);
- tx->seg_o = 0;
- tx->len = sdu->len;
- tx->nack_count = tx->seg_n + 1;
- tx->seq_auth = SEQ_AUTH(BT_MESH_NET_IVI_TX, bt_mesh.seq);
- tx->sub = net_tx->sub;
- tx->cb = cb;
- tx->cb_data = cb_data;
- tx->attempts = SEG_RETRANSMIT_ATTEMPTS;
- tx->xmit = net_tx->xmit;
- tx->aszmic = net_tx->aszmic;
- tx->friend_cred = net_tx->friend_cred;
- tx->blocked = blocked;
- tx->started = 0;
- tx->seg_send_started = 0;
- tx->ctl = !!ctl_op;
- tx->ttl = net_tx->ctx->send_ttl;
-
- LOG_DBG("SeqZero 0x%04x (segs: %u)", (uint16_t)(tx->seq_auth & TRANS_SEQ_ZERO_MASK),
- tx->nack_count);
-
- if (IS_ENABLED(CONFIG_BT_MESH_FRIEND) &&
- !bt_mesh_friend_queue_has_space(tx->sub->net_idx, net_tx->src,
- tx->dst, &tx->seq_auth,
- tx->seg_n + 1) &&
- BT_MESH_ADDR_IS_UNICAST(tx->dst)) {
- LOG_ERR("Not enough space in Friend Queue for %u segments", tx->seg_n + 1);
- seg_tx_reset(tx);
- return -ENOBUFS;
- }
-
- for (seg_o = 0U; sdu->len; seg_o++) {
- void *buf;
- uint16_t len;
- int err;
-
- err = k_mem_slab_alloc(&segs, &buf, BUF_TIMEOUT);
- if (err) {
- LOG_ERR("Out of segment buffers");
- seg_tx_reset(tx);
- return -ENOBUFS;
- }
-
- len = MIN(sdu->len, seg_len(!!ctl_op));
- memcpy(buf, net_buf_simple_pull_mem(sdu, len), len);
-
- LOG_DBG("seg %u: %s", seg_o, bt_hex(buf, len));
-
- tx->seg[seg_o] = buf;
-
- if (IS_ENABLED(CONFIG_BT_MESH_FRIEND)) {
- enum bt_mesh_friend_pdu_type type;
-
- NET_BUF_SIMPLE_DEFINE(seg, 16);
- seg_tx_buf_build(tx, seg_o, &seg);
-
- if (seg_o == tx->seg_n) {
- type = BT_MESH_FRIEND_PDU_COMPLETE;
- } else {
- type = BT_MESH_FRIEND_PDU_PARTIAL;
- }
-
- if (bt_mesh_friend_enqueue_tx(
- net_tx, type, ctl_op ? NULL : &tx->seq_auth,
- tx->seg_n + 1, &seg) &&
- BT_MESH_ADDR_IS_UNICAST(net_tx->ctx->addr)) {
- /* PDUs for a specific Friend should only go
- * out through the Friend Queue.
- */
- k_mem_slab_free(&segs, buf);
- tx->seg[seg_o] = NULL;
- }
-
- }
-
- }
-
- /* This can happen if segments only went into the Friend Queue */
- if (IS_ENABLED(CONFIG_BT_MESH_FRIEND) && !tx->seg[0]) {
- seg_tx_reset(tx);
-
- /* If there was a callback notify sending immediately since
- * there's no other way to track this (at least currently)
- * with the Friend Queue.
- */
- send_cb_finalize(cb, cb_data);
- return 0;
- }
-
- if (blocked) {
- /* Move the sequence number, so we don't end up creating
- * another segmented transmission with the same SeqZero while
- * this one is blocked.
- */
- bt_mesh_next_seq();
- LOG_DBG("Blocked.");
- return 0;
- }
-
- seg_tx_send_unacked(tx);
-
- return 0;
-}
-
-static int trans_encrypt(const struct bt_mesh_net_tx *tx, const struct bt_mesh_key *key,
- struct net_buf_simple *msg)
-{
- struct bt_mesh_app_crypto_ctx crypto = {
- .dev_key = BT_MESH_IS_DEV_KEY(tx->ctx->app_idx),
- .aszmic = tx->aszmic,
- .src = tx->src,
- .dst = tx->ctx->addr,
- .seq_num = bt_mesh.seq,
- .iv_index = BT_MESH_NET_IVI_TX,
- };
-
- if (BT_MESH_ADDR_IS_VIRTUAL(tx->ctx->addr)) {
- crypto.ad = tx->ctx->uuid;
- if (crypto.ad == NULL) {
- return -ENOENT;
- }
- }
-
- return bt_mesh_app_encrypt(key, &crypto, msg);
-}
-
-int bt_mesh_trans_send(struct bt_mesh_net_tx *tx, struct net_buf_simple *msg,
- const struct bt_mesh_send_cb *cb, void *cb_data)
-{
- const struct bt_mesh_key *key;
- uint8_t aid;
- int err;
-
- if (msg->len < 1) {
- LOG_ERR("Zero-length SDU not allowed");
- return -EINVAL;
- }
-
- if (msg->len > BT_MESH_TX_SDU_MAX - BT_MESH_MIC_SHORT) {
- LOG_ERR("Message too big: %u", msg->len);
- return -EMSGSIZE;
- }
-
- if (net_buf_simple_tailroom(msg) < BT_MESH_MIC_SHORT) {
- LOG_ERR("Insufficient tailroom for Transport MIC");
- return -EINVAL;
- }
-
- if (tx->ctx->send_ttl == BT_MESH_TTL_DEFAULT) {
- tx->ctx->send_ttl = bt_mesh_default_ttl_get();
- } else if (tx->ctx->send_ttl > BT_MESH_TTL_MAX) {
- LOG_ERR("TTL too large (max 127)");
- return -EINVAL;
- }
-
- if (msg->len > BT_MESH_SDU_UNSEG_MAX) {
- tx->ctx->send_rel = true;
- }
-
- if (tx->ctx->addr == BT_MESH_ADDR_UNASSIGNED ||
- (!BT_MESH_ADDR_IS_UNICAST(tx->ctx->addr) &&
- BT_MESH_IS_DEV_KEY(tx->ctx->app_idx))) {
- LOG_ERR("Invalid destination address");
- return -EINVAL;
- }
-
- err = bt_mesh_keys_resolve(tx->ctx, &tx->sub, &key, &aid);
- if (err) {
- return err;
- }
-
- LOG_DBG("net_idx 0x%04x app_idx 0x%04x dst 0x%04x", tx->sub->net_idx, tx->ctx->app_idx,
- tx->ctx->addr);
- LOG_DBG("len %u: %s", msg->len, bt_hex(msg->data, msg->len));
-
- tx->xmit = bt_mesh_net_transmit_get();
- tx->aid = aid;
-
- if (!tx->ctx->send_rel || net_buf_simple_tailroom(msg) < 8) {
- tx->aszmic = 0U;
- } else {
- tx->aszmic = 1U;
- }
-
- err = trans_encrypt(tx, key, msg);
- if (err) {
- return err;
- }
-
- if (tx->ctx->send_rel) {
- err = send_seg(tx, msg, cb, cb_data, NULL);
- } else {
- err = send_unseg(tx, msg, cb, cb_data, NULL);
- }
-
- return err;
-}
-
-static void seg_rx_assemble(struct seg_rx *rx, struct net_buf_simple *buf,
- uint8_t aszmic)
-{
- int i;
-
- net_buf_simple_reset(buf);
-
- for (i = 0; i <= rx->seg_n; i++) {
- net_buf_simple_add_mem(buf, rx->seg[i],
- MIN(seg_len(rx->ctl),
- rx->len - (i * seg_len(rx->ctl))));
- }
-
- /* Adjust the length to not contain the MIC at the end */
- if (!rx->ctl) {
- buf->len -= APP_MIC_LEN(aszmic);
- }
-}
-
-struct decrypt_ctx {
- struct bt_mesh_app_crypto_ctx crypto;
- struct net_buf_simple *buf;
- struct net_buf_simple *sdu;
- struct seg_rx *seg;
-};
-
-static int sdu_try_decrypt(struct bt_mesh_net_rx *rx, const struct bt_mesh_key *key,
- void *cb_data)
-{
- struct decrypt_ctx *ctx = cb_data;
- int err;
-
- ctx->crypto.ad = NULL;
-
- do {
- if (ctx->seg) {
- seg_rx_assemble(ctx->seg, ctx->buf, ctx->crypto.aszmic);
- }
-
- if (BT_MESH_ADDR_IS_VIRTUAL(rx->ctx.recv_dst)) {
- ctx->crypto.ad = bt_mesh_va_uuid_get(rx->ctx.recv_dst, ctx->crypto.ad,
- NULL);
-
- if (!ctx->crypto.ad) {
- return -ENOENT;
- }
- }
-
- net_buf_simple_reset(ctx->sdu);
-
- err = bt_mesh_app_decrypt(key, &ctx->crypto, ctx->buf, ctx->sdu);
- } while (err && ctx->crypto.ad != NULL);
-
- if (!err && BT_MESH_ADDR_IS_VIRTUAL(rx->ctx.recv_dst)) {
- rx->ctx.uuid = ctx->crypto.ad;
- }
-
- return err;
-}
-
-static int sdu_recv(struct bt_mesh_net_rx *rx, uint8_t hdr, uint8_t aszmic,
- struct net_buf_simple *buf, struct net_buf_simple *sdu,
- struct seg_rx *seg)
-{
- struct decrypt_ctx ctx = {
- .crypto = {
- .dev_key = !AKF(&hdr),
- .aszmic = aszmic,
- .src = rx->ctx.addr,
- .dst = rx->ctx.recv_dst,
- .seq_num = seg ? (seg->seq_auth & 0xffffff) : rx->seq,
- .iv_index = BT_MESH_NET_IVI_RX(rx),
- },
- .buf = buf,
- .sdu = sdu,
- .seg = seg,
- };
-
- LOG_DBG("AKF %u AID 0x%02x", !ctx.crypto.dev_key, AID(&hdr));
-
- if (!rx->local_match) {
- return 0;
- }
-
- rx->ctx.app_idx = bt_mesh_app_key_find(ctx.crypto.dev_key, AID(&hdr),
- rx, sdu_try_decrypt, &ctx);
- if (rx->ctx.app_idx == BT_MESH_KEY_UNUSED) {
- LOG_DBG("No matching AppKey");
- return 0;
- }
-
- LOG_DBG("Decrypted (AppIdx: 0x%03x)", rx->ctx.app_idx);
-
- bt_mesh_model_recv(&rx->ctx, sdu);
-
- return 0;
-}
-
-static struct seg_tx *seg_tx_lookup(uint16_t seq_zero, uint8_t obo, uint16_t addr)
-{
- struct seg_tx *tx;
- int i;
-
- for (i = 0; i < ARRAY_SIZE(seg_tx); i++) {
- tx = &seg_tx[i];
-
- if ((tx->seq_auth & TRANS_SEQ_ZERO_MASK) != seq_zero) {
- continue;
- }
-
- if (tx->dst == addr) {
- return tx;
- }
-
- /* If the expected remote address doesn't match,
- * but the OBO flag is set and this is the first
- * acknowledgment, assume it's a Friend that's
- * responding and therefore accept the message.
- */
- if (obo && (tx->nack_count == tx->seg_n + 1 || tx->ack_src == addr)) {
- tx->ack_src = addr;
- return tx;
- }
- }
-
- return NULL;
-}
-
-static int trans_ack(struct bt_mesh_net_rx *rx, uint8_t hdr,
- struct net_buf_simple *buf, uint64_t *seq_auth)
-{
- struct seg_tx *tx;
- unsigned int bit;
- uint32_t ack;
- uint16_t seq_zero;
- uint8_t obo;
-
- if (buf->len < 6) {
- LOG_ERR("Too short ack message");
- return -EINVAL;
- }
-
- seq_zero = net_buf_simple_pull_be16(buf);
- obo = seq_zero >> 15;
- seq_zero = (seq_zero >> 2) & TRANS_SEQ_ZERO_MASK;
-
- if (IS_ENABLED(CONFIG_BT_MESH_FRIEND) && rx->friend_match) {
- LOG_DBG("Ack for LPN 0x%04x of this Friend", rx->ctx.recv_dst);
- /* Best effort - we don't have enough info for true SeqAuth */
- *seq_auth = SEQ_AUTH(BT_MESH_NET_IVI_RX(rx), seq_zero);
- return 0;
- }
-
- ack = net_buf_simple_pull_be32(buf);
-
- LOG_DBG("OBO %u seq_zero 0x%04x ack 0x%08x", obo, seq_zero, ack);
-
- tx = seg_tx_lookup(seq_zero, obo, rx->ctx.addr);
- if (!tx) {
- LOG_WRN("No matching TX context for ack");
- return -EINVAL;
- }
-
- if (!BT_MESH_ADDR_IS_UNICAST(tx->dst)) {
- LOG_ERR("Received ack for group seg");
- return -EINVAL;
- }
-
- *seq_auth = tx->seq_auth;
-
- if (!ack) {
- LOG_WRN("SDU canceled");
- seg_tx_complete(tx, -ECANCELED);
- return 0;
- }
-
- if (find_msb_set(ack) - 1 > tx->seg_n) {
- LOG_ERR("Too large segment number in ack");
- return -EINVAL;
- }
-
- while ((bit = find_lsb_set(ack))) {
- if (tx->seg[bit - 1]) {
- LOG_DBG("seg %u/%u acked", bit - 1, tx->seg_n);
- seg_tx_done(tx, bit - 1);
- }
-
- ack &= ~BIT(bit - 1);
- }
-
- if (tx->nack_count) {
- /* According to MshPRFv1.0.1: 3.5.3.3, we should reset the retransmit timer and
- * retransmit immediately when receiving a valid ack message. Don't reset the
- * retransmit timer if we didn't finish sending segments.
- */
- if (tx->seg_o == 0) {
- k_work_reschedule(&tx->retransmit, K_NO_WAIT);
- }
- } else {
- LOG_DBG("SDU TX complete");
- seg_tx_complete(tx, 0);
- }
-
- return 0;
-}
-
-static int ctl_recv(struct bt_mesh_net_rx *rx, uint8_t hdr,
- struct net_buf_simple *buf, uint64_t *seq_auth)
-{
- uint8_t ctl_op = TRANS_CTL_OP(&hdr);
-
- LOG_DBG("OpCode 0x%02x len %u", ctl_op, buf->len);
-
- switch (ctl_op) {
- case TRANS_CTL_OP_ACK:
- return trans_ack(rx, hdr, buf, seq_auth);
- case TRANS_CTL_OP_HEARTBEAT:
- return bt_mesh_hb_recv(rx, buf);
- }
-
- /* Only acks and heartbeats may need processing without local_match */
- if (!rx->local_match) {
- return 0;
- }
-
- if (IS_ENABLED(CONFIG_BT_MESH_FRIEND) && !bt_mesh_lpn_established()) {
- switch (ctl_op) {
- case TRANS_CTL_OP_FRIEND_POLL:
- return bt_mesh_friend_poll(rx, buf);
- case TRANS_CTL_OP_FRIEND_REQ:
- return bt_mesh_friend_req(rx, buf);
- case TRANS_CTL_OP_FRIEND_CLEAR:
- return bt_mesh_friend_clear(rx, buf);
- case TRANS_CTL_OP_FRIEND_CLEAR_CFM:
- return bt_mesh_friend_clear_cfm(rx, buf);
- case TRANS_CTL_OP_FRIEND_SUB_ADD:
- return bt_mesh_friend_sub_add(rx, buf);
- case TRANS_CTL_OP_FRIEND_SUB_REM:
- return bt_mesh_friend_sub_rem(rx, buf);
- }
- }
-
-#if defined(CONFIG_BT_MESH_LOW_POWER)
- if (ctl_op == TRANS_CTL_OP_FRIEND_OFFER) {
- return bt_mesh_lpn_friend_offer(rx, buf);
- }
-
- if (rx->ctx.addr == bt_mesh.lpn.frnd) {
- if (ctl_op == TRANS_CTL_OP_FRIEND_CLEAR_CFM) {
- return bt_mesh_lpn_friend_clear_cfm(rx, buf);
- }
-
- if (!rx->friend_cred) {
- LOG_WRN("Message from friend with wrong credentials");
- return -EINVAL;
- }
-
- switch (ctl_op) {
- case TRANS_CTL_OP_FRIEND_UPDATE:
- return bt_mesh_lpn_friend_update(rx, buf);
- case TRANS_CTL_OP_FRIEND_SUB_CFM:
- return bt_mesh_lpn_friend_sub_cfm(rx, buf);
- }
- }
-#endif /* CONFIG_BT_MESH_LOW_POWER */
-
- LOG_WRN("Unhandled TransOpCode 0x%02x", ctl_op);
-
- return -ENOENT;
-}
-
-static int trans_unseg(struct net_buf_simple *buf, struct bt_mesh_net_rx *rx,
- uint64_t *seq_auth)
-{
- NET_BUF_SIMPLE_DEFINE_STATIC(sdu, BT_MESH_SDU_UNSEG_MAX);
- uint8_t hdr;
-
- LOG_DBG("AFK %u AID 0x%02x", AKF(buf->data), AID(buf->data));
-
- if (buf->len < 1) {
- LOG_ERR("Too small unsegmented PDU");
- return -EINVAL;
- }
-
- if (bt_mesh_rpl_check(rx, NULL)) {
- LOG_WRN("Replay: src 0x%04x dst 0x%04x seq 0x%06x", rx->ctx.addr, rx->ctx.recv_dst,
- rx->seq);
- return -EINVAL;
- }
-
- hdr = net_buf_simple_pull_u8(buf);
-
- if (rx->ctl) {
- return ctl_recv(rx, hdr, buf, seq_auth);
- }
-
- if (buf->len < 1 + APP_MIC_LEN(0)) {
- LOG_ERR("Too short SDU + MIC");
- return -EINVAL;
- }
-
- /* Adjust the length to not contain the MIC at the end */
- buf->len -= APP_MIC_LEN(0);
-
- return sdu_recv(rx, hdr, 0, buf, &sdu, NULL);
-}
-
-static inline int32_t ack_timeout(struct seg_rx *rx)
-{
- int32_t to;
- uint8_t ttl;
-
- if (rx->ttl == BT_MESH_TTL_DEFAULT) {
- ttl = bt_mesh_default_ttl_get();
- } else {
- ttl = rx->ttl;
- }
-
- /* The acknowledgment timer shall be set to a minimum of
- * 150 + 50 * TTL milliseconds.
- */
- to = CONFIG_BT_MESH_SEG_ACK_BASE_TIMEOUT +
- (ttl * (int32_t)CONFIG_BT_MESH_SEG_ACK_PER_HOP_TIMEOUT);
-
- /* Add timeout for evenry not yet received segment. */
- to += ((rx->seg_n + 1) - POPCOUNT(rx->block)) *
- (int32_t)CONFIG_BT_MESH_SEG_ACK_PER_SEGMENT_TIMEOUT;
-
- /* Make sure we don't send more frequently than the duration for
- * each packet (default is 400ms).
- */
- return MAX(to, 400);
-}
-
-int bt_mesh_ctl_send(struct bt_mesh_net_tx *tx, uint8_t ctl_op, void *data,
- size_t data_len,
- const struct bt_mesh_send_cb *cb, void *cb_data)
-{
- struct net_buf_simple buf;
-
- if (tx->ctx->send_ttl == BT_MESH_TTL_DEFAULT) {
- tx->ctx->send_ttl = bt_mesh_default_ttl_get();
- } else if (tx->ctx->send_ttl > BT_MESH_TTL_MAX) {
- LOG_ERR("TTL too large (max 127)");
- return -EINVAL;
- }
-
- net_buf_simple_init_with_data(&buf, data, data_len);
-
- if (data_len > BT_MESH_SDU_UNSEG_MAX) {
- tx->ctx->send_rel = true;
- }
-
- tx->ctx->app_idx = BT_MESH_KEY_UNUSED;
-
- if (tx->ctx->addr == BT_MESH_ADDR_UNASSIGNED ||
- BT_MESH_ADDR_IS_VIRTUAL(tx->ctx->addr)) {
- LOG_ERR("Invalid destination address");
- return -EINVAL;
- }
-
- LOG_DBG("src 0x%04x dst 0x%04x ttl 0x%02x ctl 0x%02x", tx->src, tx->ctx->addr,
- tx->ctx->send_ttl, ctl_op);
- LOG_DBG("len %zu: %s", data_len, bt_hex(data, data_len));
-
- if (tx->ctx->send_rel) {
- return send_seg(tx, &buf, cb, cb_data, &ctl_op);
- } else {
- return send_unseg(tx, &buf, cb, cb_data, &ctl_op);
- }
-}
-
-static int send_ack(struct bt_mesh_subnet *sub, uint16_t src, uint16_t dst,
- uint8_t ttl, uint64_t *seq_auth, uint32_t block, uint8_t obo)
-{
- struct bt_mesh_msg_ctx ctx = {
- .net_idx = sub->net_idx,
- .app_idx = BT_MESH_KEY_UNUSED,
- .addr = dst,
- .send_ttl = ttl,
- };
- struct bt_mesh_net_tx tx = {
- .sub = sub,
- .ctx = &ctx,
- .src = obo ? bt_mesh_primary_addr() : src,
- .xmit = bt_mesh_net_transmit_get(),
- };
- uint16_t seq_zero = *seq_auth & TRANS_SEQ_ZERO_MASK;
- uint8_t buf[6];
-
- LOG_DBG("SeqZero 0x%04x Block 0x%08x OBO %u", seq_zero, block, obo);
-
- if (bt_mesh_lpn_established() && !bt_mesh_has_addr(ctx.addr)) {
- LOG_WRN("Not sending ack when LPN is enabled");
- return 0;
- }
-
- /* This can happen if the segmented message was destined for a group
- * or virtual address.
- */
- if (!BT_MESH_ADDR_IS_UNICAST(src)) {
- LOG_DBG("Not sending ack for non-unicast address");
- return 0;
- }
-
- sys_put_be16(((seq_zero << 2) & 0x7ffc) | (obo << 15), buf);
- sys_put_be32(block, &buf[2]);
-
- return bt_mesh_ctl_send(&tx, TRANS_CTL_OP_ACK, buf, sizeof(buf),
- NULL, NULL);
-}
-
-static void seg_rx_reset(struct seg_rx *rx, bool full_reset)
-{
- int i;
-
- LOG_DBG("rx %p", rx);
-
- /* If this fails, the handler will exit early on the next execution, as
- * it checks rx->in_use.
- */
- (void)k_work_cancel_delayable(&rx->ack);
-
- if (IS_ENABLED(CONFIG_BT_MESH_FRIEND) && rx->obo &&
- rx->block != BLOCK_COMPLETE(rx->seg_n)) {
- LOG_WRN("Clearing incomplete buffers from Friend queue");
- bt_mesh_friend_clear_incomplete(rx->sub, rx->src, rx->dst,
- &rx->seq_auth);
- }
-
- for (i = 0; i <= rx->seg_n; i++) {
- if (!rx->seg[i]) {
- continue;
- }
-
- k_mem_slab_free(&segs, rx->seg[i]);
- rx->seg[i] = NULL;
- }
-
- rx->in_use = 0U;
-
- /* We don't always reset these values since we need to be able to
- * send an ack if we receive a segment after we've already received
- * the full SDU.
- */
- if (full_reset) {
- rx->seq_auth = 0U;
- rx->sub = NULL;
- rx->src = BT_MESH_ADDR_UNASSIGNED;
- rx->dst = BT_MESH_ADDR_UNASSIGNED;
- }
-}
-
-static void seg_ack(struct k_work *work)
-{
- struct k_work_delayable *dwork = k_work_delayable_from_work(work);
- struct seg_rx *rx = CONTAINER_OF(dwork, struct seg_rx, ack);
- int32_t timeout;
-
- if (!rx->in_use || rx->block == BLOCK_COMPLETE(rx->seg_n)) {
- /* Cancellation of this timer may have failed. If it fails as
- * part of seg_reset, in_use will be false.
- * If it fails as part of the processing of a fully received
- * SDU, the ack is already being sent from the receive handler,
- * and the timer based ack sending can be ignored.
- */
- return;
- }
-
- LOG_DBG("rx %p", rx);
-
- if (k_uptime_get_32() - rx->last > (60 * MSEC_PER_SEC)) {
- LOG_WRN("Incomplete timer expired");
- seg_rx_reset(rx, false);
-
- if (IS_ENABLED(CONFIG_BT_TESTING)) {
- bt_test_mesh_trans_incomp_timer_exp();
- }
-
- return;
- }
-
- send_ack(rx->sub, rx->dst, rx->src, rx->ttl, &rx->seq_auth,
- rx->block, rx->obo);
-
- timeout = ack_timeout(rx);
- k_work_schedule(&rx->ack, K_MSEC(timeout));
-}
-
-static inline bool sdu_len_is_ok(bool ctl, uint8_t seg_n)
-{
- return (seg_n < BT_MESH_RX_SEG_MAX);
-}
-
-static struct seg_rx *seg_rx_find(struct bt_mesh_net_rx *net_rx,
- const uint64_t *seq_auth)
-{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(seg_rx); i++) {
- struct seg_rx *rx = &seg_rx[i];
-
- if (rx->src != net_rx->ctx.addr ||
- rx->dst != net_rx->ctx.recv_dst) {
- continue;
- }
-
- /* Return newer RX context in addition to an exact match, so
- * the calling function can properly discard an old SeqAuth.
- */
- if (rx->seq_auth >= *seq_auth) {
- return rx;
- }
-
- if (rx->in_use) {
- LOG_WRN("Duplicate SDU from src 0x%04x", net_rx->ctx.addr);
-
- /* Clear out the old context since the sender
- * has apparently started sending a new SDU.
- */
- seg_rx_reset(rx, true);
-
- /* Return non-match so caller can re-allocate */
- return NULL;
- }
- }
-
- return NULL;
-}
-
-static bool seg_rx_is_valid(struct seg_rx *rx, struct bt_mesh_net_rx *net_rx,
- const uint8_t *hdr, uint8_t seg_n)
-{
- if (rx->hdr != *hdr || rx->seg_n != seg_n) {
- LOG_ERR("Invalid segment for ongoing session");
- return false;
- }
-
- if (rx->src != net_rx->ctx.addr || rx->dst != net_rx->ctx.recv_dst) {
- LOG_ERR("Invalid source or destination for segment");
- return false;
- }
-
- if (rx->ctl != net_rx->ctl) {
- LOG_ERR("Inconsistent CTL in segment");
- return false;
- }
-
- return true;
-}
-
-static struct seg_rx *seg_rx_alloc(struct bt_mesh_net_rx *net_rx,
- const uint8_t *hdr, const uint64_t *seq_auth,
- uint8_t seg_n)
-{
- int i;
-
- /* No race condition on this check, as this function only executes in
- * the collaborative Bluetooth rx thread:
- */
- if (k_mem_slab_num_free_get(&segs) < 1) {
- LOG_WRN("Not enough segments for incoming message");
- return NULL;
- }
-
- for (i = 0; i < ARRAY_SIZE(seg_rx); i++) {
- struct seg_rx *rx = &seg_rx[i];
-
- if (rx->in_use) {
- continue;
- }
-
- rx->in_use = 1U;
- rx->sub = net_rx->sub;
- rx->ctl = net_rx->ctl;
- rx->seq_auth = *seq_auth;
- rx->seg_n = seg_n;
- rx->hdr = *hdr;
- rx->ttl = net_rx->ctx.send_ttl;
- rx->src = net_rx->ctx.addr;
- rx->dst = net_rx->ctx.recv_dst;
- rx->block = 0U;
-
- LOG_DBG("New RX context. Block Complete 0x%08x", BLOCK_COMPLETE(seg_n));
-
- return rx;
- }
-
- return NULL;
-}
-
-static int trans_seg(struct net_buf_simple *buf, struct bt_mesh_net_rx *net_rx,
- enum bt_mesh_friend_pdu_type *pdu_type, uint64_t *seq_auth,
- uint8_t *seg_count)
-{
- struct bt_mesh_rpl *rpl = NULL;
- struct seg_rx *rx;
- uint8_t *hdr = buf->data;
- uint16_t seq_zero;
- uint32_t auth_seqnum;
- uint8_t seg_n;
- uint8_t seg_o;
- int err;
-
- if (buf->len < 5) {
- LOG_ERR("Too short segmented message (len %u)", buf->len);
- return -EINVAL;
- }
-
- if (bt_mesh_rpl_check(net_rx, &rpl)) {
- LOG_WRN("Replay: src 0x%04x dst 0x%04x seq 0x%06x", net_rx->ctx.addr,
- net_rx->ctx.recv_dst, net_rx->seq);
- return -EINVAL;
- }
-
- LOG_DBG("ASZMIC %u AKF %u AID 0x%02x", ASZMIC(hdr), AKF(hdr), AID(hdr));
-
- net_buf_simple_pull(buf, 1);
-
- seq_zero = net_buf_simple_pull_be16(buf);
- seg_o = (seq_zero & 0x03) << 3;
- seq_zero = (seq_zero >> 2) & TRANS_SEQ_ZERO_MASK;
- seg_n = net_buf_simple_pull_u8(buf);
- seg_o |= seg_n >> 5;
- seg_n &= 0x1f;
-
- LOG_DBG("SeqZero 0x%04x SegO %u SegN %u", seq_zero, seg_o, seg_n);
-
- if (seg_o > seg_n) {
- LOG_ERR("SegO greater than SegN (%u > %u)", seg_o, seg_n);
- return -EINVAL;
- }
-
- /* According to MshPRFv1.0.1:
- * "The SeqAuth is composed of the IV Index and the sequence number
- * (SEQ) of the first segment"
- *
- * Therefore we need to calculate very first SEQ in order to find
- * seqAuth. We can calculate as below:
- *
- * SEQ(0) = SEQ(n) - (delta between seqZero and SEQ(n) by looking into
- * 14 least significant bits of SEQ(n))
- *
- * Mentioned delta shall be >= 0, if it is not then seq_auth will
- * be broken and it will be verified by the code below.
- */
- *seq_auth = SEQ_AUTH(BT_MESH_NET_IVI_RX(net_rx),
- (net_rx->seq -
- ((((net_rx->seq & BIT_MASK(14)) - seq_zero)) &
- BIT_MASK(13))));
- auth_seqnum = *seq_auth & BIT_MASK(24);
- *seg_count = seg_n + 1;
-
- /* Look for old RX sessions */
- rx = seg_rx_find(net_rx, seq_auth);
- if (rx) {
- /* Discard old SeqAuth packet */
- if (rx->seq_auth > *seq_auth) {
- LOG_WRN("Ignoring old SeqAuth");
- return -EINVAL;
- }
-
- if (!seg_rx_is_valid(rx, net_rx, hdr, seg_n)) {
- return -EINVAL;
- }
-
- if (rx->in_use) {
- LOG_DBG("Existing RX context. Block 0x%08x", rx->block);
- goto found_rx;
- }
-
- if (rx->block == BLOCK_COMPLETE(rx->seg_n)) {
- LOG_DBG("Got segment for already complete SDU");
-
- send_ack(net_rx->sub, net_rx->ctx.recv_dst,
- net_rx->ctx.addr, net_rx->ctx.send_ttl,
- seq_auth, rx->block, rx->obo);
-
- if (rpl) {
- bt_mesh_rpl_update(rpl, net_rx);
- }
-
- return -EALREADY;
- }
-
- /* We ignore instead of sending block ack 0 since the
- * ack timer is always smaller than the incomplete
- * timer, i.e. the sender is misbehaving.
- */
- LOG_WRN("Got segment for canceled SDU");
- return -EINVAL;
- }
-
- /* Bail out early if we're not ready to receive such a large SDU */
- if (!sdu_len_is_ok(net_rx->ctl, seg_n)) {
- LOG_ERR("Too big incoming SDU length");
- send_ack(net_rx->sub, net_rx->ctx.recv_dst, net_rx->ctx.addr,
- net_rx->ctx.send_ttl, seq_auth, 0,
- net_rx->friend_match);
- return -EMSGSIZE;
- }
-
- /* Verify early that there will be space in the Friend Queue(s) in
- * case this message is destined to an LPN of ours.
- */
- if (IS_ENABLED(CONFIG_BT_MESH_FRIEND) &&
- net_rx->friend_match && !net_rx->local_match &&
- !bt_mesh_friend_queue_has_space(net_rx->sub->net_idx,
- net_rx->ctx.addr,
- net_rx->ctx.recv_dst, seq_auth,
- *seg_count)) {
- LOG_ERR("No space in Friend Queue for %u segments", *seg_count);
- send_ack(net_rx->sub, net_rx->ctx.recv_dst, net_rx->ctx.addr,
- net_rx->ctx.send_ttl, seq_auth, 0,
- net_rx->friend_match);
- return -ENOBUFS;
- }
-
- /* Keep track of the received SeqAuth values received from this address
- * and discard segmented messages that are not newer, as described in
- * MshPRFv1.0.1: 3.5.3.4.
- *
- * The logic on the first segmented receive is a bit special, since the
- * initial value of rpl->seg is 0, which would normally fail the
- * comparison check with auth_seqnum:
- * - If this is the first time we receive from this source, rpl->src
- * will be 0, and we can skip this check.
- * - If this is the first time we receive from this source on the new IV
- * index, rpl->old_iv will be set, and the check is also skipped.
- * - If this is the first segmented message on the new IV index, but we
- * have received an unsegmented message already, the unsegmented
- * message will have reset rpl->seg to 0, and this message's SeqAuth
- * cannot be zero.
- */
- if (rpl && rpl->src && auth_seqnum <= rpl->seg &&
- (!rpl->old_iv || net_rx->old_iv)) {
- LOG_WRN("Ignoring old SeqAuth 0x%06x", auth_seqnum);
- return -EALREADY;
- }
-
- /* Look for free slot for a new RX session */
- rx = seg_rx_alloc(net_rx, hdr, seq_auth, seg_n);
- if (!rx) {
- /* Warn but don't cancel since the existing slots will
- * eventually be freed up and we'll be able to process
- * this one.
- */
- LOG_WRN("No free slots for new incoming segmented messages");
- return -ENOMEM;
- }
-
- rx->obo = net_rx->friend_match;
-
-found_rx:
- if (BIT(seg_o) & rx->block) {
- LOG_DBG("Received already received fragment");
- return -EALREADY;
- }
-
- /* All segments, except the last one, must either have 8 bytes of
- * payload (for 64bit Net MIC) or 12 bytes of payload (for 32bit
- * Net MIC).
- */
- if (seg_o == seg_n) {
- /* Set the expected final buffer length */
- rx->len = seg_n * seg_len(rx->ctl) + buf->len;
- LOG_DBG("Target len %u * %u + %u = %u", seg_n, seg_len(rx->ctl), buf->len, rx->len);
-
- if (rx->len > BT_MESH_RX_SDU_MAX) {
- LOG_ERR("Too large SDU len");
- send_ack(net_rx->sub, net_rx->ctx.recv_dst,
- net_rx->ctx.addr, net_rx->ctx.send_ttl,
- seq_auth, 0, rx->obo);
- seg_rx_reset(rx, true);
- return -EMSGSIZE;
- }
- } else {
- if (buf->len != seg_len(rx->ctl)) {
- LOG_ERR("Incorrect segment size for message type");
- return -EINVAL;
- }
- }
-
- /* Reset the Incomplete Timer */
- rx->last = k_uptime_get_32();
-
- if (!bt_mesh_lpn_established()) {
- int32_t timeout = ack_timeout(rx);
- /* Should only start ack timer if it isn't running already: */
- k_work_schedule(&rx->ack, K_MSEC(timeout));
- }
-
- /* Allocated segment here */
- err = k_mem_slab_alloc(&segs, &rx->seg[seg_o], K_NO_WAIT);
- if (err) {
- LOG_WRN("Unable allocate buffer for Seg %u", seg_o);
- return -ENOBUFS;
- }
-
- memcpy(rx->seg[seg_o], buf->data, buf->len);
-
- LOG_DBG("Received %u/%u", seg_o, seg_n);
-
- /* Mark segment as received */
- rx->block |= BIT(seg_o);
-
- if (rx->block != BLOCK_COMPLETE(seg_n)) {
- *pdu_type = BT_MESH_FRIEND_PDU_PARTIAL;
- return 0;
- }
-
- LOG_DBG("Complete SDU");
-
- if (rpl) {
- bt_mesh_rpl_update(rpl, net_rx);
- /* Update the seg, unless it has already been surpassed:
- * This needs to happen after rpl_update to ensure that the IV
- * update reset logic inside rpl_update doesn't overwrite the
- * change.
- */
- rpl->seg = MAX(rpl->seg, auth_seqnum);
- }
-
- *pdu_type = BT_MESH_FRIEND_PDU_COMPLETE;
-
- /* If this fails, the work handler will either exit early because the
- * block is fully received, or rx->in_use is false.
- */
- (void)k_work_cancel_delayable(&rx->ack);
- send_ack(net_rx->sub, net_rx->ctx.recv_dst, net_rx->ctx.addr,
- net_rx->ctx.send_ttl, seq_auth, rx->block, rx->obo);
-
- if (net_rx->ctl) {
- NET_BUF_SIMPLE_DEFINE(sdu, BT_MESH_RX_CTL_MAX);
- seg_rx_assemble(rx, &sdu, 0U);
- err = ctl_recv(net_rx, *hdr, &sdu, seq_auth);
- } else if (rx->len < 1 + APP_MIC_LEN(ASZMIC(hdr))) {
- LOG_ERR("Too short SDU + MIC");
- err = -EINVAL;
- } else {
- NET_BUF_SIMPLE_DEFINE_STATIC(seg_buf, BT_MESH_RX_SDU_MAX);
- struct net_buf_simple sdu;
-
- /* Decrypting in place to avoid creating two assembly buffers.
- * We'll reassemble the buffer from the segments before each
- * decryption attempt.
- */
- net_buf_simple_init(&seg_buf, 0);
- net_buf_simple_init_with_data(
- &sdu, seg_buf.data, rx->len - APP_MIC_LEN(ASZMIC(hdr)));
-
- err = sdu_recv(net_rx, *hdr, ASZMIC(hdr), &seg_buf, &sdu, rx);
- }
-
- seg_rx_reset(rx, false);
-
- return err;
-}
-
-int bt_mesh_trans_recv(struct net_buf_simple *buf, struct bt_mesh_net_rx *rx)
-{
- uint64_t seq_auth = TRANS_SEQ_AUTH_NVAL;
- enum bt_mesh_friend_pdu_type pdu_type = BT_MESH_FRIEND_PDU_SINGLE;
- struct net_buf_simple_state state;
- uint8_t seg_count = 0;
- int err;
-
- if (IS_ENABLED(CONFIG_BT_MESH_FRIEND)) {
- rx->friend_match = bt_mesh_friend_match(rx->sub->net_idx,
- rx->ctx.recv_dst);
- } else {
- rx->friend_match = false;
- }
-
- LOG_DBG("src 0x%04x dst 0x%04x seq 0x%08x friend_match %u", rx->ctx.addr, rx->ctx.recv_dst,
- rx->seq, rx->friend_match);
-
- /* Remove network headers */
- net_buf_simple_pull(buf, BT_MESH_NET_HDR_LEN);
-
- LOG_DBG("Payload %s", bt_hex(buf->data, buf->len));
-
- if (IS_ENABLED(CONFIG_BT_TESTING)) {
- bt_test_mesh_net_recv(rx->ctx.recv_ttl, rx->ctl, rx->ctx.addr,
- rx->ctx.recv_dst, buf->data, buf->len);
- }
-
- /* If LPN mode is enabled messages are only accepted when we've
- * requested the Friend to send them. The messages must also
- * be encrypted using the Friend Credentials.
- */
- if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER) &&
- bt_mesh_lpn_established() && rx->net_if == BT_MESH_NET_IF_ADV &&
- (!bt_mesh_lpn_waiting_update() || !rx->friend_cred)) {
- LOG_WRN("Ignoring unexpected message in Low Power mode");
- return -EAGAIN;
- }
-
- /* Save the app-level state so the buffer can later be placed in
- * the Friend Queue.
- */
- net_buf_simple_save(buf, &state);
-
- if (SEG(buf->data)) {
- /* Segmented messages must match a local element or an
- * LPN of this Friend.
- */
- if (!rx->local_match && !rx->friend_match) {
- return 0;
- }
-
- err = trans_seg(buf, rx, &pdu_type, &seq_auth, &seg_count);
- } else {
- seg_count = 1;
- err = trans_unseg(buf, rx, &seq_auth);
- }
-
- /* Notify LPN state machine so a Friend Poll will be sent. */
- if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER)) {
- bt_mesh_lpn_msg_received(rx);
- }
-
- net_buf_simple_restore(buf, &state);
-
- if (IS_ENABLED(CONFIG_BT_MESH_FRIEND) && rx->friend_match && !err) {
- if (seq_auth == TRANS_SEQ_AUTH_NVAL) {
- bt_mesh_friend_enqueue_rx(rx, pdu_type, NULL,
- seg_count, buf);
- } else {
- bt_mesh_friend_enqueue_rx(rx, pdu_type, &seq_auth,
- seg_count, buf);
- }
- }
-
- return err;
-}
-
-void bt_mesh_rx_reset(void)
-{
- int i;
-
- LOG_DBG("");
-
- for (i = 0; i < ARRAY_SIZE(seg_rx); i++) {
- seg_rx_reset(&seg_rx[i], true);
- }
-}
-
-void bt_mesh_trans_reset(void)
-{
- int i;
-
- bt_mesh_rx_reset();
-
- LOG_DBG("");
-
- for (i = 0; i < ARRAY_SIZE(seg_tx); i++) {
- seg_tx_reset(&seg_tx[i]);
- }
-
- bt_mesh_rpl_clear();
- bt_mesh_va_clear();
-}
-
-void bt_mesh_trans_init(void)
-{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(seg_tx); i++) {
- k_work_init_delayable(&seg_tx[i].retransmit, seg_retransmit);
- }
-
- for (i = 0; i < ARRAY_SIZE(seg_rx); i++) {
- k_work_init_delayable(&seg_rx[i].ack, seg_ack);
- }
-}
diff --git a/tests/bluetooth/mesh/blob_io_flash/prj.conf b/tests/bluetooth/mesh/blob_io_flash/prj.conf
index 2a0e98421fa..1e7864aa05d 100644
--- a/tests/bluetooth/mesh/blob_io_flash/prj.conf
+++ b/tests/bluetooth/mesh/blob_io_flash/prj.conf
@@ -15,7 +15,6 @@ CONFIG_BT_NO_DRIVER=y
CONFIG_BT_OBSERVER=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_MESH=y
-CONFIG_BT_MESH_V1d1=y
CONFIG_BT_MESH_BLOB_SRV=y
CONFIG_BT_MESH_BLOB_CLI=y
CONFIG_BT_MESH_BLOB_IO_FLASH=y
diff --git a/tests/bluetooth/mesh_shell/proxy_solicitation.conf b/tests/bluetooth/mesh_shell/proxy_solicitation.conf
index f900d743516..51e50c07a01 100644
--- a/tests/bluetooth/mesh_shell/proxy_solicitation.conf
+++ b/tests/bluetooth/mesh_shell/proxy_solicitation.conf
@@ -1,4 +1,3 @@
-CONFIG_BT_MESH_V1d1=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_MESH_PROXY_CLIENT=y
CONFIG_BT_MESH_PROXY_SOLICITATION=y
diff --git a/tests/bluetooth/tester/overlay-mesh-v1d1.conf b/tests/bluetooth/tester/overlay-mesh-v1d1.conf
deleted file mode 100644
index 52045ce34df..00000000000
--- a/tests/bluetooth/tester/overlay-mesh-v1d1.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-CONFIG_ENTROPY_GENERATOR=y
-
-CONFIG_BT_MESH_V1d1=y
-CONFIG_BT_MESH_OP_AGG_CLI=y
-CONFIG_BT_MESH_OP_AGG_SRV=y
-# PTS requires more key slots.
-# First one is implicitly taken by Device Key.
-CONFIG_BT_MESH_MODEL_KEY_COUNT=3
-CONFIG_BT_MESH_LARGE_COMP_DATA_CLI=y
-CONFIG_BT_MESH_LARGE_COMP_DATA_SRV=y
-CONFIG_BT_MESH_SAR_CFG_SRV=y
-CONFIG_BT_MESH_SAR_CFG_CLI=y
-CONFIG_BT_MESH_TX_SEG_MSG_COUNT=10
-CONFIG_BT_MESH_RPR_SRV=y
-CONFIG_BT_MESH_RPR_CLI=y
-CONFIG_BT_MESH_RPR_AD_TYPES_MAX=2
-CONFIG_BT_MESH_BLOB_CLI=y
-CONFIG_BT_MESH_DFU_CLI=y
-CONFIG_BT_MESH_BLOB_SRV=y
-CONFIG_BT_MESH_DFU_SRV=y
-CONFIG_BT_MESH_DFD_SRV=y
-CONFIG_BT_MESH_DFU_SLOT_CNT=2
-CONFIG_BT_MESH_PRIV_BEACONS=y
-CONFIG_BT_MESH_PRIV_BEACON_SRV=y
-CONFIG_BT_MESH_PRIV_BEACON_CLI=y
-CONFIG_BT_MESH_OD_PRIV_PROXY_SRV=y
-CONFIG_BT_MESH_MODEL_EXTENSIONS=y
-CONFIG_BT_MESH_COMP_PAGE_1=y
-CONFIG_BT_MESH_COMP_PAGE_2=y
-CONFIG_SETTINGS=y
diff --git a/tests/bluetooth/tester/overlay-mesh.conf b/tests/bluetooth/tester/overlay-mesh.conf
index 840af06c1c0..9fded71f792 100644
--- a/tests/bluetooth/tester/overlay-mesh.conf
+++ b/tests/bluetooth/tester/overlay-mesh.conf
@@ -1,3 +1,5 @@
+CONFIG_ENTROPY_GENERATOR=y
+
CONFIG_BT_MESH=y
CONFIG_BT_MESH_RELAY=y
CONFIG_BT_MESH_PB_ADV=y
@@ -23,3 +25,30 @@ CONFIG_BT_MESH_CDB_NODE_COUNT=3
CONFIG_BT_MESH_PROV_OOB_PUBLIC_KEY=y
CONFIG_BT_MESH_MSG_CACHE_SIZE=10
CONFIG_BT_MESH_PROXY_CLIENT=y
+CONFIG_BT_MESH_OP_AGG_CLI=y
+CONFIG_BT_MESH_OP_AGG_SRV=y
+# PTS requires more key slots.
+# First one is implicitly taken by Device Key.
+CONFIG_BT_MESH_MODEL_KEY_COUNT=3
+CONFIG_BT_MESH_LARGE_COMP_DATA_CLI=y
+CONFIG_BT_MESH_LARGE_COMP_DATA_SRV=y
+CONFIG_BT_MESH_SAR_CFG_SRV=y
+CONFIG_BT_MESH_SAR_CFG_CLI=y
+CONFIG_BT_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BT_MESH_RPR_SRV=y
+CONFIG_BT_MESH_RPR_CLI=y
+CONFIG_BT_MESH_RPR_AD_TYPES_MAX=2
+CONFIG_BT_MESH_BLOB_CLI=y
+CONFIG_BT_MESH_DFU_CLI=y
+CONFIG_BT_MESH_BLOB_SRV=y
+CONFIG_BT_MESH_DFU_SRV=y
+CONFIG_BT_MESH_DFD_SRV=y
+CONFIG_BT_MESH_DFU_SLOT_CNT=2
+CONFIG_BT_MESH_PRIV_BEACONS=y
+CONFIG_BT_MESH_PRIV_BEACON_SRV=y
+CONFIG_BT_MESH_PRIV_BEACON_CLI=y
+CONFIG_BT_MESH_OD_PRIV_PROXY_SRV=y
+CONFIG_BT_MESH_MODEL_EXTENSIONS=y
+CONFIG_BT_MESH_COMP_PAGE_1=y
+CONFIG_BT_MESH_COMP_PAGE_2=y
+CONFIG_SETTINGS=y
diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml
index 8c36291b30f..37c7ab3193d 100644
--- a/tests/bluetooth/tester/testcase.yaml
+++ b/tests/bluetooth/tester/testcase.yaml
@@ -28,13 +28,3 @@ tests:
extra_args: OVERLAY_CONFIG="overlay-mesh.conf"
tags: bluetooth
harness: bluetooth
- bluetooth.general.tester_mesh_v1d1:
- build_only: true
- platform_allow:
- - qemu_x86
- - native_posix
- - native_sim
- - nrf52840dk_nrf52840
- extra_args: OVERLAY_CONFIG="overlay-mesh.conf;overlay-mesh-v1d1.conf"
- tags: bluetooth
- harness: bluetooth
diff --git a/tests/bsim/bluetooth/mesh/CMakeLists.txt b/tests/bsim/bluetooth/mesh/CMakeLists.txt
index f57b59c0c64..70190be7840 100644
--- a/tests/bsim/bluetooth/mesh/CMakeLists.txt
+++ b/tests/bsim/bluetooth/mesh/CMakeLists.txt
@@ -10,30 +10,20 @@ target_sources(app PRIVATE
src/mesh_test.c
src/friendship_common.c
src/gatt_common.c
+ src/dfu_blob_common.c
)
-if(CONFIG_BT_MESH_V1d1)
- target_sources(app PRIVATE
- src/dfu_blob_common.c
- )
-endif()
-
if(CONFIG_SETTINGS)
target_sources(app PRIVATE
src/test_persistence.c
src/test_replay_cache.c
src/test_provision.c
- )
-
- if(CONFIG_BT_MESH_V1d1)
- target_sources(app PRIVATE
- src/test_dfu.c
- src/test_blob.c
- src/test_sar.c
- src/test_lcd.c
- )
- endif()
+ src/test_dfu.c
+ src/test_blob.c
+ src/test_sar.c
+ src/test_lcd.c
+)
if(CONFIG_BT_MESH_USES_MBEDTLS_PSA)
target_sources(app PRIVATE
@@ -47,13 +37,8 @@ elseif(CONFIG_BT_MESH_GATT_PROXY)
target_sources(app PRIVATE
src/test_advertiser.c
src/test_suspend.c
- )
-
- if(CONFIG_BT_MESH_V1d1)
- target_sources(app PRIVATE
src/test_beacon.c
- )
- endif()
+ )
elseif(CONFIG_BT_CTLR_LOW_LAT)
@@ -76,17 +61,12 @@ else()
src/test_iv_index.c
src/test_advertiser.c
src/test_suspend.c
+ src/test_blob.c
+ src/test_op_agg.c
+ src/test_sar.c
+ src/test_cdp1.c
)
- if(CONFIG_BT_MESH_V1d1)
- target_sources(app PRIVATE
- src/test_blob.c
- src/test_op_agg.c
- src/test_sar.c
- src/test_cdp1.c
- )
- endif()
-
endif()
zephyr_include_directories(
diff --git a/tests/bsim/bluetooth/mesh/compile.sh b/tests/bsim/bluetooth/mesh/compile.sh
index 4e3027a7681..06557ef0ebb 100755
--- a/tests/bsim/bluetooth/mesh/compile.sh
+++ b/tests/bsim/bluetooth/mesh/compile.sh
@@ -18,24 +18,13 @@ mkdir -p ${WORK_DIR}
source ${ZEPHYR_BASE}/tests/bsim/compile.source
app=tests/bsim/bluetooth/mesh compile
-app=tests/bsim/bluetooth/mesh conf_overlay=overlay_low_lat.conf compile
app=tests/bsim/bluetooth/mesh conf_overlay=overlay_pst.conf compile
app=tests/bsim/bluetooth/mesh conf_overlay=overlay_gatt.conf compile
-app=tests/bsim/bluetooth/mesh conf_file=prj_mesh1d1.conf compile
-app=tests/bsim/bluetooth/mesh \
- conf_file=prj_mesh1d1.conf conf_overlay=overlay_pst.conf compile
-app=tests/bsim/bluetooth/mesh \
- conf_file=prj_mesh1d1.conf conf_overlay=overlay_gatt.conf compile
-app=tests/bsim/bluetooth/mesh \
- conf_file=prj_mesh1d1.conf conf_overlay=overlay_low_lat.conf compile
-app=tests/bsim/bluetooth/mesh conf_file=prj_mesh1d1.conf conf_overlay=overlay_psa.conf compile
-app=tests/bsim/bluetooth/mesh \
- conf_file=prj_mesh1d1.conf conf_overlay="overlay_pst.conf;overlay_psa.conf" compile
-app=tests/bsim/bluetooth/mesh \
- conf_file=prj_mesh1d1.conf conf_overlay="overlay_gatt.conf;overlay_psa.conf" compile
-app=tests/bsim/bluetooth/mesh \
- conf_file=prj_mesh1d1.conf conf_overlay="overlay_low_lat.conf;overlay_psa.conf" compile
-app=tests/bsim/bluetooth/mesh \
- conf_file=prj_mesh1d1.conf conf_overlay="overlay_gatt.conf;overlay_low_lat.conf" compile
+app=tests/bsim/bluetooth/mesh conf_overlay=overlay_low_lat.conf compile
+app=tests/bsim/bluetooth/mesh conf_overlay=overlay_psa.conf compile
+app=tests/bsim/bluetooth/mesh conf_overlay="overlay_pst.conf;overlay_psa.conf" compile
+app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_psa.conf" compile
+app=tests/bsim/bluetooth/mesh conf_overlay="overlay_low_lat.conf;overlay_psa.conf" compile
+app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_low_lat.conf" compile
wait_for_background_jobs
diff --git a/tests/bsim/bluetooth/mesh/overlay_pst.conf b/tests/bsim/bluetooth/mesh/overlay_pst.conf
index 6730b9ee233..e02c0ec2b93 100644
--- a/tests/bsim/bluetooth/mesh/overlay_pst.conf
+++ b/tests/bsim/bluetooth/mesh/overlay_pst.conf
@@ -18,7 +18,4 @@ CONFIG_BT_MESH_SUBNET_COUNT=2
CONFIG_BT_MESH_SEQ_STORE_RATE=1
CONFIG_BT_MESH_RPL_STORE_TIMEOUT=1
CONFIG_BT_MESH_STORE_TIMEOUT=1
-CONFIG_BT_MESH_TX_SEG_RETRANS_COUNT=1
-CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_UNICAST=200
-CONFIG_BT_MESH_SEG_ACK_BASE_TIMEOUT=400
CONFIG_BT_MESH_COMP_PST_BUF_SIZE=600
diff --git a/tests/bsim/bluetooth/mesh/prj.conf b/tests/bsim/bluetooth/mesh/prj.conf
index e9c719de6d7..1c343bb512f 100644
--- a/tests/bsim/bluetooth/mesh/prj.conf
+++ b/tests/bsim/bluetooth/mesh/prj.conf
@@ -19,11 +19,12 @@ CONFIG_BT_CTLR_PRIVACY=n
CONFIG_BT_MESH=y
CONFIG_BT_MESH_LOG_LEVEL_DBG=y
CONFIG_BT_MESH_RELAY=y
-CONFIG_BT_MESH_ADV_BUF_COUNT=32
+CONFIG_BT_MESH_ADV_BUF_COUNT=64
CONFIG_BT_MESH_TX_SEG_MAX=32
CONFIG_BT_MESH_RX_SEG_MAX=32
CONFIG_BT_MESH_TX_SEG_MSG_COUNT=10
CONFIG_BT_MESH_RX_SEG_MSG_COUNT=10
+CONFIG_BT_MESH_SEG_BUFS=100
CONFIG_BT_MESH_CFG_CLI=y
CONFIG_BT_MESH_MODEL_GROUP_COUNT=3
CONFIG_BT_MESH_LOW_POWER=y
@@ -43,4 +44,29 @@ CONFIG_BT_MESH_CDB_NODE_COUNT=4
CONFIG_BT_MESH_PROV_OOB_PUBLIC_KEY=y
CONFIG_BT_MESH_MODEL_EXTENSIONS=y
CONFIG_BT_MESH_SUBNET_COUNT=5
+CONFIG_BT_MESH_SAR_CFG_CLI=y
+CONFIG_BT_MESH_SAR_CFG_SRV=y
+CONFIG_BT_MESH_BLOB_SRV=y
+CONFIG_BT_MESH_BLOB_CLI=y
+CONFIG_BT_MESH_BLOB_BLOCK_SIZE_MIN=256
+CONFIG_BT_MESH_RPR_CLI=y
+CONFIG_BT_MESH_RPR_SRV=y
+CONFIG_BT_MESH_OP_AGG_CLI=y
+CONFIG_BT_MESH_OP_AGG_SRV=y
+CONFIG_BT_MESH_LARGE_COMP_DATA_CLI=y
+CONFIG_BT_MESH_LARGE_COMP_DATA_SRV=y
+CONFIG_BT_MESH_DFU_SRV=y
+CONFIG_BT_MESH_DFU_CLI=y
+CONFIG_BT_MESH_DFD_SRV=y
+CONFIG_BT_MESH_DFD_SRV_OOB_UPLOAD=y
+CONFIG_BT_MESH_DFU_SLOT_CNT=4
+CONFIG_BT_MESH_PRIV_BEACON_SRV=y
+CONFIG_BT_MESH_PRIV_BEACON_CLI=y
+CONFIG_BT_MESH_OD_PRIV_PROXY_SRV=y
+CONFIG_BT_MESH_OD_PRIV_PROXY_CLI=y
+CONFIG_BT_MESH_COMP_PAGE_1=y
+CONFIG_BT_MESH_COMP_PAGE_2=y
CONFIG_BT_TESTING=y
+
+# Needed for RPR tests due to huge amount of retransmitted messages
+CONFIG_BT_MESH_MSG_CACHE_SIZE=64
diff --git a/tests/bsim/bluetooth/mesh/prj_mesh1d1.conf b/tests/bsim/bluetooth/mesh/prj_mesh1d1.conf
deleted file mode 100644
index fd0c953226b..00000000000
--- a/tests/bsim/bluetooth/mesh/prj_mesh1d1.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-CONFIG_LOG_MODE_IMMEDIATE=y
-CONFIG_ASSERT=y
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=32768
-
-# Bluetooth configuration
-CONFIG_BT=y
-CONFIG_LOG=y
-CONFIG_BT_PRIVACY=n
-CONFIG_BT_COMPANY_ID=0x0059
-CONFIG_BT_DEVICE_NAME="Mesh test"
-CONFIG_BT_OBSERVER=y
-CONFIG_BT_BROADCASTER=y
-
-# Disable unused Bluetooth features
-CONFIG_BT_CTLR_DUP_FILTER_LEN=0
-CONFIG_BT_CTLR_PRIVACY=n
-
-# Bluetooth Mesh configuration
-CONFIG_BT_MESH=y
-CONFIG_BT_MESH_V1d1=y
-CONFIG_BT_MESH_LOG_LEVEL_DBG=y
-CONFIG_BT_MESH_RELAY=y
-CONFIG_BT_MESH_ADV_BUF_COUNT=64
-CONFIG_BT_MESH_TX_SEG_MAX=32
-CONFIG_BT_MESH_RX_SEG_MAX=32
-CONFIG_BT_MESH_TX_SEG_MSG_COUNT=10
-CONFIG_BT_MESH_RX_SEG_MSG_COUNT=10
-CONFIG_BT_MESH_SEG_BUFS=100
-CONFIG_BT_MESH_CFG_CLI=y
-CONFIG_BT_MESH_MODEL_GROUP_COUNT=3
-CONFIG_BT_MESH_LOW_POWER=y
-CONFIG_BT_MESH_LPN_AUTO=n
-CONFIG_BT_MESH_FRIEND=y
-CONFIG_BT_MESH_FRIEND_ENABLED=n
-CONFIG_BT_MESH_FRIEND_LPN_COUNT=5
-CONFIG_BT_MESH_APP_KEY_COUNT=2
-CONFIG_BT_MESH_MODEL_KEY_COUNT=2
-CONFIG_BT_MESH_LABEL_COUNT=3
-CONFIG_BT_MESH_IV_UPDATE_TEST=y
-CONFIG_BT_MESH_PB_ADV=y
-CONFIG_BT_MESH_PROVISIONER=y
-CONFIG_BT_MESH_PROVISIONEE=y
-CONFIG_BT_MESH_CDB=y
-CONFIG_BT_MESH_CDB_NODE_COUNT=4
-CONFIG_BT_MESH_PROV_OOB_PUBLIC_KEY=y
-CONFIG_BT_MESH_MODEL_EXTENSIONS=y
-CONFIG_BT_MESH_SUBNET_COUNT=5
-CONFIG_BT_MESH_SAR_CFG_CLI=y
-CONFIG_BT_MESH_SAR_CFG_SRV=y
-CONFIG_BT_MESH_BLOB_SRV=y
-CONFIG_BT_MESH_BLOB_CLI=y
-CONFIG_BT_MESH_BLOB_BLOCK_SIZE_MIN=256
-CONFIG_BT_MESH_RPR_CLI=y
-CONFIG_BT_MESH_RPR_SRV=y
-CONFIG_BT_MESH_OP_AGG_CLI=y
-CONFIG_BT_MESH_OP_AGG_SRV=y
-CONFIG_BT_MESH_LARGE_COMP_DATA_CLI=y
-CONFIG_BT_MESH_LARGE_COMP_DATA_SRV=y
-CONFIG_BT_MESH_DFU_SRV=y
-CONFIG_BT_MESH_DFU_CLI=y
-CONFIG_BT_MESH_DFD_SRV=y
-CONFIG_BT_MESH_DFD_SRV_OOB_UPLOAD=y
-CONFIG_BT_MESH_DFU_SLOT_CNT=4
-CONFIG_BT_MESH_PRIV_BEACON_SRV=y
-CONFIG_BT_MESH_PRIV_BEACON_CLI=y
-CONFIG_BT_MESH_OD_PRIV_PROXY_SRV=y
-CONFIG_BT_MESH_OD_PRIV_PROXY_CLI=y
-CONFIG_BT_MESH_COMP_PAGE_1=y
-CONFIG_BT_MESH_COMP_PAGE_2=y
-CONFIG_BT_TESTING=y
-
-# Needed for RPR tests due to huge amount of retransmitted messages
-CONFIG_BT_MESH_MSG_CACHE_SIZE=64
diff --git a/tests/bsim/bluetooth/mesh/src/main.c b/tests/bsim/bluetooth/mesh/src/main.c
index 4b28d506627..275bb75de69 100644
--- a/tests/bsim/bluetooth/mesh/src/main.c
+++ b/tests/bsim/bluetooth/mesh/src/main.c
@@ -11,19 +11,14 @@
extern struct bst_test_list *test_persistence_install(struct bst_test_list *tests);
extern struct bst_test_list *test_rpc_install(struct bst_test_list *tests);
extern struct bst_test_list *test_provision_pst_install(struct bst_test_list *tests);
-#if defined(CONFIG_BT_MESH_V1d1)
extern struct bst_test_list *test_dfu_install(struct bst_test_list *test);
extern struct bst_test_list *test_blob_pst_install(struct bst_test_list *test);
extern struct bst_test_list *test_lcd_install(struct bst_test_list *test);
extern struct bst_test_list *test_sar_pst_install(struct bst_test_list *test);
-#endif /* defined(CONFIG_BT_MESH_V1d1) */
#elif defined(CONFIG_BT_MESH_GATT_PROXY)
extern struct bst_test_list *test_adv_install(struct bst_test_list *test);
extern struct bst_test_list *test_suspend_install(struct bst_test_list *test);
-#if defined(CONFIG_BT_MESH_V1d1)
extern struct bst_test_list *test_beacon_install(struct bst_test_list *tests);
-#endif /* defined(CONFIG_BT_MESH_V1d1) */
-
#elif defined(CONFIG_BT_CTLR_LOW_LAT)
extern struct bst_test_list *test_transport_install(struct bst_test_list *tests);
extern struct bst_test_list *test_friendship_install(struct bst_test_list *tests);
@@ -39,31 +34,25 @@ extern struct bst_test_list *test_access_install(struct bst_test_list *test);
extern struct bst_test_list *test_ivi_install(struct bst_test_list *test);
extern struct bst_test_list *test_adv_install(struct bst_test_list *test);
extern struct bst_test_list *test_suspend_install(struct bst_test_list *test);
-#if defined(CONFIG_BT_MESH_V1d1)
extern struct bst_test_list *test_blob_install(struct bst_test_list *test);
extern struct bst_test_list *test_op_agg_install(struct bst_test_list *test);
extern struct bst_test_list *test_sar_install(struct bst_test_list *test);
extern struct bst_test_list *test_cdp1_install(struct bst_test_list *test);
-#endif /* defined(CONFIG_BT_MESH_V1d1) */
#endif
bst_test_install_t test_installers[] = {
#if defined(CONFIG_SETTINGS)
test_persistence_install,
test_rpc_install,
-#if defined(CONFIG_BT_MESH_V1d1)
test_provision_pst_install,
test_dfu_install,
test_blob_pst_install,
test_lcd_install,
test_sar_pst_install,
-#endif /* defined(CONFIG_BT_MESH_V1d1) */
#elif defined(CONFIG_BT_MESH_GATT_PROXY)
test_adv_install,
test_suspend_install,
-#if defined(CONFIG_BT_MESH_V1d1)
test_beacon_install,
-#endif /* defined(CONFIG_BT_MESH_V1d1) */
#elif defined(CONFIG_BT_CTLR_LOW_LAT)
test_transport_install,
test_friendship_install,
@@ -79,12 +68,10 @@ bst_test_install_t test_installers[] = {
test_ivi_install,
test_adv_install,
test_suspend_install,
-#if defined(CONFIG_BT_MESH_V1d1)
test_blob_install,
test_op_agg_install,
test_sar_install,
test_cdp1_install,
-#endif /* defined(CONFIG_BT_MESH_V1d1) */
#endif
NULL
};
diff --git a/tests/bsim/bluetooth/mesh/src/test_beacon.c b/tests/bsim/bluetooth/mesh/src/test_beacon.c
index 69dbad1f24c..b1d7c214dc0 100644
--- a/tests/bsim/bluetooth/mesh/src/test_beacon.c
+++ b/tests/bsim/bluetooth/mesh/src/test_beacon.c
@@ -27,9 +27,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
#define BEACON_INTERVAL 10 /*seconds*/
#define BEACON_TYPE_SECURE 0x01
-#if CONFIG_BT_MESH_V1d1
#define BEACON_TYPE_PRIVATE 0x02
-#endif
static uint8_t test_net_key_2[16] = { 0xca, 0x11, 0xab, 0x1e };
static struct {
@@ -71,7 +69,6 @@ BT_MESH_BEACON_CB_DEFINE(snb) = {
/* Setting for scanner defining what beacon is expected next, SNB as default */
static uint8_t expected_beacon = BEACON_TYPE_SECURE;
-#if CONFIG_BT_MESH_V1d1
static struct bt_mesh_cfg_cli cfg_cli;
static struct bt_mesh_priv_beacon_cli priv_beacon_cli;
@@ -99,7 +96,6 @@ static uint8_t last_random[13];
static bt_addr_le_t last_beacon_adv_addr;
static struct bt_mesh_key priv_beacon_key;
-#endif /* CONFIG_BT_MESH_V1d1 */
static int random_interval;
@@ -330,13 +326,11 @@ static struct k_sem observer_sem;
static struct {
uint8_t flags;
uint32_t iv_index;
-#if CONFIG_BT_MESH_V1d1
uint8_t random[13];
uint64_t pp_hash;
uint64_t pp_random;
uint64_t net_id;
bt_addr_le_t adv_addr;
-#endif
bool (*process_cb)(const uint8_t *net_id, void *ctx);
void *user_ctx;
} beacon;
@@ -364,7 +358,6 @@ static void beacon_scan_cb(const bt_addr_le_t *addr, int8_t rssi, uint8_t adv_ty
net_id = net_buf_simple_pull_mem(buf, 8);
beacon.iv_index = net_buf_simple_pull_be32(buf);
}
-#if CONFIG_BT_MESH_V1d1
else if (expected_beacon == BEACON_TYPE_PRIVATE) {
uint8_t private_beacon_data[5];
@@ -377,7 +370,7 @@ static void beacon_scan_cb(const bt_addr_le_t *addr, int8_t rssi, uint8_t adv_ty
beacon.flags = private_beacon_data[0];
beacon.iv_index = sys_get_be32(&private_beacon_data[1]);
}
-#endif
+
if (!beacon.process_cb || beacon.process_cb(net_id, beacon.user_ctx)) {
k_sem_give(&observer_sem);
}
@@ -1060,8 +1053,6 @@ static void test_tx_beacon_cache(void)
PASS();
}
-#if CONFIG_BT_MESH_V1d1
-
typedef void (*priv_beacon_cb)(const struct bt_mesh_prb *prb);
static priv_beacon_cb priv_beacon_cb_ptr;
@@ -2196,8 +2187,6 @@ static void test_rx_priv_gatt_proxy(void)
#endif
-#endif /* CONFIG_BT_MESH_V1d1 */
-
#define TEST_CASE(role, name, description) \
{ \
.test_id = "beacon_" #role "_" #name, \
@@ -2216,7 +2205,6 @@ static const struct bst_test_instance test_beacon[] = {
TEST_CASE(tx, multiple_netkeys, "Beacon: multiple Net Keys"),
TEST_CASE(tx, secure_beacon_interval, "Beacon: send secure beacons"),
TEST_CASE(tx, beacon_cache, "Beacon: advertise duplicate SNBs"),
-#if CONFIG_BT_MESH_V1d1
TEST_CASE(tx, priv_on_iv_update, "Private Beacon: send on IV update"),
TEST_CASE(tx, priv_on_key_refresh, "Private Beacon: send on Key Refresh"),
TEST_CASE(tx, priv_adv, "Private Beacon: advertise Private Beacons"),
@@ -2230,7 +2218,6 @@ static const struct bst_test_instance test_beacon[] = {
TEST_CASE(tx, priv_gatt_proxy, "Private Proxy: Send Private Beacons over GATT"),
TEST_CASE(tx, proxy_adv_multi_subnet_coex, "Proxy Adv: Multi subnet coex proxy adv"),
TEST_CASE(tx, proxy_adv_solicit_trigger, "Proxy Adv: Trigger Solicitation"),
-#endif
#endif
TEST_CASE(rx, on_iv_update, "Beacon: receive with IV update flag"),
@@ -2240,7 +2227,6 @@ static const struct bst_test_instance test_beacon[] = {
TEST_CASE(rx, multiple_netkeys, "Beacon: multiple Net Keys"),
TEST_CASE(rx, secure_beacon_interval, "Beacon: receive and send secure beacons"),
TEST_CASE(rx, beacon_cache, "Beacon: receive duplicate SNBs"),
-#if CONFIG_BT_MESH_V1d1
TEST_CASE(rx, priv_adv, "Private Beacon: verify random regeneration"),
TEST_CASE(rx, priv_invalid, "Private Beacon: receive invalid beacons"),
TEST_CASE(rx, priv_interleave, "Private Beacon: interleaved with SNB"),
@@ -2251,7 +2237,6 @@ static const struct bst_test_instance test_beacon[] = {
TEST_CASE(rx, priv_multi_net_id, "Private Proxy: scan for multiple Net ID"),
TEST_CASE(rx, priv_gatt_proxy, "Private Proxy: Receive Private Beacons over GATT"),
TEST_CASE(rx, proxy_adv_multi_subnet_coex, "Proxy Adv: Multi subnet coex proxy adv"),
-#endif
#endif
BSTEST_END_MARKER
};
diff --git a/tests/bsim/bluetooth/mesh/src/test_provision.c b/tests/bsim/bluetooth/mesh/src/test_provision.c
index 9a83f874e11..39e6e1b2bd3 100644
--- a/tests/bsim/bluetooth/mesh/src/test_provision.c
+++ b/tests/bsim/bluetooth/mesh/src/test_provision.c
@@ -52,11 +52,9 @@ enum test_flags {
static uint8_t static_key1[] = {0x6E, 0x6F, 0x72, 0x64, 0x69, 0x63, 0x5F,
0x65, 0x78, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x5F, 0x31};
static uint8_t static_key2[] = {0x6E, 0x6F, 0x72, 0x64, 0x69, 0x63, 0x5F};
-#if IS_ENABLED(CONFIG_BT_MESH_V1d1)
static uint8_t static_key3[] = {0x45, 0x6E, 0x68, 0x61, 0x6E, 0x63, 0x65, 0x64, 0x20, 0x70, 0x72,
0x6F, 0x76, 0x69, 0x73, 0x69, 0x6F, 0x6E, 0x69, 0x6E, 0x67, 0x20,
0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x20, 0x4F, 0x4F, 0x42};
-#endif
static uint8_t private_key_be[32];
static uint8_t public_key_be[64];
@@ -72,9 +70,7 @@ static struct oob_auth_test_vector_s {
{NULL, 0, 0, 0, 0, 0},
{static_key1, sizeof(static_key1), 0, 0, 0, 0},
{static_key2, sizeof(static_key2), 0, 0, 0, 0},
-#if IS_ENABLED(CONFIG_BT_MESH_V1d1)
{static_key3, sizeof(static_key3), 0, 0, 0, 0},
-#endif
{NULL, 0, 3, BT_MESH_BLINK, 0, 0},
{NULL, 0, 5, BT_MESH_BEEP, 0, 0},
{NULL, 0, 6, BT_MESH_VIBRATE, 0, 0},
diff --git a/tests/bsim/bluetooth/mesh/src/test_replay_cache.c b/tests/bsim/bluetooth/mesh/src/test_replay_cache.c
index 68dc52a7b5d..57d605fb97a 100644
--- a/tests/bsim/bluetooth/mesh/src/test_replay_cache.c
+++ b/tests/bsim/bluetooth/mesh/src/test_replay_cache.c
@@ -78,7 +78,6 @@ static void rx_ended(uint8_t *data, size_t len)
static void tx_sar_conf(void)
{
-#ifdef CONFIG_BT_MESH_V1d1
/* Reconfigure SAR Transmitter state so that the transport layer doesn't
* retransmit.
*/
@@ -97,12 +96,10 @@ static void tx_sar_conf(void)
#else
bt_mesh.sar_tx = tx_set;
#endif
-#endif
}
static void rx_sar_conf(void)
{
-#ifdef CONFIG_BT_MESH_V1d1
/* Reconfigure SAR Receiver state so that the transport layer does
* generate Segmented Acks as rarely as possible.
*/
@@ -119,7 +116,6 @@ static void rx_sar_conf(void)
#else
bt_mesh.sar_rx = rx_set;
#endif
-#endif
}
static void test_tx_immediate_replay_attack(void)
diff --git a/tests/bsim/bluetooth/mesh/src/test_transport.c b/tests/bsim/bluetooth/mesh/src/test_transport.c
index 05026f6dcf7..309681ceafe 100644
--- a/tests/bsim/bluetooth/mesh/src/test_transport.c
+++ b/tests/bsim/bluetooth/mesh/src/test_transport.c
@@ -94,7 +94,6 @@ static void async_send_end(int err, void *data)
static void rx_sar_conf(void)
{
-#ifdef CONFIG_BT_MESH_V1d1
/* Reconfigure SAR Receiver state so that the transport layer does
* generate Segmented Acks as rarely as possible.
*/
@@ -111,7 +110,6 @@ static void rx_sar_conf(void)
#else
bt_mesh.sar_rx = rx_set;
#endif
-#endif
}
static const struct bt_mesh_send_cb async_send_cb = {
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh
index 6a56a084c60..85b76062b60 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh
@@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_publication_cancel \
access_tx_cancel access_rx_cancel
-conf=prj_mesh1d1_conf
-RunTest mesh_access_publication_cancel_1d1 \
- access_tx_cancel access_rx_cancel
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_access_publication_cancel_psa \
access_tx_cancel access_rx_cancel
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh
index 862291b4c76..66caf516bb2 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh
@@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_extended_model_subs \
access_tx_ext_model access_sub_ext_model
-conf=prj_mesh1d1_conf
-RunTest mesh_access_extended_model_subs_1d1 \
- access_tx_ext_model access_sub_ext_model
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_access_extended_model_subs_psa \
access_tx_ext_model access_sub_ext_model
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub_cap.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub_cap.sh
index 2a4f9ccc247..91576f34aa0 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub_cap.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub_cap.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_extended_model_subs_cap access_sub_capacity_ext_model
-conf=prj_mesh1d1_conf
-RunTest mesh_access_extended_model_subs_cap_1d1 access_sub_capacity_ext_model
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_access_extended_model_subs_cap_psa access_sub_capacity_ext_model
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period.sh
index d2bb07c6de7..f2e72085ac7 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period.sh
@@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_per_pub \
access_tx_period access_rx_period
-conf=prj_mesh1d1_conf
-RunTest mesh_access_per_pub_1d1 \
- access_tx_period access_rx_period
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_access_per_pub_psa \
access_tx_period access_rx_period
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period_delayable.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period_delayable.sh
index 5ecd4a061de..0148026fc6f 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period_delayable.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period_delayable.sh
@@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_pub_period_delayable_retr \
access_tx_period_delayable access_rx_period_delayable
-conf=prj_mesh1d1_conf
-RunTest mesh_access_pub_period_delayable_retr_1d1 \
- access_tx_period_delayable access_rx_period_delayable
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_access_pub_period_delayable_retr_psa \
access_tx_period_delayable access_rx_period_delayable
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit.sh
index c2f4a27ddbd..0a0ec47da15 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit.sh
@@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_pub_retr \
access_tx_transmit access_rx_transmit
-conf=prj_mesh1d1_conf
-RunTest mesh_access_pub_retr_1d1 \
- access_tx_transmit access_rx_transmit
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_access_pub_retr_psa \
access_tx_period access_rx_period
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit_delayable.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit_delayable.sh
index 0e966288db0..2dba89f2d76 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit_delayable.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit_delayable.sh
@@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_pub_transmit_delayable_retr \
access_tx_transmit_delayable access_rx_transmit_delayable
-conf=prj_mesh1d1_conf
-RunTest mesh_access_pub_transmit_delayable_retr_1d1 \
- access_tx_transmit_delayable access_rx_transmit_delayable
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_access_pub_transmit_delayable_retr_psa \
access_tx_transmit_delayable access_rx_transmit_delayable
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
index 86255277277..6c49d03fe9f 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
@@ -21,10 +21,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
overlay=overlay_gatt_conf
RunTest mesh_adv_proxy_mixin adv_tx_proxy_mixin adv_rx_proxy_mixin
-conf=prj_mesh1d1_conf
-overlay=overlay_gatt_conf
-RunTest mesh_adv_proxy_mixin_1d1 adv_tx_proxy_mixin adv_rx_proxy_mixin
-
-conf=prj_mesh1d1_conf
overlay="overlay_gatt_conf_overlay_psa_conf"
RunTest mesh_adv_proxy_mixin_psa adv_tx_proxy_mixin adv_rx_proxy_mixin
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
index 8cfe0f9366a..a171ffd60f3 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
@@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test buffer management by filling buffers and sending them in random order.
RunTest mesh_adv_random_order adv_tx_random_order adv_rx_random_order
-conf=prj_mesh1d1_conf
-RunTest mesh_adv_random_order_1d1 adv_tx_random_order adv_rx_random_order
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_adv_random_order_psa adv_tx_random_order adv_rx_random_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
index 96b30394f12..2b047138109 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
@@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test buffer management by filling all the buffer and sending them in reversed order.
RunTest mesh_adv_reverse_order adv_tx_reverse_order adv_rx_receive_order
-conf=prj_mesh1d1_conf
-RunTest mesh_adv_reverse_order_1d1 adv_tx_reverse_order adv_rx_receive_order
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_adv_reverse_order_psa adv_tx_reverse_order adv_rx_receive_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
index e208bf54579..a9e8d1ea861 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
@@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test buffer management by filling all the buffer and sending them all in order.
RunTest mesh_adv_send_order adv_tx_send_order adv_rx_receive_order
-conf=prj_mesh1d1_conf
-RunTest mesh_adv_send_order_1d1 adv_tx_send_order adv_rx_receive_order
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_adv_send_order_psa adv_tx_send_order adv_rx_receive_order
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
index 28827c872f8..4ca2838ddf9 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
@@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test tx callbacks sequence for multiple advs
RunTest mesh_adv_tx_cb_multi adv_tx_cb_multi
-conf=prj_mesh1d1_conf
-RunTest mesh_adv_tx_cb_multi_1d1 adv_tx_cb_multi
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_adv_tx_cb_multi_psa adv_tx_cb_multi
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
index edf4ba0996b..a2b1ad0e961 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
@@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test tx callbacks parameters and xmit sequence for single adv
RunTest mesh_adv_tx_cb_single adv_tx_cb_single adv_rx_xmit
-conf=prj_mesh1d1_conf
-RunTest mesh_adv_tx_cb_single_1d1 adv_tx_cb_single adv_rx_xmit
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_adv_tx_cb_single_psa adv_tx_cb_single adv_rx_xmit
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_cache.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_cache.sh
index c0f741e9aae..ab43e2b74db 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_cache.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_cache.sh
@@ -15,12 +15,6 @@ RunTest mesh_beacon_cache \
beacon_tx_beacon_cache \
beacon_rx_beacon_cache
-conf=prj_mesh1d1_conf
-RunTest mesh_beacon_cache \
- beacon_tx_beacon_cache \
- beacon_rx_beacon_cache
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_beacon_cache \
beacon_tx_beacon_cache \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh
index ec70eb2f02c..a671c90d668 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh
@@ -22,12 +22,6 @@ RunTest mesh_beacon_interval \
beacon_tx_secure_beacon_interval \
beacon_rx_secure_beacon_interval
-conf=prj_mesh1d1_conf
-RunTest mesh_beacon_interval_1d1 \
- beacon_tx_secure_beacon_interval \
- beacon_rx_secure_beacon_interval
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_beacon_interval_psa \
beacon_tx_secure_beacon_interval \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh
index ccce8c3a1f5..96d5b0a0f6b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh
@@ -8,12 +8,6 @@ RunTest mesh_beacon_invalid \
beacon_tx_invalid \
beacon_rx_invalid
-conf=prj_mesh1d1_conf
-RunTest mesh_beacon_invalid_1d1 \
- beacon_tx_invalid \
- beacon_rx_invalid
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_beacon_invalid_psa \
beacon_tx_invalid \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh
index 64225fd9cf5..d719aef86bc 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh
@@ -8,12 +8,6 @@ RunTest mesh_beacon_on_iv_update \
beacon_tx_on_iv_update \
beacon_rx_on_iv_update
-conf=prj_mesh1d1_conf
-RunTest mesh_beacon_on_iv_update_1d1 \
- beacon_tx_on_iv_update \
- beacon_rx_on_iv_update
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_beacon_on_iv_update_psa \
beacon_tx_on_iv_update \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh
index 00f82704718..9223d7d1d29 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh
@@ -8,12 +8,6 @@ RunTest mesh_beacon_on_key_refresh \
beacon_tx_on_key_refresh \
beacon_rx_on_key_refresh
-conf=prj_mesh1d1_conf
-RunTest mesh_beacon_on_key_refresh_1d1 \
- beacon_tx_on_key_refresh \
- beacon_rx_on_key_refresh
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_beacon_on_key_refresh_psa \
beacon_tx_on_key_refresh \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh
index 3d6b151a068..ecd83e415a9 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh
@@ -8,12 +8,6 @@ RunTest mesh_beacon_kr_old_key \
beacon_tx_kr_old_key \
beacon_rx_kr_old_key
-conf=prj_mesh1d1_conf
-RunTest mesh_beacon_kr_old_key_1d1 \
- beacon_tx_kr_old_key \
- beacon_rx_kr_old_key
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_beacon_kr_old_key_psa \
beacon_tx_kr_old_key \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh
index 677e4227669..a8c154f5204 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh
@@ -8,12 +8,6 @@ RunTest mesh_beacon_multiple_netkeys \
beacon_tx_multiple_netkeys \
beacon_rx_multiple_netkeys
-conf=prj_mesh1d1_conf
-RunTest mesh_beacon_multiple_netkeys_1d1 \
- beacon_tx_multiple_netkeys \
- beacon_rx_multiple_netkeys
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_beacon_multiple_netkeys_psa \
beacon_tx_multiple_netkeys \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_basic.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_basic.sh
index 6f1ec61ad27..d8665ac4cfd 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_basic.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_basic.sh
@@ -4,9 +4,7 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-conf=prj_mesh1d1_conf
RunTest blob_broadcast_basic blob_cli_broadcast_basic
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_broadcast_basic_psa blob_cli_broadcast_basic
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_trans.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_trans.sh
index d5d0f60d1ce..25198e70a38 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_trans.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_trans.sh
@@ -4,9 +4,7 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-conf=prj_mesh1d1_conf
RunTest blob_broadcast_trans blob_cli_broadcast_trans
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_broadcast_trans_psa blob_cli_broadcast_trans
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast.sh
index ee86ce33cfa..654753e2188 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast.sh
@@ -4,9 +4,7 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-conf=prj_mesh1d1_conf
RunTest blob_broadcast_unicast blob_cli_broadcast_unicast
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_broadcast_unicast_psa blob_cli_broadcast_unicast
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast_seq.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast_seq.sh
index c356122145c..cb569fdc3b4 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast_seq.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast_seq.sh
@@ -4,9 +4,7 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-conf=prj_mesh1d1_conf
RunTest blob_broadcast_unicast_seq blob_cli_broadcast_unicast_seq
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_broadcast_unicast_seq_psa blob_cli_broadcast_unicast_seq
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_all_rsp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_all_rsp.sh
index bc2aa351987..d7f54a34d22 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_all_rsp.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_all_rsp.sh
@@ -5,11 +5,9 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
RunTest blob_caps_all_rsp \
blob_cli_caps_all_rsp blob_srv_caps_standard blob_srv_caps_standard
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_caps_all_rsp_psa \
blob_cli_caps_all_rsp blob_srv_caps_standard blob_srv_caps_standard
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_cancelled.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_cancelled.sh
index 3e1bd343a70..e287dcbd9fc 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_cancelled.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_cancelled.sh
@@ -5,11 +5,9 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# The test instance seqence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
RunTest blob_caps_cancelled \
blob_cli_caps_cancelled blob_srv_caps_standard
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_caps_cancelled_psa \
blob_cli_caps_cancelled blob_srv_caps_standard
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_no_rsp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_no_rsp.sh
index e53864f8be4..e5ee44b5a08 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_no_rsp.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_no_rsp.sh
@@ -5,11 +5,9 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
RunTest blob_caps_no_rsp \
blob_cli_caps_no_rsp blob_srv_caps_no_rsp blob_srv_caps_no_rsp
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_caps_no_rsp_psa \
blob_cli_caps_no_rsp blob_srv_caps_no_rsp blob_srv_caps_no_rsp
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_partial_rsp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_partial_rsp.sh
index 9a1675bd279..2da51b0e37e 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_partial_rsp.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_partial_rsp.sh
@@ -5,11 +5,9 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
RunTest blob_caps_partial_rsp \
blob_cli_caps_partial_rsp blob_srv_caps_standard blob_srv_caps_no_rsp
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_caps_partial_rsp_psa \
blob_cli_caps_partial_rsp blob_srv_caps_standard blob_srv_caps_no_rsp
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_friend.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_friend.sh
index 1c2bde7a109..0e82cf8df11 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_friend.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_friend.sh
@@ -7,7 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Establish multiple different friendships concurrently. Perform BLOB transfer with BLOB Client
# on friend node and BLOB Server on LPNs.
# Note: The number of LPNs must match CONFIG_BT_MESH_FRIEND_LPN_COUNT.
-conf=prj_mesh1d1_conf
RunTest blob_transfer_lpn \
blob_cli_friend_pull \
blob_srv_lpn_pull \
@@ -16,7 +15,6 @@ RunTest blob_transfer_lpn \
blob_srv_lpn_pull \
blob_srv_lpn_pull
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_transfer_lpn_psa \
blob_cli_friend_pull \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_block.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_block.sh
index 73728d1f141..a30a54f79ff 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_block.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_block.sh
@@ -4,13 +4,11 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-conf=prj_mesh1d1_conf
RunTest blob_no_rsp_block_get \
blob_cli_fail_on_no_rsp \
blob_srv_fail_on_block_get \
blob_srv_fail_on_block_get -- -argstest msg-fail-type=0
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_no_rsp_block_get_psa \
blob_cli_fail_on_no_rsp \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_xfer.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_xfer.sh
index 4137deba007..4ecc650aa8f 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_xfer.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_xfer.sh
@@ -4,13 +4,11 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-conf=prj_mesh1d1_conf
RunTest blob_no_rsp_xfer_get \
blob_cli_fail_on_no_rsp \
blob_srv_fail_on_xfer_get \
blob_srv_fail_on_xfer_get -- -argstest msg-fail-type=1
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_no_rsp_xfer_get_psa \
blob_cli_fail_on_no_rsp \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh
index e5bb421af14..a7cfdac206d 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh
@@ -5,7 +5,6 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
RunTest blob_fail \
blob_cli_fail_on_persistency \
blob_srv_fail_on_block_start\
@@ -13,7 +12,6 @@ RunTest blob_fail \
blob_srv_fail_on_xfer_get \
blob_srv_fail_on_nothing
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_fail_psa \
blob_cli_fail_on_persistency \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh
index 8ead73c4ec7..11bafde8fbc 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh
@@ -5,13 +5,11 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test that BLOB Client continues BLOB Transfer after one target timed out while sending chunks.
-conf=prj_mesh1d1_conf
RunTest blob_pst_pull \
blob_cli_trans_persistency_pull \
blob_srv_trans_persistency_pull \
blob_srv_trans_persistency_pull
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_pst_pull_psa \
blob_cli_trans_persistency_pull \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh
index fdb1a8020e1..2e89819bb1f 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh
@@ -5,13 +5,11 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test that BLOB Transfer completes successfully in Pull mode
-conf=prj_mesh1d1_conf
RunTest blob_success_pull blob_cli_trans_complete \
blob_srv_trans_complete blob_srv_trans_complete \
blob_srv_trans_complete blob_srv_trans_complete \
-- -argstest use-pull-mode=1
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_success_pull_psa blob_cli_trans_complete \
blob_srv_trans_complete blob_srv_trans_complete \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh
index 5345eab11e8..9695d1bb941 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh
@@ -5,12 +5,10 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test that BLOB Transfer completes successfully in Push mode
-conf=prj_mesh1d1_conf
RunTest blob_success_push blob_cli_trans_complete \
blob_srv_trans_complete blob_srv_trans_complete \
blob_srv_trans_complete blob_srv_trans_complete
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_success_push_psa blob_cli_trans_complete \
blob_srv_trans_complete blob_srv_trans_complete \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh
index 5b05446694b..4459c4419b4 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh
@@ -5,11 +5,9 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test that BLOB Client can resume a suspended BLOB Transfer in Pull mode
-conf=prj_mesh1d1_conf
RunTest blob_resume_pull \
blob_cli_trans_resume blob_srv_trans_resume -- -argstest use-pull-mode=1
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_resume_pull_psa \
blob_cli_trans_resume blob_srv_trans_resume -- -argstest use-pull-mode=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh
index 01150c8b0eb..2bbc627b05c 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh
@@ -5,9 +5,7 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test that BLOB Client can resume a suspended BLOB Transfer in Push mode
-conf=prj_mesh1d1_conf
RunTest blob_resume_push blob_cli_trans_resume blob_srv_trans_resume
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest blob_resume_push_psa blob_cli_trans_resume blob_srv_trans_resume
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh
index 8c59c82da6f..9973a82dc49 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh
@@ -10,65 +10,53 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Tests with -flash_rm clean up stored settings after them
# to run tests with -flash_erase correctly.
# Test cases are designed to be run using single target.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop -flash_erase blob_srv_stop -flash_erase -- -argstest expected-phase=1
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop blob_srv_stop -- -argstest expected-phase=2
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop blob_srv_stop -- -argstest expected-phase=3
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop -flash_rm blob_srv_stop -flash_rm -- -argstest expected-phase=4
# Test reaching suspended state and continuation after reboot on new procedure.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop -flash_erase blob_srv_stop -flash_erase -- -argstest expected-phase=5
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop -flash_rm blob_srv_stop -flash_rm -- -argstest expected-phase=4
# The same test but with PSA crypto
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop -flash_erase blob_srv_stop -flash_erase -- -argstest expected-phase=1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop blob_srv_stop -- -argstest expected-phase=2
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop blob_srv_stop -- -argstest expected-phase=3
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop -flash_rm blob_srv_stop -flash_rm -- -argstest expected-phase=4
# Test reaching suspended state and continuation after reboot on new procedure.
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop -flash_erase blob_srv_stop -flash_erase -- -argstest expected-phase=5
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop -flash_rm blob_srv_stop -flash_rm -- -argstest expected-phase=4
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/comp_data/cdp1_encode_decode.sh b/tests/bsim/bluetooth/mesh/tests_scripts/comp_data/cdp1_encode_decode.sh
index e4f99e80d5d..d2a3c5de696 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/comp_data/cdp1_encode_decode.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/comp_data/cdp1_encode_decode.sh
@@ -13,11 +13,9 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 0. Provisioning and setup.
# 1. Configuration client requests the node's CDP1.
# 2. The received CDP1 is compared to a hardcoded version.
-conf=prj_mesh1d1_conf
RunTest mesh_cdp1_test \
cdp1_node_data_comparison
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_cdp1_test_psa \
cdp1_node_data_comparison
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh
index f612119bdee..4f87fb10fef 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh
@@ -8,7 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# callback is called when all targets are lost at this step.
# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_all_tgts_lost_on_apply \
dfu_cli_all_targets_lost_on_apply \
@@ -17,7 +16,6 @@ RunTest dfu_all_tgts_lost_on_apply \
dfu_target_fail_on_apply \
-- -argstest targets=3
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_all_tgts_lost_on_apply_psa \
dfu_cli_all_targets_lost_on_apply \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh
index 36dcf8f24ae..572445e4779 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh
@@ -8,7 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# and `ended` callback is called when all targets are lost at this step.
# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_all_tgts_lost_on_caps_get \
dfu_cli_all_targets_lost_on_caps_get \
@@ -17,7 +16,6 @@ RunTest dfu_all_tgts_lost_on_caps_get \
dfu_target_fail_on_caps_get \
-- -argstest targets=3
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_all_tgts_lost_on_caps_get_psa \
dfu_cli_all_targets_lost_on_caps_get \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh
index eacb921a214..e4fbe146dcd 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh
@@ -8,7 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# called when all targets are lost at this step.
# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_all_tgts_lost_on_metadata \
dfu_cli_all_targets_lost_on_metadata \
@@ -17,7 +16,6 @@ RunTest dfu_all_tgts_lost_on_metadata \
dfu_target_fail_on_metadata \
-- -argstest targets=3
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_all_tgts_lost_on_metadata_psa \
dfu_cli_all_targets_lost_on_metadata \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh
index f6c53482834..7b96161eccd 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh
@@ -8,7 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Firmware Update Get message and `ended` callback is called when all targets are lost at this step.
# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_all_tgts_lost_on_update_get \
dfu_cli_all_targets_lost_on_update_get \
@@ -17,7 +16,6 @@ RunTest dfu_all_tgts_lost_on_update_get \
dfu_target_fail_on_update_get \
-- -argstest targets=3
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_all_tgts_lost_on_update_get_psa \
dfu_cli_all_targets_lost_on_update_get \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh
index 929ab93b81e..5daedaca71d 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh
@@ -8,7 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# callback is called when all targets are lost at this step.
# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_all_tgts_lost_on_verify \
dfu_cli_all_targets_lost_on_verify \
@@ -17,7 +16,6 @@ RunTest dfu_all_tgts_lost_on_verify \
dfu_target_fail_on_verify \
-- -argstest targets=3
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_all_tgts_lost_on_verify_psa \
dfu_cli_all_targets_lost_on_verify \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh
index bcc98df48b5..2ff4a696639 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh
@@ -5,7 +5,6 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_persistency \
dfu_cli_fail_on_persistency \
@@ -16,7 +15,6 @@ RunTest dfu_persistency \
dfu_target_fail_on_apply \
dfu_target_fail_on_nothing
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_persistency_psa \
dfu_cli_fail_on_persistency \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh
index 64f33013e74..5c00349f24e 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh
@@ -4,10 +4,8 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_self_update dfu_dist_dfu_self_update -- -argstest targets=1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_self_update_psa dfu_dist_dfu_self_update -- -argstest targets=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh
index af7acb10723..42087f1ad13 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh
@@ -4,12 +4,10 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_self_update_no_change \
dfu_dist_dfu_self_update dfu_target_dfu_no_change -- -argstest targets=2
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_self_update_no_change_psa \
dfu_dist_dfu_self_update dfu_target_dfu_no_change -- -argstest targets=2
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh
index bcac2cbba5b..1c5ff82d8fb 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh
@@ -5,12 +5,10 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test DFU with all variants of firmware effect
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_mixed dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \
dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_mixed_psa dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \
dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh
index c5f67e2521e..3382e458b2e 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh
@@ -5,13 +5,11 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test that confirm step fails with all variants of firmware effect
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_mixed_fail dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \
dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4 \
fail-confirm=1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_mixed_fail_psa dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \
dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4 \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh
index c187d8cfbff..587908c6497 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh
@@ -11,7 +11,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# and verifies they do not exist.
# - Fourth test is rebooted device that verifies if removing all slots also removed them
# from storage.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_slot dfu_dist_dfu_slot_create -flash_erase
@@ -21,7 +20,6 @@ RunTestFlash dfu_slot dfu_dist_dfu_slot_delete_all
RunTestFlash dfu_slot dfu_dist_dfu_slot_check_delete_all -flash_rm
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash dfu_slot_psa dfu_dist_dfu_slot_create -flash_erase
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_idempotency.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_idempotency.sh
index 3f18f1a2651..abce47dba13 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_idempotency.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_idempotency.sh
@@ -5,10 +5,8 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test DFU Slot API. This test tests that the APIs are idempotent.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_slot_idempotency dfu_dist_dfu_slot_idempotency
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_slot_idempotency_psa dfu_dist_dfu_slot_idempotency
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_reservation.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_reservation.sh
index ddd7d0123f5..0ce234116b2 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_reservation.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_reservation.sh
@@ -5,10 +5,8 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test DFU Slot API. This test tests slot reservation APIs.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_slot_reservation dfu_dist_dfu_slot_reservation
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_slot_reservation_psa dfu_dist_dfu_slot_reservation
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_persistence.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_persistence.sh
index 6ed7099c987..b18a949b43d 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_persistence.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_persistence.sh
@@ -13,32 +13,27 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# image index were loaded correctly.
# Test cases are designed to be run using single target. `dfu_cli_stop` test case in recovery part
# plays dummy role, and is there to keep order of settings files being loaded.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop -flash_erase dfu_target_dfu_stop -flash_erase \
-- -argstest recover=0 expected-phase=2
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop dfu_target_dfu_stop \
-- -argstest recover=1 expected-phase=3
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop dfu_target_dfu_stop \
-- -argstest recover=1 expected-phase=4
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop dfu_target_dfu_stop \
-- -argstest recover=1 expected-phase=6
# Use phase `BT_MESH_DFU_PHASE_APPLY_SUCCESS` as marker to bring whole procedure to an end
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop -flash_rm dfu_target_dfu_stop -flash_rm \
@@ -46,45 +41,38 @@ RunTestFlash dfu_dist_recover_phase \
# To test recovery from Verify Fail begin new distribution that will end there,
# reboot devices and continue to Applying.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop -flash_erase dfu_target_dfu_stop -flash_erase \
-- -argstest recover=0 expected-phase=5
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop -flash_rm dfu_target_dfu_stop -flash_rm \
-- -argstest recover=1 expected-phase=6
# The same test but with PSA crypto
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash dfu_dist_recover_phase_psa \
dfu_cli_stop -flash_erase dfu_target_dfu_stop -flash_erase \
-- -argstest recover=0 expected-phase=2
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash dfu_dist_recover_phase_psa \
dfu_cli_stop dfu_target_dfu_stop \
-- -argstest recover=1 expected-phase=3
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash dfu_dist_recover_phase_psa \
dfu_cli_stop dfu_target_dfu_stop \
-- -argstest recover=1 expected-phase=4
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash dfu_dist_recover_phase_psa \
dfu_cli_stop dfu_target_dfu_stop \
-- -argstest recover=1 expected-phase=6
# Use phase `BT_MESH_DFU_PHASE_APPLY_SUCCESS` as marker to bring whole procedure to an end
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash dfu_dist_recover_phase_psa \
dfu_cli_stop -flash_rm dfu_target_dfu_stop -flash_rm \
@@ -92,13 +80,11 @@ RunTestFlash dfu_dist_recover_phase_psa \
# To test recovery from Verify Fail begin new distribution that will end there,
# reboot devices and continue to Applying.
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash dfu_dist_recover_phase_psa \
dfu_cli_stop -flash_erase dfu_target_dfu_stop -flash_erase \
-- -argstest recover=0 expected-phase=5
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash dfu_dist_recover_phase_psa \
dfu_cli_stop -flash_rm dfu_target_dfu_stop -flash_rm \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh
index b89ad3af2c7..d1082fa9f29 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh
@@ -9,12 +9,6 @@ RunTest mesh_friendship_est \
friendship_friend_est \
friendship_lpn_est
-conf=prj_mesh1d1_conf
-RunTest mesh_friendship_est_1d1 \
- friendship_friend_est \
- friendship_lpn_est
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_friendship_est_psa \
friendship_friend_est \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh
index 725ddae596e..32e4752123d 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh
@@ -14,16 +14,6 @@ RunTest mesh_friendship_est_multi \
friendship_lpn_est \
friendship_lpn_est
-conf=prj_mesh1d1_conf
-RunTest mesh_friendship_est_multi_1d1 \
- friendship_friend_est_multi \
- friendship_lpn_est \
- friendship_lpn_est \
- friendship_lpn_est \
- friendship_lpn_est \
- friendship_lpn_est
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_friendship_est_multi_psa \
friendship_friend_est_multi \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh
index be22829d615..f8e24e51a3b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh
@@ -16,12 +16,6 @@ RunTest mesh_lpn_disable_check \
friendship_friend_no_est \
friendship_lpn_disable
-conf=prj_mesh1d1_conf
-RunTest mesh_lpn_disable_check_1d1 \
- friendship_friend_no_est \
- friendship_lpn_disable
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_lpn_disable_check_psa \
friendship_friend_no_est \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh
index 676b6b81ccc..7c42d7912ff 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh
@@ -9,12 +9,6 @@ RunTest mesh_friendship_lpn_loopback \
friendship_lpn_loopback \
friendship_friend_est
-conf=prj_mesh1d1_conf
-RunTest mesh_friendship_lpn_loopback_1d1 \
- friendship_lpn_loopback \
- friendship_friend_est
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_friendship_lpn_loopback_psa \
friendship_lpn_loopback \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh
index 75163076af4..e51fec31dd2 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh
@@ -14,12 +14,6 @@ RunTest mesh_lpn_terminate_cb_check \
friendship_friend_est \
friendship_lpn_term_cb_check
-conf=prj_mesh1d1_conf
-RunTest mesh_lpn_terminate_cb_check_1d1 \
- friendship_friend_est \
- friendship_lpn_term_cb_check
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_lpn_terminate_cb_check_psa \
friendship_friend_est \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh
index 94d6224da5b..2329ed289eb 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh
@@ -9,12 +9,6 @@ RunTest mesh_friendship_msg_frnd \
friendship_friend_msg \
friendship_lpn_msg_frnd
-conf=prj_mesh1d1_conf
-RunTest mesh_friendship_msg_frnd_1d1 \
- friendship_friend_msg \
- friendship_lpn_msg_frnd
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_friendship_msg_frnd_psa \
friendship_friend_msg \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh
index 6e7287b00ff..d6de655ba5b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh
@@ -10,13 +10,6 @@ RunTest mesh_friendship_msg_group \
friendship_other_group \
friendship_friend_group
-conf=prj_mesh1d1_conf
-RunTest mesh_friendship_msg_group_1d1 \
- friendship_lpn_group \
- friendship_other_group \
- friendship_friend_group
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_friendship_msg_group_psa \
friendship_lpn_group \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh
index 072e427d72a..f05261bb258 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh
@@ -10,13 +10,6 @@ RunTest mesh_friendship_msg_mesh \
friendship_other_msg \
friendship_friend_est
-conf=prj_mesh1d1_conf
-RunTest mesh_friendship_msg_mesh_1d1 \
- friendship_lpn_msg_mesh \
- friendship_other_msg \
- friendship_friend_est
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_friendship_msg_mesh_psa \
friendship_lpn_msg_mesh \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh
index d659281e4e9..3352d5812e6 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh
@@ -11,14 +11,6 @@ RunTest mesh_friendship_msg_mesh_low_lat \
friendship_other_msg \
friendship_friend_est
-conf=prj_mesh1d1_conf
-overlay=overlay_low_lat_conf
-RunTest mesh_friendship_msg_mesh_low_lat_1d1 \
- friendship_lpn_msg_mesh \
- friendship_other_msg \
- friendship_friend_est
-
-conf=prj_mesh1d1_conf
overlay="overlay_low_lat_conf_overlay_psa_conf"
RunTest mesh_friendship_msg_mesh_low_lat_psa \
friendship_lpn_msg_mesh \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_va_collision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_va_collision.sh
index 360095d2e5f..3ec9cd29162 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_va_collision.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_va_collision.sh
@@ -24,12 +24,6 @@ RunTest mesh_friendship_msg_va_collision \
friendship_lpn_va_collision \
friendship_friend_va_collision
-conf=prj_mesh1d1_conf
-RunTest mesh_friendship_msg_va_collision_1d1 \
- friendship_lpn_va_collision \
- friendship_friend_va_collision
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_friendship_msg_va_collision_psa \
friendship_lpn_va_collision \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh
index d717be60292..90398fb4d8a 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh
@@ -9,12 +9,6 @@ RunTest mesh_friendship_overflow \
friendship_friend_overflow \
friendship_lpn_overflow
-conf=prj_mesh1d1_conf
-RunTest mesh_friendship_overflow_1d1 \
- friendship_friend_overflow \
- friendship_lpn_overflow
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_friendship_overflow_psa \
friendship_friend_overflow \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh
index 90e744a7001..328050ba39e 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh
@@ -9,12 +9,6 @@ RunTest mesh_friendship_poll \
friendship_friend_est \
friendship_lpn_poll
-conf=prj_mesh1d1_conf
-RunTest mesh_friendship_poll_1d1 \
- friendship_friend_est \
- friendship_lpn_poll
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_friendship_poll_psa \
friendship_friend_est \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh
index 10abb4413ea..27b3e07e5f6 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh
@@ -9,12 +9,6 @@ RunTest mesh_friendship_re_est \
friendship_friend_est \
friendship_lpn_re_est
-conf=prj_mesh1d1_conf
-RunTest mesh_friendship_re_est_1d1 \
- friendship_friend_est \
- friendship_lpn_re_est
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_friendship_re_est_psa \
friendship_friend_est \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh b/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh
index eef25d08cf2..5bef1473a07 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh
@@ -10,13 +10,6 @@ RunTest mesh_heartbeat_sub_cb_api_all \
heartbeat_publish_all \
heartbeat_subscribe_all
-conf=prj_mesh1d1_conf
-RunTest mesh_heartbeat_sub_cb_api_all_1d1 \
- heartbeat_publish_all \
- heartbeat_publish_all \
- heartbeat_subscribe_all
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_heartbeat_sub_cb_api_all_psa \
heartbeat_publish_all \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh b/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh
index fc0660e5676..93b1e2ffe9f 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh
@@ -10,13 +10,6 @@ RunTest mesh_heartbeat_sub_cb_api_unicast \
heartbeat_publish_unicast \
heartbeat_subscribe_unicast
-conf=prj_mesh1d1_conf
-RunTest mesh_heartbeat_sub_cb_api_unicast_1d1 \
- heartbeat_publish_unicast \
- heartbeat_publish_unicast \
- heartbeat_subscribe_unicast
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_heartbeat_sub_cb_api_unicast_psa \
heartbeat_publish_unicast \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh
index cdf39dac438..6696b28ae00 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh
@@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test deferring of the IV index update procedure
RunTest mesh_ivi_deferring ivi_ivu_deferring
-conf=prj_mesh1d1_conf
-RunTest mesh_ivi_deferring_1d1 ivi_ivu_deferring
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_ivi_deferring_psa ivi_ivu_deferring
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh
index 39514bf39e6..a827f9b3abf 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh
@@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test IV index recovery procedure
RunTest mesh_ivi_recovery ivi_ivu_recovery
-conf=prj_mesh1d1_conf
-RunTest mesh_ivi_recovery_1d1 ivi_ivu_recovery
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_ivi_recovery_psa ivi_ivu_recovery
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_update.sh b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_update.sh
index ee2b6b20000..f2f652012b8 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_update.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_update.sh
@@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test IV index update procedure
RunTest mesh_ivi_update ivi_ivu_normal
-conf=prj_mesh1d1_conf
-RunTest mesh_ivi_update_1d1 ivi_ivu_normal
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_ivi_update_psa ivi_ivu_normal
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split.sh
index d65326b3d7f..dcaba598a57 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split.sh
@@ -19,12 +19,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp0_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=0
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp0_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=0
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split_dfu.sh
index 6a65a2492ed..004a5224961 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split_dfu.sh
@@ -20,13 +20,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp0_data_split_dfu \
lcd_srv_comp_data_status_respond \
lcd_cli_split_comp_data_request -- -argstest page=0 comp-changed-mode=1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp0_data_split_dfu \
lcd_srv_comp_data_status_respond \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split.sh
index 77d4a1737a5..f88db1b7391 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split.sh
@@ -19,12 +19,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp128_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=128
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp128_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=128
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split_dfu.sh
index 9abdfd00dd7..084125c79a4 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp128_data_split_dfu.sh
@@ -20,13 +20,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp128_data_split_dfu \
lcd_srv_comp_data_status_respond \
lcd_cli_split_comp_data_request -- -argstest page=128 comp-changed-mode=1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp128_data_split_dfu \
lcd_srv_comp_data_status_respond \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split.sh
index fba1760cb36..ab46d32048f 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split.sh
@@ -19,12 +19,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp129_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=129
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp129_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=129
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split_dfu.sh
index 282c3425c81..179c052e0ef 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp129_data_split_dfu.sh
@@ -20,13 +20,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp129_data_split_dfu \
lcd_srv_comp_data_status_respond \
lcd_cli_split_comp_data_request -- -argstest page=129 comp-changed-mode=1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp129_data_split_dfu \
lcd_srv_comp_data_status_respond \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split.sh
index e3e8f2bad85..eb25353581b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split.sh
@@ -19,12 +19,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp130_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=130
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp130_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=130
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split_dfu.sh
index 5daf32c54c0..a667f53abc8 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp130_data_split_dfu.sh
@@ -20,13 +20,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp130_data_split_dfu \
lcd_srv_comp_data_status_respond \
lcd_cli_split_comp_data_request -- -argstest page=130 comp-changed-mode=1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp130_data_split_dfu \
lcd_srv_comp_data_status_respond \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split.sh
index bc24a9c9bf9..06312cf558b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split.sh
@@ -19,12 +19,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp1_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp1_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split_dfu.sh
index 59383bb18f1..61f19ea3dcc 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp1_data_split_dfu.sh
@@ -20,13 +20,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp1_data_split_dfu \
lcd_srv_comp_data_status_respond \
lcd_cli_split_comp_data_request -- -argstest page=1 comp-changed-mode=1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp1_data_split_dfu \
lcd_srv_comp_data_status_respond \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split.sh
index 53def43d5a0..3da45434ee1 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split.sh
@@ -19,12 +19,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp2_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=2
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp2_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=2
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split_dfu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split_dfu.sh
index f314f00d6ef..8ad929f1374 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split_dfu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp2_data_split_dfu.sh
@@ -20,13 +20,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp2_data_split_dfu \
lcd_srv_comp_data_status_respond \
lcd_cli_split_comp_data_request -- -argstest page=2 comp-changed-mode=1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp2_data_split_dfu \
lcd_srv_comp_data_status_respond \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh
index b050037ccf0..71a692fa22c 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh
@@ -14,12 +14,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 3. When server status arrive, remove status field data and compare received
# comp data with local comp data and assure that the received message length
# is 378 bytes (380 bytes access payload).
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_max_access_payload \
lcd_cli_max_sdu_comp_data_request lcd_srv_comp_data_status_respond
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_max_access_payload_psa \
lcd_cli_max_sdu_comp_data_request lcd_srv_comp_data_status_respond
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh
index 9b0be5ea20f..ef0f5712526 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh
@@ -15,12 +15,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# is 378 bytes (380 bytes access payload).
# 4. Remove status field data and compare received metadata with
# local metadata data.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_max_metadata_access_payload \
lcd_cli_max_sdu_metadata_request lcd_srv_metadata_status_respond
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_max_metadata_access_payload_psa \
lcd_cli_max_sdu_metadata_request lcd_srv_metadata_status_respond
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh
index 0e29e7d4219..38e43f88601 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh
@@ -18,12 +18,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# received metadata with corresponding bytes in local data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local metadata.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_split_metadata \
lcd_cli_split_metadata_request lcd_srv_metadata_status_respond
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_split_metadata_psa \
lcd_cli_split_metadata_request lcd_srv_metadata_status_respond
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/full_status_msg_list.sh b/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/full_status_msg_list.sh
index fb60110ad7b..7a226017470 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/full_status_msg_list.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/full_status_msg_list.sh
@@ -22,11 +22,9 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 6. The client keeps track of the number of received status messages. When X messages have been
# received, the client pass if the sequence of received status messages corresponds to the order
# in which the messages were sent, or the test fails.
-conf=prj_mesh1d1_conf
RunTest mesh_op_agg_test_max_access_payload \
op_agg_cli_max_len_sequence_msg_send op_agg_srv_max_len_status_msg_send
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_op_agg_test_max_access_payload_psa \
op_agg_cli_max_len_sequence_msg_send op_agg_srv_max_len_status_msg_send
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/loopback.sh b/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/loopback.sh
index 3a4720bdaf4..7d2c7eec7d2 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/loopback.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/loopback.sh
@@ -12,11 +12,9 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 2. The device starts sending the sequence on loopback.
# 3. The device verifies that the sequence is correctly received by the server model.
# 4. The device confirms that the client model received all status messages.
-conf=prj_mesh1d1_conf
RunTest mesh_op_agg_model_coex_loopback \
op_agg_dut_model_coex_loopback
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_op_agg_model_coex_loopback \
op_agg_dut_model_coex_loopback
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/model_coex.sh b/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/model_coex.sh
index 08fcdf9f41e..928abd666f9 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/model_coex.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/model_coex.sh
@@ -21,11 +21,9 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# aggregated sequence from the DUT device is correctly received.
# 5. Finally, the DUT device waits and confirms that it received all status messages
# related to its own aggregated sequence from the cli device.
-conf=prj_mesh1d1_conf
RunTest mesh_op_agg_model_coex \
op_agg_tester_model_coex op_agg_dut_model_coex
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_op_agg_model_coex \
op_agg_tester_model_coex op_agg_dut_model_coex
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh
index 0392430adba..cf9ec54faec 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh
@@ -31,60 +31,25 @@ overlay=overlay_pst_conf
RunTestFlash mesh_pst_access_data_check persistence_access_data_load -flash_rm \
-- -argstest access-cfg=not-configured
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_access_data_check_1d1 persistence_access_data_save -flash_erase
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_access_data_check_1d1 persistence_access_data_load \
- -- -argstest access-cfg=configured
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_access_data_check_1d1 persistence_access_sub_overwrite \
- -- -argstest access-cfg=configured
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_access_data_check_1d1 persistence_access_data_load \
- -- -argstest access-cfg=new-subs
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_access_data_check_1d1 persistence_access_data_remove \
- -- -argstest access-cfg=new-subs
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_access_data_check_1d1 persistence_access_data_load -flash_rm \
- -- -argstest access-cfg=not-configured
-
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_access_data_check_psa persistence_access_data_save -flash_erase
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_access_data_check_psa persistence_access_data_load \
-- -argstest access-cfg=configured
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_access_data_check_psa persistence_access_sub_overwrite \
-- -argstest access-cfg=configured
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_access_data_check_psa persistence_access_data_load \
-- -argstest access-cfg=new-subs
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_access_data_check_psa persistence_access_data_remove \
-- -argstest access-cfg=new-subs
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_access_data_check_psa persistence_access_data_load -flash_rm \
-- -argstest access-cfg=not-configured
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh
index bb3074905a9..f9655ef7462 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh
@@ -24,42 +24,18 @@ overlay=overlay_pst_conf
RunTestFlash mesh_pst_cfg_check persistence_cfg_load -flash_rm \
-- -argstest stack-cfg=1
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_cfg_check_1d1 persistence_cfg_save -flash_erase \
- -- -argstest stack-cfg=0
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_cfg_check_1d1 persistence_cfg_load -flash_rm \
- -- -argstest stack-cfg=0
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_cfg_check_1d1 persistence_cfg_save -flash_erase \
- -- -argstest stack-cfg=1
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_cfg_check_1d1 persistence_cfg_load -flash_rm \
- -- -argstest stack-cfg=1
-
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_cfg_check_psa persistence_cfg_save -flash_erase \
-- -argstest stack-cfg=0
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_cfg_check_psa persistence_cfg_load -flash_rm \
-- -argstest stack-cfg=0
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_cfg_check_psa persistence_cfg_save -flash_erase \
-- -argstest stack-cfg=1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_cfg_check_psa persistence_cfg_load -flash_rm \
-- -argstest stack-cfg=1
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh
index f1e0591ef13..8dc7baa3e9d 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh
@@ -16,18 +16,8 @@ RunTestFlash mesh_pst_prov_data_check persistence_provisioning_data_save -flash_
overlay=overlay_pst_conf
RunTestFlash mesh_pst_prov_data_check persistence_provisioning_data_load -flash_rm
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_prov_data_check_1d1 persistence_provisioning_data_save -flash_erase
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTestFlash mesh_pst_prov_data_check_1d1 persistence_provisioning_data_load -flash_rm
-
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_prov_data_check_psa persistence_provisioning_data_save -flash_erase
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_pst_prov_data_check_psa persistence_provisioning_data_load -flash_rm
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh
index 922b4c8a513..511c04f766f 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh
@@ -20,25 +20,11 @@ RunTest mesh_pst_repr persistence_reprovisioning_device \
-flash=../results/mesh_pst_repr/flash.bin -flash_rm \
persistence_reprovisioning_provisioner
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTest mesh_pst_repr_1d1 persistence_reprovisioning_device \
- -flash=../results/mesh_pst_repr_1d1/flash.bin -flash_erase \
- persistence_reprovisioning_provisioner
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTest mesh_pst_repr_1d1 persistence_reprovisioning_device \
- -flash=../results/mesh_pst_repr_1d1/flash.bin -flash_rm \
- persistence_reprovisioning_provisioner
-
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_pst_repr_psa persistence_reprovisioning_device \
-flash=../results/mesh_pst_repr_psa/flash.bin -flash_erase \
persistence_reprovisioning_provisioner
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_pst_repr_psa persistence_reprovisioning_device \
-flash=../results/mesh_pst_repr_psa/flash.bin -flash_rm \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_adv.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_adv.sh
index 48724dd7fbd..36c322a54da 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_adv.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_adv.sh
@@ -6,9 +6,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test Private Beacon advertising on node supporting relay feature.
# Test Random value changes for different Random intervals (10s, 0 - on every beacon, 30s).
-conf=prj_mesh1d1_conf
RunTest mesh_priv_beacon_adv beacon_rx_priv_adv beacon_tx_priv_adv
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_priv_beacon_adv_psa beacon_rx_priv_adv beacon_tx_priv_adv
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_cache.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_cache.sh
index 0cb5cdaea0a..46a460c7ec7 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_cache.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_cache.sh
@@ -12,12 +12,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 2. TX device sends a secondary private beacons to the RX device, marking the end of the test.
# 3. RX device verifies that only one of the two identical beacons was processed.
-conf=prj_mesh1d1_conf
RunTest mesh_priv_beacon_cache \
beacon_tx_priv_beacon_cache \
beacon_rx_priv_beacon_cache
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_priv_beacon_cache \
beacon_tx_priv_beacon_cache \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_interleave.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_interleave.sh
index 6d574a72c73..cda94a89d93 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_interleave.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_interleave.sh
@@ -15,9 +15,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# - PRB is disabled, SNB enabled: second SNB is advertised
# - KR is initiated, third SNB is advertised with new flags (IVU + KR)
# - PRB is enabled, SNB is disabled. Third PRB is advertised
-conf=prj_mesh1d1_conf
RunTest mesh_priv_beacon_interleave beacon_rx_priv_interleave beacon_tx_priv_interleave
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_priv_beacon_interleave_psa beacon_rx_priv_interleave beacon_tx_priv_interleave
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_invalid.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_invalid.sh
index b1983284a51..028ba0eabff 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_invalid.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_invalid.sh
@@ -5,9 +5,7 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test if Private Beacons with invalid data do not affect device
-conf=prj_mesh1d1_conf
RunTest mesh_priv_beacon_invalid beacon_rx_priv_invalid beacon_tx_priv_invalid
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_priv_beacon_invalid_psa beacon_rx_priv_invalid beacon_tx_priv_invalid
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu.sh
index bb9a591fcb0..32232573305 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu.sh
@@ -5,13 +5,11 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test Private Beacon advertising during IV Update procedure
-conf=prj_mesh1d1_conf
RunTest mesh_priv_beacon_on_iv_update \
beacon_rx_on_iv_update \
beacon_tx_priv_on_iv_update \
-- -argstest rand-int=1
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_priv_beacon_on_iv_update_psa \
beacon_rx_on_iv_update \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu_long_interval.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu_long_interval.sh
index ad0d11dbc96..d44ba297a0e 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu_long_interval.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu_long_interval.sh
@@ -7,13 +7,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test Private Beacon advertising during IV Update procedure, with long Random Interval set.
# Random value is expected to change before Random Interval is reached due to
# Flags field change.
-conf=prj_mesh1d1_conf
RunTest mesh_priv_beacon_on_iv_update_long_interval \
beacon_rx_on_iv_update \
beacon_tx_priv_on_iv_update \
-- -argstest rand-int=3
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_priv_beacon_on_iv_update_long_interval_psa \
beacon_rx_on_iv_update \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr.sh
index eaf6338684f..59fe95658c2 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr.sh
@@ -5,13 +5,11 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test Private Beacon advertising during Key Refresh procedure
-conf=prj_mesh1d1_conf
RunTest mesh_priv_beacon_on_key_refresh \
beacon_rx_on_key_refresh \
beacon_tx_priv_on_key_refresh \
-- -argstest rand-int=1
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_priv_beacon_on_key_refresh_psa \
beacon_rx_on_key_refresh \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr_long_interval.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr_long_interval.sh
index cc5722e4432..b0ec45b3f1d 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr_long_interval.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr_long_interval.sh
@@ -7,13 +7,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test Private Beacon advertising during Key Refresh procedure, with long Random Interval set.
# Random value is expected to change before Random Interval is reached due to
# Flags field change.
-conf=prj_mesh1d1_conf
RunTest mesh_priv_beacon_on_key_refresh_long_interval \
beacon_rx_on_key_refresh \
beacon_tx_priv_on_key_refresh \
-- -argstest rand-int=3
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_priv_beacon_on_key_refresh_long_interval_psa \
beacon_rx_on_key_refresh \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_gatt.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_gatt.sh
index a1b9ea7d8d6..8080b6ec70f 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_gatt.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_gatt.sh
@@ -17,13 +17,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 4. Both TX and RX device verifies that the IV index has been updated.
# This proves that the RX device (Proxy CLI) successfully received
# a Private beacon over the GATT connection
-conf=prj_mesh1d1_conf
overlay=overlay_gatt_conf
RunTest mesh_priv_proxy_gatt_priv_beacon \
beacon_tx_priv_gatt_proxy \
beacon_rx_priv_gatt_proxy
-conf=prj_mesh1d1_conf
overlay=overlay_gatt_conf_overlay_psa_conf
RunTest mesh_priv_proxy_gatt_priv_beacon \
beacon_tx_priv_gatt_proxy \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id.sh
index 02fcf03c001..a431cdd9f6b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id.sh
@@ -18,13 +18,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 5. Test passes if the random field of the two Private Net ID advertisements
# are NOT equal.
-conf=prj_mesh1d1_conf
overlay=overlay_gatt_conf
RunTest mesh_priv_proxy_net_id \
beacon_tx_priv_net_id \
beacon_rx_priv_net_id
-conf=prj_mesh1d1_conf
overlay=overlay_gatt_conf_overlay_psa_conf
RunTest mesh_priv_proxy_net_id \
beacon_tx_priv_net_id \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id_multi.sh
index 9d89b5af36c..cffb5adbeb0 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id_multi.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_net_id_multi.sh
@@ -15,13 +15,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# advertisemen from each of the networks within the given time
# limit.
-conf=prj_mesh1d1_conf
overlay=overlay_gatt_conf
RunTest mesh_priv_proxy_net_id_multi \
beacon_tx_priv_multi_net_id \
beacon_rx_priv_multi_net_id
-conf=prj_mesh1d1_conf
overlay=overlay_gatt_conf_overlay_psa_conf
RunTest mesh_priv_proxy_net_id_multi \
beacon_tx_priv_multi_net_id \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_node_id.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_node_id.sh
index 2aff351bd78..2557c9c1506 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_node_id.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_proxy_node_id.sh
@@ -23,13 +23,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 5. Test passes if the random field of the two Private Node ID advertisements
# are NOT equal.
-conf=prj_mesh1d1_conf
overlay=overlay_gatt_conf
RunTest mesh_priv_proxy_node_id \
beacon_tx_priv_node_id \
beacon_rx_priv_node_id
-conf=prj_mesh1d1_conf
overlay=overlay_gatt_conf_overlay_psa_conf
RunTest mesh_priv_proxy_node_id \
beacon_tx_priv_node_id \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/proxy_adv_multi_subnet_coex.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/proxy_adv_multi_subnet_coex.sh
index 42863a13458..0a3b5771bfd 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/proxy_adv_multi_subnet_coex.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/proxy_adv_multi_subnet_coex.sh
@@ -43,14 +43,12 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# to the adv medium again.
-conf=prj_mesh1d1_conf
overlay=overlay_gatt_conf
RunTest proxy_adv_multi_subnet_coex \
beacon_tx_proxy_adv_multi_subnet_coex \
beacon_rx_proxy_adv_multi_subnet_coex \
beacon_tx_proxy_adv_solicit_trigger
-conf=prj_mesh1d1_conf
overlay=overlay_gatt_conf_overlay_psa_conf
RunTest proxy_adv_multi_subnet_coex \
beacon_tx_proxy_adv_multi_subnet_coex \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_one_duration.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_one_duration.sh
index 168c2620212..36c996269cf 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_one_duration.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_one_duration.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_prov_iv_update_one_duration prov_provisioner_iv_update_flag_one
-conf=prj_mesh1d1_conf
-RunTest mesh_prov_iv_update_one_duration_1d1 prov_provisioner_iv_update_flag_one
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_iv_update_one_duration_psa prov_provisioner_iv_update_flag_one
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh
index 07165b31c1d..cb3294950f8 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_prov_iv_update_zero_duration prov_provisioner_iv_update_flag_zero
-conf=prj_mesh1d1_conf
-RunTest mesh_prov_iv_update_zero_duration_1d1 prov_provisioner_iv_update_flag_zero
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_iv_update_zero_duration_psa prov_provisioner_iv_update_flag_zero
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh
index 7d8dfbe6388..61bbbcc1a27 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh
@@ -13,14 +13,6 @@ RunTest mesh_prov_pb_adv_multi \
prov_device_pb_adv_no_oob \
prov_device_pb_adv_no_oob
-conf=prj_mesh1d1_conf
-RunTest mesh_prov_pb_adv_multi_1d1 \
- prov_provisioner_pb_adv_multi \
- prov_device_pb_adv_no_oob \
- prov_device_pb_adv_no_oob \
- prov_device_pb_adv_no_oob
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_pb_adv_multi_psa \
prov_provisioner_pb_adv_multi \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh
index bfcb8540ae1..91bde356f2b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh
@@ -8,12 +8,6 @@ RunTest mesh_prov_pb_adv_on_oob \
prov_device_pb_adv_no_oob \
prov_provisioner_pb_adv_no_oob
-conf=prj_mesh1d1_conf
-RunTest mesh_prov_pb_adv_on_oob_1d1 \
- prov_device_pb_adv_no_oob \
- prov_provisioner_pb_adv_no_oob
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_pb_adv_on_oob_psa \
prov_device_pb_adv_no_oob \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh
index 22d197a0adc..ef8e07f7c80 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh
@@ -8,11 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_prov_pb_adv_oob_auth \
prov_device_pb_adv_oob_auth prov_provisioner_pb_adv_oob_auth
-conf=prj_mesh1d1_conf
-RunTest mesh_prov_pb_adv_oob_auth_1d1 \
- prov_device_pb_adv_oob_auth prov_provisioner_pb_adv_oob_auth
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_pb_adv_oob_auth_psa \
prov_device_pb_adv_oob_auth prov_provisioner_pb_adv_oob_auth
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh
index 5459997e547..8df3c6a4bf6 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh
@@ -9,11 +9,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk \
prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_auth_no_oob_public_key
-conf=prj_mesh1d1_conf
-RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk_1d1 \
- prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_auth_no_oob_public_key
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk_psa \
prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_auth_no_oob_public_key
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh
index b8ab3a5d899..d24e5afccd4 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh
@@ -8,11 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_prov_pb_adv_oob_public_key \
prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_public_key
-conf=prj_mesh1d1_conf
-RunTest mesh_prov_pb_adv_oob_public_key_1d1 \
- prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_public_key
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_pb_adv_oob_public_key_psa \
prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_public_key
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh
index 9c70514a093..0e3b84e3138 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh
@@ -8,12 +8,6 @@ RunTest mesh_prov_pb_adv_repr \
prov_device_pb_adv_reprovision \
prov_provisioner_pb_adv_reprovision
-conf=prj_mesh1d1_conf
-RunTest mesh_prov_pb_adv_repr_1d1 \
- prov_device_pb_adv_reprovision \
- prov_provisioner_pb_adv_reprovision
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_pb_adv_repr_psa \
prov_device_pb_adv_reprovision \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_client_server_same_dev.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_client_server_same_dev.sh
index 33de74370e1..9175a9ac015 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_client_server_same_dev.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_client_server_same_dev.sh
@@ -20,12 +20,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# composition refresh procedure on it self with local RPR client and server.
# 7. The first device (prov_device_pb_remote_client_server_same_dev) execute
# address refresh procedure on it self with local RPR client and server.
-conf=prj_mesh1d1_conf
RunTest mesh_prov_pb_remote_client_server_same_dev \
prov_device_pb_remote_client_server_same_dev \
prov_device_pb_remote_server_same_dev
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_pb_remote_client_server_same_dev \
prov_device_pb_remote_client_server_same_dev \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh
index d707fdb6d6c..a59cf04aef4 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh
@@ -13,13 +13,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 4. Execute composition refresh procedure 3 times for the third device.
# 5. Execute address refresh procedure 3 times for the third device.
# (Step 3-5 is executed without sending a node reset message)
-conf=prj_mesh1d1_conf
RunTest mesh_prov_pb_remote_nppi_robustness \
prov_provisioner_pb_remote_client_nppi_robustness \
prov_device_pb_remote_server_unproved \
prov_device_pb_remote_server_nppi_robustness
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_pb_remote_nppi_robustness_psa \
prov_provisioner_pb_remote_client_nppi_robustness \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
index 2c3394381cd..6ecb3292193 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh
@@ -11,14 +11,12 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 4. The provisioner scans for an unprovisioned device idx 3 through the node with RPR server;
# 5. The provisioner checks scanning and provisioning succeeded;
# 6. The provisioner provisions an unprovisioned device idx 3 through the node with RPR server;
-conf=prj_mesh1d1_conf
RunTest mesh_prov_pb_remote_parallel \
prov_provisioner_pb_remote_client_parallel \
prov_device_pb_remote_server_unproved \
prov_device_pb_adv_no_oob \
prov_device_pb_adv_no_oob
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_pb_remote_parallel_psa \
prov_provisioner_pb_remote_client_parallel \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh
index ed5f619b310..2bba5147d8f 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh
@@ -31,7 +31,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# - verify that the device is not re-provisioned again.
# Step 1
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash mesh_prov_pst_pb_remote_ncrp \
prov_provisioner_pb_remote_client_ncrp_provision -flash_erase \
@@ -39,7 +38,6 @@ RunTestFlash mesh_prov_pst_pb_remote_ncrp \
prov_device_pb_remote_server_ncrp_prepare -flash_erase
# Step 2
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash mesh_prov_pst_pb_remote_ncrp \
prov_provisioner_pb_remote_client_ncrp \
@@ -47,7 +45,6 @@ RunTestFlash mesh_prov_pst_pb_remote_ncrp \
prov_device_pb_remote_server_ncrp
# Step 3
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash mesh_prov_pst_pb_remote_ncrp \
prov_provisioner_pb_remote_client_ncrp_second_time -flash_rm \
@@ -56,7 +53,6 @@ RunTestFlash mesh_prov_pst_pb_remote_ncrp \
# The same test but with PSA crypto
# Step 1
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_prov_pst_pb_remote_ncrp_psa \
prov_provisioner_pb_remote_client_ncrp_provision -flash_erase \
@@ -64,7 +60,6 @@ RunTestFlash mesh_prov_pst_pb_remote_ncrp_psa \
prov_device_pb_remote_server_ncrp_prepare -flash_erase
# Step 2
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_prov_pst_pb_remote_ncrp_psa \
prov_provisioner_pb_remote_client_ncrp \
@@ -72,7 +67,6 @@ RunTestFlash mesh_prov_pst_pb_remote_ncrp_psa \
prov_device_pb_remote_server_ncrp
# Step 3
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash mesh_prov_pst_pb_remote_ncrp_psa \
prov_provisioner_pb_remote_client_ncrp_second_time -flash_rm \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
index a49cbcd7ca9..1a2ae89d655 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh
@@ -12,13 +12,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 5. The provisioner configures the health server on the recently provisioned device and sends Node
# Reset;
# 6. Repeat steps 3-5 multiple times.
-conf=prj_mesh1d1_conf
RunTest mesh_prov_pb_remote_reprovision \
prov_provisioner_pb_remote_client_reprovision \
prov_device_pb_remote_server_unproved \
prov_device_pb_adv_reprovision
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_pb_remote_reprovision_psa \
prov_provisioner_pb_remote_client_reprovision \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
index 8ef61c2666b..7feba542c44 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh
@@ -24,13 +24,11 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 11. 3rd device opens provisioning link.
# 12. 2nd device stops communicating with either devices.
# 13. After 60s RPR timeout is reached on 1st device. RPR Client closes provisioning link.
-conf=prj_mesh1d1_conf
RunTest mesh_prov_pb_remote_provisioning_timeout \
prov_provisioner_pb_remote_client_provision_timeout \
prov_device_pb_remote_server_unproved_unresponsive \
prov_device_unresponsive
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_prov_pb_remote_provisioning_timeout_psa \
prov_provisioner_pb_remote_client_provision_timeout \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh
index 50387776dfb..d09e014bd0e 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh
@@ -14,25 +14,11 @@ RunTest mesh_replay_attack \
rpc_tx_power_replay_attack \
rpc_rx_power_replay_attack -flash=../results/mesh_replay_attack/flash.bin -flash_rm
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTest mesh_replay_attack_1d1 \
- rpc_tx_immediate_replay_attack \
- rpc_rx_immediate_replay_attack -flash=../results/mesh_replay_attack_1d1/flash.bin -flash_erase
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTest mesh_replay_attack_1d1 \
- rpc_tx_power_replay_attack \
- rpc_rx_power_replay_attack -flash=../results/mesh_replay_attack_1d1/flash.bin -flash_rm
-
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_replay_attack_psa \
rpc_tx_immediate_replay_attack \
rpc_rx_immediate_replay_attack -flash=../results/mesh_replay_attack_psa/flash.bin -flash_erase
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_replay_attack_psa \
rpc_tx_power_replay_attack \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh
index 8c7a7866eb3..7212b567a24 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh
@@ -21,24 +21,11 @@ overlay=overlay_pst_conf
RunTest mesh_replay_fragmentation \
rpc_rx_reboot_after_defrag -flash=../results/mesh_replay_fragmentation/flash.bin -flash_rm
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTest mesh_replay_fragmentation_1d1 \
- rpc_rx_rpl_frag -flash=../results/mesh_replay_fragmentation_1d1/flash.bin -flash_erase \
- rpc_tx_rpl_frag
-
-conf=prj_mesh1d1_conf
-overlay=overlay_pst_conf
-RunTest mesh_replay_fragmentation_1d1 \
- rpc_rx_reboot_after_defrag -flash=../results/mesh_replay_fragmentation_1d1/flash.bin -flash_rm
-
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_replay_fragmentation_psa \
rpc_rx_rpl_frag -flash=../results/mesh_replay_fragmentation_psa/flash.bin -flash_erase \
rpc_tx_rpl_frag
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_replay_fragmentation_psa \
rpc_rx_reboot_after_defrag -flash=../results/mesh_replay_fragmentation_psa/flash.bin -flash_rm
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh b/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh
index dc27c4dceda..0e67d5ab4d5 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh
@@ -8,12 +8,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Tests must be added in sequence.
# First test sets SAR TX/RX configuration.
# Second test restores it from flash and checks if configuration persisted.
-conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash sar_persistence sar_srv_cfg_store -flash_erase
RunTestFlash sar_persistence sar_srv_cfg_restore -flash_rm
-conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash sar_persistence_psa sar_srv_cfg_store -flash_erase
RunTestFlash sar_persistence_psa sar_srv_cfg_restore -flash_rm
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/sar/slow_transfer_test.sh b/tests/bsim/bluetooth/mesh/tests_scripts/sar/slow_transfer_test.sh
index a022c23c3f4..db8f8f9dc21 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/sar/slow_transfer_test.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/sar/slow_transfer_test.sh
@@ -14,11 +14,9 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 4. The Client sends a Get-message with a maximum length SDU, targeting the server.
# 5. The Server responds with a maximum length SDU Status-message.
# 6. The test passes when the Client successfully receives the Status response.
-conf=prj_mesh1d1_conf
RunTest sar_slow_test \
sar_cli_max_len_sdu_slow_send sar_srv_max_len_sdu_slow_receive
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest sar_slow_test_psa \
sar_cli_max_len_sdu_slow_send sar_srv_max_len_sdu_slow_receive
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/sar/stress_test.sh b/tests/bsim/bluetooth/mesh/tests_scripts/sar/stress_test.sh
index 89707adf031..34b05446702 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/sar/stress_test.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/sar/stress_test.sh
@@ -13,11 +13,9 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 4. The Client sends a Get-message with a maximum length SDU, targeting the server.
# 5. The Server responds with a maximum length SDU Status-message.
# 6. The test passes when the Client successfully receives the Status response.
-conf=prj_mesh1d1_conf
RunTest sar_test \
sar_cli_max_len_sdu_send sar_srv_max_len_sdu_receive
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest sar_test_psa \
sar_cli_max_len_sdu_send sar_srv_max_len_sdu_receive
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/scanner/invalid_ad_type.sh b/tests/bsim/bluetooth/mesh/tests_scripts/scanner/invalid_ad_type.sh
index 9199ac69da8..c46088c5a15 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/scanner/invalid_ad_type.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/scanner/invalid_ad_type.sh
@@ -8,12 +8,6 @@ RunTest mesh_scanner_invalid_ad_type \
scanner_tx_invalid_ad_type \
scanner_rx_invalid_packet
-conf=prj_mesh1d1_conf
-RunTest mesh_scanner_invalid_ad_type_1d1 \
- scanner_tx_invalid_ad_type \
- scanner_rx_invalid_packet
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_scanner_invalid_ad_type_psa \
scanner_tx_invalid_ad_type \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/scanner/wrong_packet_length.sh b/tests/bsim/bluetooth/mesh/tests_scripts/scanner/wrong_packet_length.sh
index 8f0919058ed..80f8cacca83 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/scanner/wrong_packet_length.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/scanner/wrong_packet_length.sh
@@ -8,12 +8,6 @@ RunTest mesh_scanner_wrong_packet_length \
scanner_tx_wrong_packet_length \
scanner_rx_invalid_packet
-conf=prj_mesh1d1_conf
-RunTest mesh_scanner_wrong_packet_length_1d1 \
- scanner_tx_wrong_packet_length \
- scanner_rx_invalid_packet
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_scanner_wrong_packet_length_psa \
scanner_tx_wrong_packet_length \
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/suspend/gatt_suspend_disable_resume.sh b/tests/bsim/bluetooth/mesh/tests_scripts/suspend/gatt_suspend_disable_resume.sh
index c723ea38610..711f92f4007 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/suspend/gatt_suspend_disable_resume.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/suspend/gatt_suspend_disable_resume.sh
@@ -22,17 +22,10 @@ overlay=overlay_gatt_conf
RunTest mesh_gatt_suspend_disable_resume \
suspend_dut_gatt_suspend_disable_resume suspend_tester_gatt
-conf=prj_mesh1d1_conf
overlay="overlay_gatt_conf_overlay_low_lat_conf"
RunTest mesh_gatt_suspend_disable_resume_low_lat \
suspend_dut_gatt_suspend_disable_resume suspend_tester_gatt
-conf=prj_mesh1d1_conf
-overlay=overlay_gatt_conf
-RunTest mesh_gatt_suspend_disable_resume_1d1 \
- suspend_dut_gatt_suspend_disable_resume suspend_tester_gatt
-
-conf=prj_mesh1d1_conf
overlay="overlay_gatt_conf_overlay_psa_conf"
RunTest mesh_gatt_suspend_disable_resume_psa \
suspend_dut_gatt_suspend_disable_resume suspend_tester_gatt
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/suspend/gatt_suspend_resume.sh b/tests/bsim/bluetooth/mesh/tests_scripts/suspend/gatt_suspend_resume.sh
index dc29ecfeadf..f0e4fb23502 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/suspend/gatt_suspend_resume.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/suspend/gatt_suspend_resume.sh
@@ -22,17 +22,10 @@ overlay=overlay_gatt_conf
RunTest mesh_gatt_suspend_resume \
suspend_dut_gatt_suspend_resume suspend_tester_gatt
-conf=prj_mesh1d1_conf
overlay="overlay_gatt_conf_overlay_low_lat_conf"
RunTest mesh_gatt_suspend_resume_low_lat \
suspend_dut_gatt_suspend_resume suspend_tester_gatt
-conf=prj_mesh1d1_conf
-overlay=overlay_gatt_conf
-RunTest mesh_gatt_suspend_resume_1d1 \
- suspend_dut_gatt_suspend_resume suspend_tester_gatt
-
-conf=prj_mesh1d1_conf
overlay="overlay_gatt_conf_overlay_psa_conf"
RunTest mesh_gatt_suspend_resume_psa \
suspend_dut_gatt_suspend_resume suspend_tester_gatt
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/suspend/suspend_disable_resume.sh b/tests/bsim/bluetooth/mesh/tests_scripts/suspend/suspend_disable_resume.sh
index 3329cc2d2bd..bfe42e15c16 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/suspend/suspend_disable_resume.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/suspend/suspend_disable_resume.sh
@@ -19,15 +19,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_suspend_disable_resume \
suspend_dut_suspend_disable_resume suspend_tester_pub
-conf=prj_mesh1d1_conf
-RunTest mesh_suspend_disable_resume_1d1 \
- suspend_dut_suspend_disable_resume suspend_tester_pub
-
overlay=overlay_low_lat_conf
RunTest mesh_suspend_disable_resume_low_lat \
suspend_dut_suspend_disable_resume suspend_tester_pub
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_suspend_disable_resume_psa \
suspend_dut_suspend_disable_resume suspend_tester_pub
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/suspend/suspend_resume.sh b/tests/bsim/bluetooth/mesh/tests_scripts/suspend/suspend_resume.sh
index 90e1623b62b..31d151201a8 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/suspend/suspend_resume.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/suspend/suspend_resume.sh
@@ -18,15 +18,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_suspend_resume \
suspend_dut_suspend_resume suspend_tester_pub
-conf=prj_mesh1d1_conf
-RunTest mesh_suspend_resume_1d1 \
- suspend_dut_suspend_resume suspend_tester_pub
-
overlay=overlay_low_lat_conf
RunTest mesh_suspend_resume_low_lat \
suspend_dut_suspend_resume suspend_tester_pub
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_suspend_resume_psa \
suspend_dut_suspend_resume suspend_tester_pub
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/fixed.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/fixed.sh
index d4b86d2f98a..f4d0cfc0cac 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/fixed.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/fixed.sh
@@ -15,9 +15,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# model;
RunTest mesh_transport_fixed transport_tx_fixed transport_rx_fixed
-conf=prj_mesh1d1_conf
-RunTest mesh_transport_fixed_1d1 transport_tx_fixed transport_rx_fixed
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_transport_fixed_1d1 transport_tx_fixed transport_rx_fixed
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/group.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/group.sh
index d85d7cf8604..7b7c6a559fc 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/group.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/group.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_transport_group transport_tx_group transport_rx_group
-conf=prj_mesh1d1_conf
-RunTest mesh_transport_group_1d1 transport_tx_group transport_rx_group
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_transport_group_psa transport_tx_group transport_rx_group
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback.sh
index 9cc1fb33041..e2812efda23 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest transport_loopback transport_tx_loopback transport_rx_none
-conf=prj_mesh1d1_conf
-RunTest transport_loopback_1d1 transport_tx_loopback transport_rx_none
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest transport_loopback_psa transport_tx_loopback transport_rx_none
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group.sh
index 3be2bb24367..38b6c8dd906 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_transport_loopback_group transport_tx_loopback_group transport_rx_group
-conf=prj_mesh1d1_conf
-RunTest mesh_transport_loopback_group_1d1 transport_tx_loopback_group transport_rx_group
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_transport_loopback_group_psa transport_tx_loopback_group transport_rx_group
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group_low_lat.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group_low_lat.sh
index 63829e012a5..3972edd3034 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group_low_lat.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group_low_lat.sh
@@ -7,10 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
overlay=overlay_low_lat_conf
RunTest mesh_transport_loopback_group_low_lat transport_tx_loopback_group transport_rx_group
-conf=prj_mesh1d1_conf
-overlay=overlay_low_lat_conf
-RunTest mesh_transport_loopback_group_low_lat_1d1 transport_tx_loopback_group transport_rx_group
-
-conf=prj_mesh1d1_conf
overlay="overlay_low_lat_conf_overlay_psa_conf"
RunTest mesh_transport_loopback_group_low_lat_psa transport_tx_loopback_group transport_rx_group
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_block.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_block.sh
index 21a56f37478..788d3eeebdf 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_block.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_block.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_transport_seg_block transport_tx_seg_block transport_rx_seg_block
-conf=prj_mesh1d1_conf
-RunTest mesh_transport_seg_block_1d1 transport_tx_seg_block transport_rx_seg_block
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_transport_seg_block_psa transport_tx_seg_block transport_rx_seg_block
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_concurrent.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_concurrent.sh
index 40ba38aae12..d07c90c8d22 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_concurrent.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_concurrent.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_transport_seg_concurrent transport_tx_seg_concurrent transport_rx_seg_concurrent
-conf=prj_mesh1d1_conf
-RunTest mesh_transport_seg_concurrent_1d1 transport_tx_seg_concurrent transport_rx_seg_concurrent
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_transport_seg_concurrent_psa transport_tx_seg_concurrent transport_rx_seg_concurrent
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_fail.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_fail.sh
index ca650ede1f4..72639370b93 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_fail.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_fail.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_transport_seg_fail transport_tx_seg_fail
-conf=prj_mesh1d1_conf
-RunTest mesh_transport_seg_fail_1d1 transport_tx_seg_fail
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_transport_seg_fail_psa transport_tx_seg_fail
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_ivu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_ivu.sh
index 9268e42029e..0ef30273341 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_ivu.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_ivu.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_transport_seg_ivu transport_tx_seg_ivu transport_rx_seg_ivu
-conf=prj_mesh1d1_conf
-RunTest mesh_transport_seg_ivu_1d1 transport_tx_seg_ivu transport_rx_seg_ivu
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_transport_seg_ivu_psa transport_tx_seg_ivu transport_rx_seg_ivu
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast.sh
index a107a86146c..c91397f4f4b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_transport_unicast transport_tx_unicast transport_rx_unicast
-conf=prj_mesh1d1_conf
-RunTest mesh_transport_unicast_1d1 transport_tx_unicast transport_rx_unicast
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_transport_unicast_psa transport_tx_unicast transport_rx_unicast
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast_low_lat.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast_low_lat.sh
index cbfc8ea5ce7..981347a3385 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast_low_lat.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast_low_lat.sh
@@ -7,10 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
overlay=overlay_low_lat_conf
RunTest mesh_transport_unicast_low_lat transport_tx_unicast transport_rx_unicast
-conf=prj_mesh1d1_conf
-overlay=overlay_low_lat_conf
-RunTest mesh_transport_unicast_low_lat_1d1 transport_tx_unicast transport_rx_unicast
-
-conf=prj_mesh1d1_conf
overlay="overlay_low_lat_conf_overlay_psa_conf"
RunTest mesh_transport_unicast_low_lat_psa transport_tx_unicast transport_rx_unicast
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unknown_app.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unknown_app.sh
index 2a1b2741b60..6f077ee0c8b 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unknown_app.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unknown_app.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_transport_unknown_app transport_tx_unknown_app transport_rx_none
-conf=prj_mesh1d1_conf
-RunTest mesh_transport_unknown_app_1d1 transport_tx_unknown_app transport_rx_none
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_transport_unknown_app_psa transport_tx_unknown_app transport_rx_none
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/va.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/va.sh
index 698bd164485..4336a2aa042 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/va.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/va.sh
@@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_transport_va transport_tx_va transport_rx_va
-conf=prj_mesh1d1_conf
-RunTest mesh_transport_va_1d1 transport_tx_va transport_rx_va
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_transport_va_psa transport_tx_va transport_rx_va
diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/va_collision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/va_collision.sh
index 631c43790ef..dbcc3c64bc7 100755
--- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/va_collision.sh
+++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/va_collision.sh
@@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test transmission to virtual addresses with collision
RunTest mesh_transport_va_collision transport_tx_va_collision transport_rx_va_collision
-conf=prj_mesh1d1_conf
-RunTest mesh_transport_va_collision_1d1 transport_tx_va_collision transport_rx_va_collision
-
-conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_transport_va_collision_psa transport_tx_va_collision transport_rx_va_collision