Skip to content

Commit

Permalink
Bluetooth: controller: legacy: Correct DLE time calculations
Browse files Browse the repository at this point in the history 
This PR fixes #23482. The preamble size for a 2M phy was incorrect.

There is a bug in calculation of time for the DLE procedure:
the preamble size is incorrect for the 2M phy

Fixes #23482

Signed-off-by: Andries Kruithof <Andries.Kruithof@nordicsemi.no>
  • Loading branch information
@kruithofa @carlescufi
kruithofa authored and carlescufi committed Apr 9, 2020
1 parent b5af13c commit aafd563
Showing 1 changed file with 41 additions and 32 deletions.
73 changes: 41 additions & 32 deletions subsys/bluetooth/controller/ll_sw/ctrl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,11 @@
#define RADIO_PKT_TIME(octets, phy) \
(((phy) & BIT(2)) ? \
(80 + 256 + 16 + 24 + ((((2 + (octets) + 4) * 8) + 24 + 3) * 8)) : \
(((octets) + 14) * 8 / BIT(((phy) & 0x03) >> 1)))
(((octets) + 13 + PREAMBLE_SIZE(phy)) * 8 / BIT(((phy) & 0x03) >> 1)))
#else /* !CONFIG_BT_CTLR_PHY_CODED */
#define RADIO_PKT_TIME(octets, phy) \
(((octets) + 14) * 8 / BIT(((phy) & 0x03) >> 1))
(((octets) + 13 + PREAMBLE_SIZE(phy)) * 8 / \
BIT(((phy) & 0x03) >> 1))
#endif /* !CONFIG_BT_CTLR_PHY_CODED */

/* Inter Frame Space */
Expand Down Expand Up @@ -641,7 +642,8 @@ static void common_init(void)
#if defined(CONFIG_BT_CTLR_DATA_LENGTH)
/* Initialize the DLE defaults */
_radio.default_tx_octets = PDU_DC_PAYLOAD_SIZE_MIN;
_radio.default_tx_time = RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0);
_radio.default_tx_time = RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
BIT(0));
#endif /* CONFIG_BT_CTLR_DATA_LENGTH */

#if defined(CONFIG_BT_CTLR_PHY)
Expand Down Expand Up @@ -2263,8 +2265,8 @@ isr_rx_conn_pkt_ctrl_rej_dle(struct radio_pdu_node_rx *node_rx,
lr->max_rx_octets = conn->max_rx_octets;
lr->max_tx_octets = conn->max_tx_octets;
#if !defined(CONFIG_BT_CTLR_PHY)
lr->max_rx_time = RADIO_PKT_TIME(conn->max_rx_octets, 0);
lr->max_tx_time = RADIO_PKT_TIME(conn->max_tx_octets, 0);
lr->max_rx_time = RADIO_PKT_TIME(conn->max_rx_octets, BIT(0));
lr->max_tx_time = RADIO_PKT_TIME(conn->max_tx_octets, BIT(0));
#else /* CONFIG_BT_CTLR_PHY */
lr->max_rx_time = conn->max_rx_time;
lr->max_tx_time = conn->max_tx_time;
Expand Down Expand Up @@ -2420,14 +2422,15 @@ static void dle_max_time_get(struct connection *conn, u16_t *max_rx_time,
1
#endif /* !CONFIG_BT_CTLR_PHY */
) {
*max_rx_time = RADIO_PKT_TIME(LL_LENGTH_OCTETS_RX_MAX, 0);
*max_rx_time = RADIO_PKT_TIME(LL_LENGTH_OCTETS_RX_MAX, BIT(0));
#if defined(CONFIG_BT_CTLR_PHY)
*max_tx_time = MAX(MIN(RADIO_PKT_TIME(LL_LENGTH_OCTETS_RX_MAX,
0),
BIT(0)),
conn->default_tx_time),
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0));
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
BIT(0)));
#else /* !CONFIG_BT_CTLR_PHY */
*max_tx_time = RADIO_PKT_TIME(conn->default_tx_octets, 0);
*max_tx_time = RADIO_PKT_TIME(conn->default_tx_octets, BIT(0));
#endif /* !CONFIG_BT_CTLR_PHY */

