Skip to content

Bluetooth: Controller: Fix building with Privacy without LE Encryption #94538

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

Merged
merged 1 commit into from
Aug 29, 2025
Merged

Bluetooth: Controller: Fix building with Privacy without LE Encryption #94538

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
2 changes: 1 addition & 1 deletion subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2529,6 +2529,7 @@ void radio_ccm_disable(void)
nrf_ccm_task_trigger(NRF_CCM, NRF_CCM_TASK_STOP);
nrf_ccm_disable(NRF_CCM);
}
#endif /* CONFIG_BT_CTLR_LE_ENC || CONFIG_BT_CTLR_BROADCAST_ISO_ENC */

#if defined(CONFIG_BT_CTLR_PRIVACY)
static uint8_t MALIGN(4) _aar_scratch[3];
Expand Down Expand Up @@ -2659,7 +2660,6 @@ uint8_t radio_ar_resolve(const uint8_t *addr)

}
#endif /* CONFIG_BT_CTLR_PRIVACY */
#endif /* CONFIG_BT_CTLR_LE_ENC || CONFIG_BT_CTLR_BROADCAST_ISO_ENC */

#if defined(CONFIG_BT_CTLR_DF_SUPPORT) && !defined(CONFIG_ZTEST)
/* @brief Function configures CTE inline register to start sampling of CTE
Expand Down
5 changes: 4 additions & 1 deletion subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,12 @@

#if defined(CONFIG_BT_CTLR_LE_ENC) || defined(CONFIG_BT_CTLR_BROADCAST_ISO_ENC)
#include <hal/nrf_ccm.h>
#include <hal/nrf_aar.h>
#endif /* CONFIG_BT_CTLR_LE_ENC || CONFIG_BT_CTLR_BROADCAST_ISO_ENC */

#if defined(CONFIG_BT_CTLR_PRIVACY)
#include <hal/nrf_aar.h>
#endif /* CONFIG_BT_CTLR_PRIVACY */

/* Define to reset PPI registration.
* This has to come before the ppi/dppi includes below.
*/
Expand Down
24 changes: 12 additions & 12 deletions subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,18 +175,6 @@ static inline void hal_trigger_crypt_ppi_disable(void)
nrf_ccm_subscribe_clear(NRF_CCM, NRF_CCM_TASK_START);
}

#if defined(CONFIG_BT_CTLR_PRIVACY)
/*******************************************************************************
* Trigger automatic address resolution on Bit counter match:
* wire the RADIO EVENTS_BCMATCH event to the AAR TASKS_START task.
*/
static inline void hal_trigger_aar_ppi_config(void)
{
nrf_radio_publish_set(NRF_RADIO, NRF_RADIO_EVENT_BCMATCH, HAL_TRIGGER_AAR_PPI);
nrf_aar_subscribe_set(NRF_AAR, NRF_AAR_TASK_START, HAL_TRIGGER_AAR_PPI);
}
#endif /* CONFIG_BT_CTLR_PRIVACY */

/* When hardware does not support Coded PHY we still allow the Controller
* implementation to accept Coded PHY flags, but the Controller will use 1M
* PHY on air. This is implementation specific feature.
Expand Down Expand Up @@ -229,6 +217,18 @@ static inline void hal_trigger_crypt_by_bcmatch_ppi_config(void)
#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX */
#endif /* CONFIG_BT_CTLR_LE_ENC || CONFIG_BT_CTLR_BROADCAST_ISO_ENC */

#if defined(CONFIG_BT_CTLR_PRIVACY)
/*******************************************************************************
* Trigger automatic address resolution on Bit counter match:
* wire the RADIO EVENTS_BCMATCH event to the AAR TASKS_START task.
*/
static inline void hal_trigger_aar_ppi_config(void)
{
nrf_radio_publish_set(NRF_RADIO, NRF_RADIO_EVENT_BCMATCH, HAL_TRIGGER_AAR_PPI);
nrf_aar_subscribe_set(NRF_AAR, NRF_AAR_TASK_START, HAL_TRIGGER_AAR_PPI);
}
#endif /* CONFIG_BT_CTLR_PRIVACY */

/******************************************************************************/
#if !defined(CONFIG_BT_CTLR_TIFS_HW)

Expand Down
26 changes: 13 additions & 13 deletions subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,19 +259,6 @@ static inline void hal_trigger_crypt_by_bcmatch_ppi_config(void)
}
#endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX */

/*******************************************************************************
* Trigger automatic address resolution on Bit counter match:
* wire the RADIO EVENTS_BCMATCH event to the AAR TASKS_START task.
*
* PPI channel 23 is pre-programmed with the following fixed settings:
* EEP: RADIO->EVENTS_BCMATCH
* TEP: AAR->TASKS_START
*/
static inline void hal_trigger_aar_ppi_config(void)
{
/* No need to configure anything for the pre-programmed channel. */
}

/*******************************************************************************
* Trigger Radio Rate override upon Rateboost event.
*/
Expand All @@ -286,6 +273,19 @@ static inline void hal_trigger_rateoverride_ppi_config(void)
}
#endif /* CONFIG_BT_CTLR_PHY_CODED && CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */

/*******************************************************************************
* Trigger automatic address resolution on Bit counter match:
* wire the RADIO EVENTS_BCMATCH event to the AAR TASKS_START task.
*
* PPI channel 23 is pre-programmed with the following fixed settings:
* EEP: RADIO->EVENTS_BCMATCH
* TEP: AAR->TASKS_START
*/
static inline void hal_trigger_aar_ppi_config(void)
{
/* No need to configure anything for the pre-programmed channel. */
}

/******************************************************************************/
#if !defined(CONFIG_BT_CTLR_TIFS_HW)
/* PPI setup used for SW-based auto-switching during TIFS. */
Expand Down