michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: nRF53: Fix missing NRF_CCM subscribe clear

Browse source 
Fix missing NRF_CCM subscribe clear which can lead to
spurious trigger of TASK_CRYPT in NRF_CCM. This may
lead to corruption of Rx PDU buffers.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2023-09-25 20:36:41 +02:00 • committed by Carles Cufí
commit 9e01c4df53
3 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
View file

@ -1084,6 +1084,8 @@ void radio_tmr_status_reset(void)
{
nrf_rtc_event_disable(NRF_RTC0, RTC_EVTENCLR_COMPARE2_Msk);
hal_trigger_crypt_ppi_disable();
hal_radio_nrf_ppi_channels_disable(
BIT(HAL_RADIO_ENABLE_TX_ON_TICK_PPI) |
BIT(HAL_RADIO_ENABLE_RX_ON_TICK_PPI) |
@ -1116,6 +1118,8 @@ void radio_tmr_tx_status_reset(void)
{
nrf_rtc_event_disable(NRF_RTC0, RTC_EVTENCLR_COMPARE2_Msk);
hal_trigger_crypt_ppi_disable();
hal_radio_nrf_ppi_channels_disable(
#if (HAL_RADIO_ENABLE_TX_ON_TICK_PPI != HAL_RADIO_ENABLE_RX_ON_TICK_PPI) && \
!defined(DPPI_PRESENT)
@ -1152,6 +1156,8 @@ void radio_tmr_rx_status_reset(void)
{
nrf_rtc_event_disable(NRF_RTC0, RTC_EVTENCLR_COMPARE2_Msk);
hal_trigger_crypt_ppi_disable();
hal_radio_nrf_ppi_channels_disable(
#if (HAL_RADIO_ENABLE_TX_ON_TICK_PPI != HAL_RADIO_ENABLE_RX_ON_TICK_PPI) && \
!defined(DPPI_PRESENT)

8
subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
View file

@ -127,6 +127,14 @@ static inline void hal_trigger_crypt_ppi_config(void)
nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_CRYPT, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
}
/*******************************************************************************
* Disable trigger encryption task
*/
static inline void hal_trigger_crypt_ppi_disable(void)
{
nrf_ccm_subscribe_clear(NRF_CCM, NRF_CCM_TASK_CRYPT);
}
#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX)
/*******************************************************************************
* Trigger encryption task on Bit counter match:

10
subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h
View file

@ -205,6 +205,16 @@ static inline void hal_trigger_crypt_ppi_config(void)
/* No need to configure anything for the pre-programmed channel. */
}
/*******************************************************************************
* Disable trigger encryption task
*/
static inline void hal_trigger_crypt_ppi_disable(void)
{
/* No need to disable anything as ppi channel will be disabled in a
* separate disable ppi call by the caller of this function.
*/
}
#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX)
/*******************************************************************************
* Trigger encryption task on Bit counter match: