Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bluetooth: Controller: Enable ISO support in the SDC #12508

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Bluetooth: Controller: Enable ISO support in the SDC #12508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions subsys/bluetooth/controller/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ config BT_LL_SOFTDEVICE
select BT_CTLR_SYNC_TRANSFER_SENDER_SUPPORT
select BT_CTLR_SYNC_TRANSFER_RECEIVER_SUPPORT
select BT_CTLR_SCA_UPDATE_SUPPORT
select BT_CTLR_PERIPHERAL_ISO_SUPPORT
select BT_CTLR_CENTRAL_ISO_SUPPORT
select BT_CTLR_SYNC_ISO_SUPPORT
select BT_CTLR_ADV_ISO_SUPPORT
select BT_CTLR_PHY_2M_SUPPORT if HAS_HW_NRF_RADIO_BLE_2M
select BT_CTLR_PHY_CODED_SUPPORT if HAS_HW_NRF_RADIO_BLE_CODED
select BT_HAS_HCI_VS
Expand Down Expand Up @@ -131,6 +135,7 @@ config BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT_OVERRIDE

config BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT
int "Default max connection event length [us]"
default 10000 if BT_ISO && !BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT_OVERRIDE
default 7500 if !BT_CTLR_SDC_MAX_CONN_EVENT_LEN_DEFAULT_OVERRIDE
range 1250 4000000
help
Expand Down Expand Up @@ -240,6 +245,7 @@ choice BT_LL_SOFTDEVICE_VARIANT
BT_CTLR_SCA_UPDATE || \
BT_CTLR_SDC_PAWR_ADV || \
BT_CTLR_SDC_PAWR_SYNC || \
BT_ISO || \
SOC_NRF5340_CPUNET)
default BT_LL_SOFTDEVICE_CENTRAL if BT_OBSERVER
default BT_LL_SOFTDEVICE_PERIPHERAL if BT_BROADCASTER
Expand Down Expand Up @@ -270,6 +276,14 @@ config BT_LL_SOFTDEVICE_MULTIROLE

endchoice

config BT_LL_SOFTDEVICE_EXPERIMENTAL_ISO
bool "ISO Support in the SoftDevice Controller [EXPERIMENTAL]"
default BT_ISO
select EXPERIMENTAL
help
ISO support in the SoftDevice Controller is experimental.
It cannot be used in products as per now.

config BT_CTLR_FAL_SIZE
int "Configures the maximum number of addresses in the Filter Accept List"
range 0 255
Expand Down Expand Up @@ -319,6 +333,24 @@ config BT_CTLR_LE_POWER_CONTROL
Enable support for LE Power Control feature that defined in the Bluetooth
Core specification, Version 5.3 | Vol 6, Part B, Section 4.6.31.

config BT_CTLR_SDC_ISO_RX_PDU_BUFFER_COUNT
int "BT_CTLR_SDC_ISO_RX_PDU_BUFFER_COUNT"
depends on BT_CTLR_SYNC_ISO || BT_CTLR_CONN_ISO
range 0 10
default 3

config BT_CTLR_SDC_ISO_TX_HCI_BUFFER_COUNT
int "BT_CTLR_SDC_ISO_TX_HCI_BUFFER_COUNT"
depends on BT_CTLR_ADV_ISO || BT_CTLR_CONN_ISO
range 0 10
default 3

config BT_CTLR_SDC_ISO_TX_PDU_BUFFER_PER_STREAM_COUNT
int "BT_CTLR_SDC_ISO_TX_PDU_BUFFER_PER_STREAM_COUNT"
depends on BT_CTLR_ADV_ISO || BT_CTLR_CONN_ISO
range 1 32
default 3

config BT_UNINIT_MPSL_ON_DISABLE
bool "Uninitializes MPSL on BT disable"
depends on MPSL_DYNAMIC_INTERRUPTS
Expand Down
209 changes: 208 additions & 1 deletion subsys/bluetooth/controller/hci_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,60 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_BT_PERIPHERAL) ||