#if defined(CONFIG_BT_CTLR_PHY)
Expand All @@ -2436,23 +2439,27 @@ static void dle_max_time_get(struct connection *conn, u16_t *max_rx_time,
BIT(BT_LE_FEAT_BIT_PHY_CODED)) {
*max_rx_time = MAX(RADIO_PKT_TIME(LL_LENGTH_OCTETS_RX_MAX,
BIT(2)),
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0));
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
BIT(0)));
*max_tx_time = MAX(MIN(RADIO_PKT_TIME(LL_LENGTH_OCTETS_RX_MAX,
BIT(2)),
conn->default_tx_time),
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0));
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
BIT(0)));
#endif /* CONFIG_BT_CTLR_PHY_CODED */

#if defined(CONFIG_BT_CTLR_PHY_2M)
} else if (conn->llcp_feature.features &
BIT(BT_LE_FEAT_BIT_PHY_2M)) {
*max_rx_time = MAX(RADIO_PKT_TIME(LL_LENGTH_OCTETS_RX_MAX,
BIT(1)),
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0));
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
BIT(0)));
*max_tx_time = MAX(MIN(RADIO_PKT_TIME(LL_LENGTH_OCTETS_RX_MAX,
BIT(1)),
conn->default_tx_time),
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0));
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
BIT(0)));
#endif /* CONFIG_BT_CTLR_PHY_2M */
#endif /* CONFIG_BT_CTLR_PHY */
}
Expand Down Expand Up @@ -2536,7 +2543,7 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx,
* peer max_rx_time
*/
if (lr->max_rx_time >=
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0)) {
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, BIT(0))) {
eff_tx_time = MIN(lr->max_rx_time, max_tx_time);

#if defined(CONFIG_BT_CTLR_PHY_CODED)
Expand All @@ -2551,7 +2558,7 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx,
* peer max_tx_time
*/
if (lr->max_tx_time >=
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0)) {
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, BIT(0))) {
eff_rx_time = MIN(lr->max_tx_time, max_rx_time);

#if defined(CONFIG_BT_CTLR_PHY_CODED)
Expand Down Expand Up @@ -2679,8 +2686,8 @@ static inline u8_t isr_rx_conn_pkt_ctrl_dle(struct pdu_data *pdu_data_rx,
lr->max_tx_octets = eff_tx_octets;

#if !defined(CONFIG_BT_CTLR_PHY)
lr->max_rx_time = RADIO_PKT_TIME(eff_rx_octets, 0);
lr->max_tx_time = RADIO_PKT_TIME(eff_tx_octets, 0);
lr->max_rx_time = RADIO_PKT_TIME(eff_rx_octets, BIT(0));
lr->max_tx_time = RADIO_PKT_TIME(eff_tx_octets, BIT(0));
#else /* CONFIG_BT_CTLR_PHY */
lr->max_rx_time = eff_rx_time;
lr->max_tx_time = eff_tx_time;
Expand Down Expand Up @@ -4941,23 +4948,23 @@ static inline void isr_close_conn(void)
rx_time = conn->max_rx_time;
}
#else /* !CONFIG_BT_CTLR_DATA_LENGTH */
tx_time = MAX(RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0),
tx_time = MAX(RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, BIT(0)),
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
conn->phy_tx));
rx_time = MAX(RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0),
rx_time = MAX(RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, BIT(0)),
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
conn->phy_rx));
#endif /* !CONFIG_BT_CTLR_DATA_LENGTH */
#else /* !CONFIG_BT_CTLR_PHY */
ready_delay = (conn->role) ?
radio_rx_ready_delay_get(0, 0) :
radio_tx_ready_delay_get(0, 0);
tx_time = RADIO_PKT_TIME(conn->max_tx_octets, 0);
tx_time = RADIO_PKT_TIME(conn->max_tx_octets, BIT(0));
if (conn->evt_len_adv) {
rx_time = RADIO_PKT_TIME(conn->llcp_length.rx_octets,
0);
BIT(0));
} else {
rx_time = RADIO_PKT_TIME(conn->max_rx_octets, 0);
rx_time = RADIO_PKT_TIME(conn->max_rx_octets, BIT(0));
}
#endif /* !CONFIG_BT_CTLR_PHY */

