nimble/ll: Add support for custom TX power configuration

nimble/controller/include/controller/ble_ll_fem.h

@@ -30,6 +30,11 @@ extern "C" {
 void ble_ll_fem_pa_init(void);
 void ble_ll_fem_pa_enable(void);
 void ble_ll_fem_pa_disable(void);
+
+#if MYNEWT_VAL(BLE_LL_FEM_PA_TXPOWER_TUNE)
+void ble_ll_fem_txpower_set(int dbm);
+int ble_ll_fem_txpower_round(int dbm);
+#endif
 #endif
 
 #if MYNEWT_VAL(BLE_LL_FEM_LNA)

nimble/controller/src/ble_ll.c

@@ -65,7 +65,7 @@
  * right thing to do.
  */
 
-int8_t g_ble_ll_tx_power = MYNEWT_VAL(BLE_LL_TX_PWR_DBM);
+int8_t g_ble_ll_tx_power;
 
 /* Supported states */
 #if MYNEWT_VAL(BLE_LL_ROLE_BROADCASTER)
@@ -1347,8 +1347,9 @@ ble_ll_task(void *arg)
     /* Init ble phy */
     ble_phy_init();
 
-    /* Set output power to 1mW (0 dBm) */
-    ble_phy_txpwr_set(g_ble_ll_tx_power);
+    /* Set output power to selected default */
+    g_ble_ll_tx_power = ble_ll_txpower_round(MYNEWT_VAL(BLE_LL_TX_PWR_DBM));
+    ble_ll_txpower_set(g_ble_ll_tx_power);
 
     /* Tell the host that we are ready to receive packets */
     ble_ll_hci_send_noop();
@@ -1976,3 +1977,23 @@ ble_transport_ll_init(void)
 {
     ble_ll_init();
 }
+
+void
+ble_ll_txpower_set(int dbm)
+{
+#if MYNEWT_VAL(BLE_LL_FEM_PA_TXPOWER_TUNE)
+    ble_ll_fem_txpower_set(dbm);
+#else
+    ble_phy_txpwr_set(dbm);
+#endif
+}
+
+int
+ble_ll_txpower_round(int dbm)
+{
+#if MYNEWT_VAL(BLE_LL_FEM_PA_TXPOWER_TUNE)
+    return ble_ll_fem_txpower_round(dbm);
+#else
+    return ble_phy_txpower_round(dbm);
+#endif
+}

nimble/controller/src/ble_ll_adv.c

@@ -1026,7 +1026,7 @@ ble_ll_adv_tx_done(void *arg)
     struct ble_ll_adv_sm *advsm;
 
     /* reset power to max after advertising */
-    ble_phy_txpwr_set(g_ble_ll_tx_power);
+    ble_ll_txpower_set(g_ble_ll_tx_power);
 
     advsm = (struct ble_ll_adv_sm *)arg;
 
@@ -1107,7 +1107,7 @@ ble_ll_adv_tx_start_cb(struct ble_ll_sched_item *sch)
     }
 
     /* Set the power */
-    ble_phy_txpwr_set(advsm->adv_txpwr);
+    ble_ll_txpower_set(advsm->adv_txpwr);
 
     /* Set channel */
     rc = ble_phy_setchan(advsm->adv_chan, BLE_ACCESS_ADDR_ADV, BLE_LL_CRCINIT_ADV);
@@ -1251,7 +1251,7 @@ ble_ll_adv_secondary_tx_start_cb(struct ble_ll_sched_item *sch)
     ble_ll_adv_active_chanset_set_sec(advsm);
 
     /* Set the power */
-    ble_phy_txpwr_set(advsm->adv_txpwr);
+    ble_ll_txpower_set(advsm->adv_txpwr);
 
     /* Set channel */
     aux = AUX_CURRENT(advsm);
@@ -1736,7 +1736,7 @@ ble_ll_adv_halt(void)
 
         ble_ll_trace_u32(BLE_LL_TRACE_ID_ADV_HALT, advsm->adv_instance);
 