#define SDC_FAL_MEM_SIZE SDC_MEM_FAL(CONFIG_BT_CTLR_FAL_SIZE)

#if defined(CONFIG_BT_CTLR_CONN_ISO)
#define SDC_MEM_CIG SDC_MEM_PER_CIG(CONFIG_BT_CTLR_CONN_ISO_GROUPS)
#define SDC_MEM_CIS \
SDC_MEM_PER_CIS(CONFIG_BT_CTLR_CONN_ISO_STREAMS) + \
SDC_MEM_ISO_RX_SDU_POOL_SIZE(CONFIG_BT_CTLR_CONN_ISO_STREAMS)
#define SDC_CIS_COUNT CONFIG_BT_CTLR_CONN_ISO_STREAMS
#else
#define SDC_MEM_CIG 0
#define SDC_MEM_CIS 0
#define SDC_CIS_COUNT 0
#endif

#if defined(CONFIG_BT_CTLR_SYNC_ISO)
#define SDC_MEM_BIS_SINK \
SDC_MEM_PER_BIG(CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET) + \
SDC_MEM_PER_BIS(CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT) + \
SDC_MEM_ISO_RX_SDU_POOL_SIZE(CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT)
#define SDC_BIS_SINK_COUNT CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT
#else
#define SDC_MEM_BIS_SINK 0
#define SDC_BIS_SINK_COUNT 0
#endif

#if defined(CONFIG_BT_CTLR_ADV_ISO)
#define SDC_MEM_BIS_SOURCE \
SDC_MEM_PER_BIG(CONFIG_BT_CTLR_ADV_ISO_SET) + \
SDC_MEM_PER_BIS(CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT)
#define SDC_BIS_SOURCE_COUNT CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT
#else
#define SDC_MEM_BIS_SOURCE 0
#define SDC_BIS_SOURCE_COUNT 0
#endif

#if defined(CONFIG_BT_CTLR_SDC_ISO_RX_PDU_BUFFER_COUNT)
#define SDC_MEM_ISO_RX_POOL \
SDC_MEM_ISO_RX_PDU_POOL_SIZE(CONFIG_BT_CTLR_SDC_ISO_RX_PDU_BUFFER_COUNT)
#else
#define SDC_MEM_ISO_RX_POOL 0
#endif

#if defined(CONFIG_BT_CTLR_SDC_ISO_TX_HCI_BUFFER_COUNT) && \
defined(CONFIG_BT_CTLR_SDC_ISO_TX_PDU_BUFFER_PER_STREAM_COUNT)
#define SDC_MEM_ISO_TX_POOL \
SDC_MEM_ISO_TX_POOL_SIZE(CONFIG_BT_CTLR_SDC_ISO_TX_HCI_BUFFER_COUNT, \
CONFIG_BT_CTLR_SDC_ISO_TX_PDU_BUFFER_PER_STREAM_COUNT, \
SDC_CIS_COUNT, \
(SDC_BIS_SINK_COUNT + SDC_BIS_SOURCE_COUNT))
/* We should not have to allocate TX pool memory for CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT,
* but currently bis_count does not differentiate between ADV or SYNC streams.
*/
#else
#define SDC_MEM_ISO_TX_POOL 0
#endif

#define MEMPOOL_SIZE ((PERIPHERAL_COUNT * PERIPHERAL_MEM_SIZE) + \
(SDC_CENTRAL_COUNT * CENTRAL_MEM_SIZE) + \
(SDC_ADV_SET_MEM_SIZE) + \
Expand All @@ -171,7 +225,13 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_BT_PERIPHERAL) ||
(SDC_PERIODIC_SYNC_MEM_SIZE) + \
(SDC_PERIODIC_ADV_LIST_MEM_SIZE) + \
(SDC_SCAN_BUF_SIZE) + \
(SDC_FAL_MEM_SIZE))
(SDC_FAL_MEM_SIZE) + \
(SDC_MEM_CIG) + \
(SDC_MEM_CIS) + \
(SDC_MEM_BIS_SINK) + \
(SDC_MEM_BIS_SOURCE) + \
(SDC_MEM_ISO_RX_POOL) + \
(SDC_MEM_ISO_TX_POOL))

#if defined(CONFIG_BT_SDC_ADDITIONAL_MEMORY)
__aligned(8) uint8_t sdc_mempool[MEMPOOL_SIZE + CONFIG_BT_SDC_ADDITIONAL_MEMORY];
Expand Down Expand Up @@ -241,6 +301,27 @@ static int acl_handle(struct net_buf *acl)
}
#endif

#if defined(CONFIG_BT_CTLR_ISO_TX_BUFFERS)
static int iso_handle(struct net_buf *acl)
{
LOG_DBG("");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the point of this?


int errcode = MULTITHREADING_LOCK_ACQUIRE();

if (!errcode) {
errcode = sdc_hci_iso_data_put(acl->data);
MULTITHREADING_LOCK_RELEASE();

if (errcode) {
/* Likely buffer overflow event */
receive_signal_raise();
}
}

return errcode;
}
#endif

static int hci_driver_send(struct net_buf *buf)
{
int err;
Expand All @@ -263,6 +344,11 @@ static int hci_driver_send(struct net_buf *buf)
case BT_BUF_CMD:
err = cmd_handle(buf);
break;
#if defined(CONFIG_BT_CTLR_ISO_TX_BUFFERS)
case BT_BUF_ISO_OUT:
err = iso_handle(buf);
break;
#endif
default:
LOG_DBG("Unknown HCI type %u", type);
return -EINVAL;
Expand Down Expand Up @@ -302,6 +388,18 @@ static void data_packet_process(uint8_t *hci_buf)
bt_recv(data_buf);
}

static void iso_data_packet_process(uint8_t *hci_buf)
{
struct net_buf *data_buf = bt_buf_get_rx(BT_BUF_ISO_IN, K_FOREVER);
struct bt_hci_iso_hdr *hdr = (void *)hci_buf;

uint16_t len = sys_le16_to_cpu(hdr->len);

net_buf_add_mem(data_buf, &hci_buf[0], len + sizeof(*hdr));

bt_recv(data_buf);
}

static bool event_packet_is_discardable(const uint8_t *hci_buf)
{
struct bt_hci_evt_hdr *hdr = (void *)hci_buf;
Expand Down Expand Up @@ -409,6 +507,8 @@ static bool fetch_and_process_hci_msg(uint8_t *p_hci_buffer)
event_packet_process(p_hci_buffer);
} else if (msg_type == SDC_HCI_MSG_TYPE_DATA) {
data_packet_process(p_hci_buffer);
} else if (msg_type == SDC_HCI_MSG_TYPE_ISO) {
iso_data_packet_process(p_hci_buffer);
} else {
if (!IS_ENABLED(CONFIG_BT_CTLR_SDC_SILENCE_UNEXPECTED_MSG_TYPE)) {
LOG_ERR("Unexpected msg_type: %u. This if-else needs a new branch",
Expand Down Expand Up @@ -700,6 +800,34 @@ static int configure_supported_features(void)
}
}

if (IS_ENABLED(CONFIG_BT_CTLR_PERIPHERAL_ISO)) {
err = sdc_support_cis_peripheral();
if (err) {
return -ENOTSUP;
}
}

if (IS_ENABLED(CONFIG_BT_CTLR_CENTRAL_ISO)) {
err = sdc_support_cis_central();
if (err) {
return -ENOTSUP;
}
}

if (IS_ENABLED(CONFIG_BT_CTLR_ADV_ISO)) {
err = sdc_support_bis_source();
if (err) {
return -ENOTSUP;
}
}

if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_ISO)) {
err = sdc_support_bis_sink();
if (err) {
return -ENOTSUP;
}
}

return 0;
}

Expand All @@ -708,6 +836,10 @@ static int configure_memory_usage(void)
int required_memory;
sdc_cfg_t cfg;

#if defined(CONFIG_BT_CTLR_SDC_ISO_RX_PDU_BUFFER_COUNT)
uint8_t iso_rx_paths = 0;
#endif

