[mynewt-nimble] branch master updated: nimble/ll: Fix PHY update on symmetric PHY from slave

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new febac4a  nimble/ll: Fix PHY update on symmetric PHY from slave
febac4a is described below

commit febac4a0db375498f390ce4f2b8364f993e8fd4d
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Thu Jan 31 16:31:29 2019 +0100

    nimble/ll: Fix PHY update on symmetric PHY from slave
    
    If slave requested symmetric PHY on PHY change we should either change
    both directions to the same PHY or leave both unchanged.
    
    This fixes LL/CON/MAS/BV-117C.
---
 nimble/controller/src/ble_ll_ctrl.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nimble/controller/src/ble_ll_ctrl.c b/nimble/controller/src/ble_ll_ctrl.c
index 60306fd..d55245e 100644
--- a/nimble/controller/src/ble_ll_ctrl.c
+++ b/nimble/controller/src/ble_ll_ctrl.c
@@ -686,11 +686,18 @@ ble_ll_ctrl_phy_update_ind_make(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
     uint8_t tx_phys;
     uint8_t rx_phys;
     uint16_t instant;
+    uint8_t is_slave_sym = 0;
 
     /* Get preferences from PDU */
     tx_phys = dptr[0];
     rx_phys = dptr[1];
 
+    /* If we are master, check if slave requested symmetric PHY */
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        is_slave_sym = tx_phys == rx_phys;
+        is_slave_sym &= __builtin_popcount(tx_phys) == 1;
+    }
+
     /* Get m_to_s and s_to_m masks */
     if (slave_req) {
         m_to_s = connsm->phy_data.host_pref_tx_phys_mask & rx_phys;
@@ -711,6 +718,18 @@ ble_ll_ctrl_phy_update_ind_make(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
         s_to_m = 0;
     }
 
+    /*
+     * Core 5.0, Vol 6, PartB, 5.1.10
+     *     If the slave specified a single PHY in both the TX_PHYS and RX_PHYS
+     *     fields and both fields are the same, the master shall either select
+     *     the PHY specified by the slave for both directions or shall leave
+     *     both directions unchanged.
+     */
+    if (is_slave_sym && (s_to_m != m_to_s)) {
+        s_to_m = 0;
+        m_to_s = 0;
+    }
+
     /* At this point, m_to_s and s_to_m are not masks; they are numeric */
 
     /*