espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-18 23:19:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/phy/nrf: Move rx_end to disabled event

Browse Source 
This moves handling of PDU RX end from EVENT_END to EVENT_DISABLED.
This will allow to run our phy on BabbleSim and also seems to simplify
code a bit.

EVENT_DISABLED happens almost immediately after EVENT_END, so on real
it happens while ble_phy_isr is being executed and is simply ignored.
However, on BabbleSim code is executed as if time was paused which
means that no other event can occur when ble_phy_isr is being executed,
i.e. it will be called after we return from isr and simulation code can
trigger subsequent events. If rx_end configures transition to TX and
thus enables interrupt on EVENT_DISABLED, we will handle that during an
event that is triggered for RX - basically we handle tx_end before TX
even started. Using EVENT_DISABLED for both TX and RX resolves this
issue.

We still use timer capture on EVENT_END for transition timing so this
has no effect on that calculations, and since EVENT_DISABLED occurs
just a fraction of microsecond after EVENT_END, execution timings are
also not affected.
This commit is contained in:
Andrzej Kaczmarek
2021-12-09 11:18:47 +01:00
parent a6009432de
commit 67d30b63b3
1 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/drivers/nrf52/src/ble_phy.c
+27 -34
View File
@@ -730,9 +730,6 @@ ble_phy_wfr_enable(int txrx, uint8_t tx_phy_mode, uint32_t wfr_usecs)
/* Enable wait for response PPI */
NRF_PPI->CHENSET = (PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk);
/* Enable the disabled interrupt so we time out on events compare */
NRF_RADIO->INTENSET = RADIO_INTENSET_DISABLED_Msk;
/*
* It may happen that if CPU is halted for a brief moment (e.g. during flash
* erase or write), TIMER0 already counted past CC[3] and thus wfr will not
@@ -860,7 +857,8 @@ ble_phy_rx_xcvr_setup(void)
RADIO_SHORTS_ADDRESS_RSSISTART_Msk |
RADIO_SHORTS_DISABLED_RSSISTOP_Msk;
NRF_RADIO->INTENSET = RADIO_INTENSET_ADDRESS_Msk;
NRF_RADIO->INTENSET = RADIO_INTENSET_ADDRESS_Msk |
RADIO_INTENSET_DISABLED_Msk;
}
/**
@@ -874,7 +872,6 @@ ble_phy_tx_end_isr(void)
uint8_t was_encrypted;
uint8_t transition;
uint32_t rx_time;
uint32_t wfr_time;
/* Store PHY on which we've just transmitted smth */
tx_phy_mode = g_ble_phy_data.phy_cur_phy_mode;
@@ -886,13 +883,6 @@ ble_phy_tx_end_isr(void)
/* Better be in TX state! */
assert(g_ble_phy_data.phy_state == BLE_PHY_STATE_TX);
/* Clear events and clear interrupt on disabled event */
NRF_RADIO->EVENTS_DISABLED = 0;
NRF_RADIO->INTENCLR = RADIO_INTENCLR_DISABLED_Msk;
NRF_RADIO->EVENTS_END = 0;
wfr_time = NRF_RADIO->SHORTS;
(void)wfr_time;
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
/*
* XXX: not sure what to do. We had a HW error during transmission.
@@ -982,10 +972,6 @@ ble_phy_rx_end_isr(void)
uint32_t tx_time;
struct ble_mbuf_hdr *ble_hdr;
/* Clear events and clear interrupt */
NRF_RADIO->EVENTS_END = 0;
NRF_RADIO->INTENCLR = RADIO_INTENCLR_END_Msk;
/* Disable automatic RXEN */
NRF_PPI->CHENCLR = PPI_CHEN_CH21_Msk;
@@ -1116,9 +1102,9 @@ ble_phy_rx_start_isr(void)
/* Clear events and clear interrupt */
NRF_RADIO->EVENTS_ADDRESS = 0;
NRF_RADIO->INTENCLR = RADIO_INTENCLR_ADDRESS_Msk;
/* Clear wfr timer channels and DISABLED interrupt */
NRF_RADIO->INTENCLR = RADIO_INTENCLR_DISABLED_Msk | RADIO_INTENCLR_ADDRESS_Msk;
/* Clear wfr timer channels */
NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk;
/* Initialize the ble mbuf header */
@@ -1210,7 +1196,6 @@ ble_phy_rx_start_isr(void)
if (rc >= 0) {
/* Set rx started flag and enable rx end ISR */
g_ble_phy_data.phy_rx_started = 1;
NRF_RADIO->INTENSET = RADIO_INTENSET_END_Msk;
} else {
/* Disable PHY */
ble_phy_disable();
@@ -1256,28 +1241,36 @@ ble_phy_isr(void)
}
}
/* Check for disabled event. This only happens for transmits now */
/* Handle disabled event. This is enabled for both TX and RX. On RX, we
* need to check phy_rx_started flag to make sure we actually were receiving
* a PDU, otherwise this is due to wfr.
*/
if ((irq_en & RADIO_INTENCLR_DISABLED_Msk) && NRF_RADIO->EVENTS_DISABLED) {
if (g_ble_phy_data.phy_state == BLE_PHY_STATE_RX) {
NRF_RADIO->EVENTS_DISABLED = 0;
ble_ll_wfr_timer_exp(NULL);
} else if (g_ble_phy_data.phy_state == BLE_PHY_STATE_IDLE) {
assert(0);
} else {
BLE_LL_ASSERT(NRF_RADIO->EVENTS_END ||
((g_ble_phy_data.phy_state == BLE_PHY_STATE_RX) &&
!g_ble_phy_data.phy_rx_started));
NRF_RADIO->EVENTS_END = 0;
NRF_RADIO->EVENTS_DISABLED = 0;
NRF_RADIO->INTENCLR = RADIO_INTENCLR_DISABLED_Msk;
switch (g_ble_phy_data.phy_state) {
case BLE_PHY_STATE_RX:
if (g_ble_phy_data.phy_rx_started) {
ble_phy_rx_end_isr();
} else {
ble_ll_wfr_timer_exp(NULL);
}
break;
case BLE_PHY_STATE_TX:
ble_phy_tx_end_isr();
break;
default:
BLE_LL_ASSERT(0);
}
}
/* Receive packet end (we dont enable this for transmit) */
if ((irq_en & RADIO_INTENCLR_END_Msk) && NRF_RADIO->EVENTS_END) {
ble_phy_rx_end_isr();
}
g_ble_phy_data.phy_transition_late = 0;
/* Ensures IRQ is cleared */
irq_en = NRF_RADIO->SHORTS;
/* Count # of interrupts */
STATS_INC(ble_phy_stats, phy_isrs);