#if !defined(CONFIG_BT_LL_SOFTDEVICE_PERIPHERAL)
cfg.central_count.count = SDC_CENTRAL_COUNT;

Expand Down Expand Up @@ -877,6 +1009,81 @@ static int configure_memory_usage(void)
}
#endif

#if defined(CONFIG_BT_CTLR_CONN_ISO)
cfg.cig_count.count = CONFIG_BT_CTLR_CONN_ISO_GROUPS;
required_memory = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
SDC_CFG_TYPE_CIG_COUNT, &cfg);
if (required_memory < 0) {
return required_memory;
}

iso_rx_paths = CONFIG_BT_CTLR_CONN_ISO_STREAMS;
cfg.cis_count.count = CONFIG_BT_CTLR_CONN_ISO_STREAMS;
required_memory = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
SDC_CFG_TYPE_CIS_COUNT, &cfg);
if (required_memory < 0) {
return required_memory;
}
#endif /* CONFIG_BT_CTLR_CONN_ISO */

#if defined(CONFIG_BT_CTLR_BROADCAST_ISO)
cfg.big_count.count = 0;
#if defined(CONFIG_BT_CTLR_ADV_ISO)
cfg.big_count.count += CONFIG_BT_CTLR_ADV_ISO_SET;
#endif /* CONFIG_BT_CTLR_ADV_ISO */
#if defined(CONFIG_BT_CTLR_SYNC_ISO)
cfg.big_count.count += CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET;
#endif /* CONFIG_BT_CTLR_SYNC_ISO */
required_memory = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
SDC_CFG_TYPE_BIG_COUNT, &cfg);
if (required_memory < 0) {
return required_memory;
}

cfg.bis_count.count = 0;
#if defined(CONFIG_BT_CTLR_ADV_ISO)
cfg.bis_count.count += CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT;

#endif /* CONFIG_BT_CTLR_ADV_ISO */
#if defined(CONFIG_BT_CTLR_SYNC_ISO)
cfg.bis_count.count += CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT;
iso_rx_paths += CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT;
#endif /* CONFIG_BT_CTLR_SYNC_ISO */
required_memory = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
SDC_CFG_TYPE_BIS_COUNT, &cfg);
if (required_memory < 0) {
return required_memory;
}
#endif /* CONFIG_BT_CTLR_BROADCAST_ISO */

#if defined(CONFIG_BT_CTLR_SDC_ISO_RX_PDU_BUFFER_COUNT)
cfg.iso_rx_pdu_buffer_cfg.count = CONFIG_BT_CTLR_SDC_ISO_RX_PDU_BUFFER_COUNT;
required_memory = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
SDC_CFG_TYPE_ISO_RX_PDU_BUFFER_CFG, &cfg);
if (required_memory < 0) {
return required_memory;
}

cfg.iso_rx_sdu_buffer_cfg.count = iso_rx_paths;
required_memory = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
SDC_CFG_TYPE_ISO_RX_SDU_BUFFER_CFG, &cfg);
if (required_memory < 0) {
return required_memory;
}
#endif

#if defined(CONFIG_BT_CTLR_SDC_ISO_TX_HCI_BUFFER_COUNT) && \
defined(CONFIG_BT_CTLR_SDC_ISO_TX_PDU_BUFFER_PER_STREAM_COUNT)
cfg.iso_tx_buffer_cfg.tx_hci_buffer_count = CONFIG_BT_CTLR_SDC_ISO_TX_HCI_BUFFER_COUNT;
cfg.iso_tx_buffer_cfg.tx_pdu_buffer_per_stream_count =
CONFIG_BT_CTLR_SDC_ISO_TX_PDU_BUFFER_PER_STREAM_COUNT;
required_memory = sdc_cfg_set(SDC_DEFAULT_RESOURCE_CFG_TAG,
SDC_CFG_TYPE_ISO_TX_BUFFER_CFG, &cfg);
if (required_memory < 0) {
return required_memory;
}
#endif

LOG_DBG("BT mempool size: %u, required: %u",
sizeof(sdc_mempool), required_memory);

Expand Down
Loading
Loading