adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

Bluetooth: Controller: Fix Advertising PDU memory allocation

Browse source 
Fix Advertising PDU memory allocation for redundant Periodic
Advertising related PDU allocations. The buffer count
related to Periodic Advertising was included twice.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2024-07-17 03:02:14 +02:00 committed by Anas Nashif
parent bf42164084
commit 04e3d0081b
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
subsys/bluetooth/controller/Kconfig.ll_sw_split
View file

@ -459,6 +459,7 @@ config BT_CTLR_ADV_DATA_BUF_MAX
depends on BT_BROADCASTER depends on BT_BROADCASTER
range 1 64 if BT_CTLR_ADV_EXT range 1 64 if BT_CTLR_ADV_EXT
range 1 1 if !BT_CTLR_ADV_EXT range 1 1 if !BT_CTLR_ADV_EXT
default 2 if BT_CTLR_ADV_PERIODIC
default 1 default 1
help help
Maximum number of buffered Advertising Data payload across enabled Maximum number of buffered Advertising Data payload across enabled

21
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
View file

@ -116,32 +116,29 @@ static inline bool isr_rx_ci_adva_check(uint8_t tx_addr, uint8_t *addr,
*/ */
#define PDU_MEM_COUNT_MIN (((BT_CTLR_ADV_SET) * 3) + \ #define PDU_MEM_COUNT_MIN (((BT_CTLR_ADV_SET) * 3) + \
((BT_CTLR_ADV_AUX_SET) * \ ((BT_CTLR_ADV_AUX_SET) * \
PAYLOAD_BASED_FRAG_COUNT) + \ PAYLOAD_BASED_FRAG_COUNT))
((BT_CTLR_ADV_SYNC_SET) * \
PAYLOAD_FRAG_COUNT))
/* Maximum advertising PDU buffers to allocate, which is the sum of minimum /* Maximum advertising PDU buffers to allocate, which is the sum of minimum
* plus configured additional count in CONFIG_BT_CTLR_ADV_DATA_BUF_MAX. * plus configured additional count in CONFIG_BT_CTLR_ADV_DATA_BUF_MAX.
*/ */
#if defined(CONFIG_BT_CTLR_ADV_EXT) #if defined(CONFIG_BT_CTLR_ADV_EXT)
#if defined(CONFIG_BT_CTLR_ADV_PERIODIC) #if defined(CONFIG_BT_CTLR_ADV_PERIODIC)
/* NOTE: When Periodic Advertising is supported then one additional PDU buffer /* NOTE: When Periodic Advertising is supported then one chain of PDU buffers
* plus the additional CONFIG_BT_CTLR_ADV_DATA_BUF_MAX amount of buffers * plus the additional CONFIG_BT_CTLR_ADV_DATA_BUF_MAX amount of chain
* is allocated. * buffers is allocated.
* Set CONFIG_BT_CTLR_ADV_DATA_BUF_MAX to (BT_CTLR_ADV_AUX_SET + * Set CONFIG_BT_CTLR_ADV_DATA_BUF_MAX to (BT_CTLR_ADV_AUX_SET +
* BT_CTLR_ADV_SYNC_SET) if * BT_CTLR_ADV_SYNC_SET) if PDU data is updated more frequently compare to
* PDU data is updated more frequently compare to the advertising * the advertising interval with random delay included.
* interval with random delay included.
*/ */
#define PDU_MEM_COUNT_MAX ((PDU_MEM_COUNT_MIN) + \ #define PDU_MEM_COUNT_MAX ((PDU_MEM_COUNT_MIN) + \
((BT_CTLR_ADV_SYNC_SET) * \ ((BT_CTLR_ADV_SYNC_SET) * \
PAYLOAD_FRAG_COUNT) + \ PAYLOAD_FRAG_COUNT) + \
(CONFIG_BT_CTLR_ADV_DATA_BUF_MAX * \ (CONFIG_BT_CTLR_ADV_DATA_BUF_MAX * \
PAYLOAD_BASED_FRAG_COUNT)) PAYLOAD_FRAG_COUNT))
#else /* !CONFIG_BT_CTLR_ADV_PERIODIC */ #else /* !CONFIG_BT_CTLR_ADV_PERIODIC */
/* NOTE: When Extended Advertising is supported but no Periodic Advertising /* NOTE: When Extended Advertising is supported but no Periodic Advertising
* then additional CONFIG_BT_CTLR_ADV_DATA_BUF_MAX amount of buffers is * then additional CONFIG_BT_CTLR_ADV_DATA_BUF_MAX amount of chain buffers
* allocated. * is allocated.
* Set CONFIG_BT_CTLR_ADV_DATA_BUF_MAX to BT_CTLR_ADV_AUX_SET if * Set CONFIG_BT_CTLR_ADV_DATA_BUF_MAX to BT_CTLR_ADV_AUX_SET if
* PDU data is updated more frequently compare to the advertising * PDU data is updated more frequently compare to the advertising
* interval with random delay included. * interval with random delay included.

2
tests/bsim/bluetooth/host/adv/periodic/prj.conf
View file

@ -9,6 +9,6 @@ CONFIG_BT_EXT_ADV=y
CONFIG_BT_EXT_ADV_MAX_ADV_SET=2 CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
CONFIG_BT_CTLR_ADVANCED_FEATURES=y CONFIG_BT_CTLR_ADVANCED_FEATURES=y
CONFIG_BT_CTLR_ADV_AUX_SET=2 CONFIG_BT_CTLR_ADV_AUX_SET=2
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=2 CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=3
CONFIG_BT_PER_ADV=y CONFIG_BT_PER_ADV=y
CONFIG_BT_PER_ADV_SYNC=y CONFIG_BT_PER_ADV_SYNC=y