Expand Down Expand Up @@ -8682,8 +8689,8 @@ static inline int event_len_prep(struct connection *conn)
lr->max_rx_octets = conn->max_rx_octets;
lr->max_tx_octets = tx_octets;
#if !defined(CONFIG_BT_CTLR_PHY)
lr->max_rx_time = RADIO_PKT_TIME(conn->max_rx_octets, 0);
lr->max_tx_time = RADIO_PKT_TIME(tx_octets, 0);
lr->max_rx_time = RADIO_PKT_TIME(conn->max_rx_octets, BIT(0));
lr->max_tx_time = RADIO_PKT_TIME(tx_octets, BIT(0));
#else /* CONFIG_BT_CTLR_PHY */
lr->max_rx_time = conn->max_rx_time;
lr->max_tx_time = tx_time;
Expand Down Expand Up @@ -8910,7 +8917,8 @@ static inline void event_phy_upd_ind_prep(struct connection *conn,
eff_tx_time =
MAX(RADIO_PKT_TIME(conn->max_tx_octets,
conn->phy_tx),
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0));
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
BIT(0)));
eff_tx_time = MIN(eff_tx_time, max_tx_time);

#if defined(CONFIG_BT_CTLR_PHY_CODED)
Expand All @@ -8928,7 +8936,8 @@ static inline void event_phy_upd_ind_prep(struct connection *conn,
eff_rx_time =
MAX(RADIO_PKT_TIME(conn->max_rx_octets,
conn->phy_rx),
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0));
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN,
BIT(0)));
eff_rx_time = MIN(eff_rx_time, max_rx_time);

#if defined(CONFIG_BT_CTLR_PHY_CODED)
Expand Down Expand Up @@ -11082,9 +11091,9 @@ static void length_resp_send(struct connection *conn,

#if !defined(CONFIG_BT_CTLR_PHY)
pdu_ctrl_tx->llctrl.length_rsp.max_rx_time =
RADIO_PKT_TIME(eff_rx_octets, 0);
RADIO_PKT_TIME(eff_rx_octets, BIT(0));
pdu_ctrl_tx->llctrl.length_rsp.max_tx_time =
RADIO_PKT_TIME(eff_tx_octets, 0);
RADIO_PKT_TIME(eff_tx_octets, BIT(0));
#else /* CONFIG_BT_CTLR_PHY */
pdu_ctrl_tx->llctrl.length_rsp.max_rx_time = eff_rx_time;
pdu_ctrl_tx->llctrl.length_rsp.max_tx_time = eff_tx_time;
Expand Down Expand Up @@ -11575,9 +11584,9 @@ u32_t radio_adv_enable(u16_t interval, u8_t chan_map, u8_t filter_policy,
#if defined(CONFIG_BT_CTLR_PHY)
conn->default_tx_time = _radio.default_tx_time;
conn->max_tx_time =
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0);
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, BIT(0));
conn->max_rx_time =
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0);
RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, BIT(0));
#endif /* CONFIG_BT_CTLR_PHY */
#endif /* CONFIG_BT_CTLR_DATA_LENGTH */

Expand Down Expand Up @@ -12114,8 +12123,8 @@ u32_t radio_connect_enable(u8_t adv_addr_type, u8_t *adv_addr, u16_t interval,

#if defined(CONFIG_BT_CTLR_PHY)
conn->default_tx_time = _radio.default_tx_time;
conn->max_tx_time = RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0);
conn->max_rx_time = RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, 0);
conn->max_tx_time = RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, BIT(0));
conn->max_rx_time = RADIO_PKT_TIME(PDU_DC_PAYLOAD_SIZE_MIN, BIT(0));
#endif /* CONFIG_BT_CTLR_PHY */
#endif /* CONFIG_BT_CTLR_DATA_LENGTH */

Expand Down

0 comments on commit aafd563

Please sign in to comment.