-        ble_phy_txpwr_set(g_ble_ll_tx_power);
+        ble_ll_txpower_set(g_ble_ll_tx_power);
 
 #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
         if (advsm->flags & BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING) {
@@ -2170,7 +2170,7 @@ static void
 ble_ll_adv_sync_tx_done(struct ble_ll_adv_sm *advsm)
 {
     /* reset power to default after advertising */
-    ble_phy_txpwr_set(g_ble_ll_tx_power);
+    ble_ll_txpower_set(g_ble_ll_tx_power);
 
     /* for sync we trace a no pri nor sec set */
     ble_ll_trace_u32x2(BLE_LL_TRACE_ID_ADV_TXDONE, advsm->adv_instance, 0);
@@ -2226,7 +2226,7 @@ ble_ll_adv_sync_tx_start_cb(struct ble_ll_sched_item *sch)
     ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING);
 
     /* Set the power */
-    ble_phy_txpwr_set(advsm->adv_txpwr);
+    ble_ll_txpower_set(advsm->adv_txpwr);
 
     /* Set channel */
     sync = SYNC_CURRENT(advsm);
@@ -3519,7 +3519,7 @@ ble_ll_adv_ext_set_param(const uint8_t *cmdbuf, uint8_t len,
         /* no preference */
         advsm->adv_txpwr = g_ble_ll_tx_power;
     } else {
-        advsm->adv_txpwr = ble_phy_txpower_round(cmd->tx_power);
+        advsm->adv_txpwr = ble_ll_txpower_round(cmd->tx_power);
     }
 
     /* we can always store as those are validated and used only when needed */

nimble/controller/src/ble_ll_dtm.c

@@ -31,6 +31,7 @@
 #include "controller/ble_ll_rfmgmt.h"
 #include "controller/ble_ll_tmr.h"
 #include "ble_ll_dtm_priv.h"
+#include "ble_ll_priv.h"
 
 STATS_SECT_START(ble_ll_dtm_stats)
     STATS_SECT_ENTRY(rx_count)
@@ -243,7 +244,7 @@ ble_ll_dtm_tx_sched_cb(struct ble_ll_sched_item *sch)
     ble_phy_mode_set(ctx->phy_mode, ctx->phy_mode);
 #endif
     ble_phy_set_txend_cb(ble_ll_dtm_tx_done, ctx);
-    ble_phy_txpwr_set(0);
+    ble_ll_txpower_set(0);
 
     sch->start_time += g_ble_ll_sched_offset_ticks;
 

nimble/controller/src/ble_ll_hci.c

@@ -786,8 +786,8 @@ ble_ll_read_tx_power(uint8_t *rspbuf, uint8_t *rsplen)
 {
     struct ble_hci_le_rd_transmit_power_rp *rsp = (void *) rspbuf;
 
-    rsp->min_tx_power = ble_phy_txpower_round(-127);
-    rsp->max_tx_power = ble_phy_txpower_round(126);
+    rsp->min_tx_power = ble_ll_txpower_round(-127);
+    rsp->max_tx_power = ble_ll_txpower_round(126);
 
     *rsplen = sizeof(*rsp);
     return BLE_ERR_SUCCESS;

nimble/controller/src/ble_ll_hci_vs.c

@@ -124,12 +124,12 @@ ble_ll_hci_vs_set_tx_power(uint16_t ocf, const uint8_t *cmdbuf, uint8_t cmdlen,
 
     if (cmd->tx_power == 127) {
         /* restore reset default */
-        g_ble_ll_tx_power = MYNEWT_VAL(BLE_LL_TX_PWR_DBM);
+        g_ble_ll_tx_power = ble_ll_txpower_round(MYNEWT_VAL(BLE_LL_TX_PWR_DBM));
     } else {
-        g_ble_ll_tx_power = ble_phy_txpower_round(cmd->tx_power);
+        g_ble_ll_tx_power = ble_ll_txpower_round(cmd->tx_power);
     }
 
-    ble_phy_txpwr_set(g_ble_ll_tx_power);
+    ble_ll_txpower_set(g_ble_ll_tx_power);
 
     rsp->tx_power = g_ble_ll_tx_power;
     *rsplen = sizeof(*rsp);

nimble/controller/src/ble_ll_priv.h

@@ -26,6 +26,9 @@ extern "C" {
 
 extern int8_t g_ble_ll_tx_power;
 
+void ble_ll_txpower_set(int dbm);
+int ble_ll_txpower_round(int dbm);
+
 #ifdef MYNEWT
 
 #include "syscfg/syscfg.h"

nimble/controller/syscfg.yml

@@ -409,6 +409,12 @@ syscfg.defs:
     BLE_LL_FEM_PA:
         description: Enable FEM PA support
         value: MYNEWT_VAL(BLE_LL_PA)
+    BLE_LL_FEM_PA_TXPOWER_TUNE:
+        description: >
+          Indicates that FEM TX power tunning is provided. If enabled
+          ble_ll_fem_txpower_round() and ble_ll_fem_txpower_set() shall be
+          implemented. See controller/ble_ll_fem.h for defails.
+        value: 0
     BLE_LL_FEM_PA_GPIO:
         description: >
             GPIO pin number to control PA. Pin is set to high state when PA