transport: Add bridge transport

blehci application is for controller only build with external
interface. In case of dual-core MCUs (NRF5340, DA1469x) controller
runs on second core that may not be able to operate on external
interface. To be able to run blehci like application on dual-core
systems, application side has to route traffic from external interface
transport to internal transport.
So far only one transport package was used, for bridge configuration
application must include two transport packages.
To facilitate this:
- transport package has BLE_HCI_BRIDGE that is set to 1 for dual-core
  bridge configuration
- common syscfg values defined for in all transports are moved
  to transport package (BLE_HCI_EVT_HI_BUF_COUNT..)
- syscfg definitions present in all transport packages are converted to
  syscfg values
- DA1469x and NRF5340 transports in bridge configuration will NOT create
  buffers for commands and events they relay on external transport provided
  buffers

Author: kasjer

nimble/transport/da1469x/syscfg.yml

@@ -16,28 +16,12 @@
 # under the License.
 #
 
-syscfg.defs:
-    BLE_HCI_EVT_HI_BUF_COUNT:
-        description: 'Number of high-priority event buffers.'
-        value:  2
+syscfg.vals.'!BLE_HCI_BRIDGE && !BLE_EXT_ADV':
+    BLE_HCI_EVT_HI_BUF_COUNT: 2
+    BLE_HCI_EVT_LO_BUF_COUNT: 8
+    BLE_HCI_EVT_BUF_SIZE: 70
+    BLE_ACL_BUF_COUNT: 4
+    BLE_ACL_BUF_SIZE: 255
 
-    BLE_HCI_EVT_LO_BUF_COUNT:
-        description: 'Number of low-priority event buffers.'
-        value:  8
-
-    BLE_HCI_EVT_BUF_SIZE:
-        description: 'Size of each event buffer, in bytes.'
-        value:  70
-
-    BLE_ACL_BUF_COUNT:
-        description: 'The number of ACL data buffers'
-        value: 4
-
-    BLE_ACL_BUF_SIZE:
-        description: >
-            This is the maximum size of the data portion of HCI ACL data
-            packets. It does not include the HCI data header (of 4 bytes).
-        value: 255
-
-syscfg.vals.BLE_EXT_ADV:
+syscfg.vals.'!BLE_HCI_BRIDGE && BLE_EXT_ADV':
     BLE_HCI_EVT_BUF_SIZE: 274

nimble/transport/dialog_cmac/cmac_driver/diag/src/cmac_diag.c

@@ -20,7 +20,7 @@
 #include "syscfg/syscfg.h"
 #include "mcu/mcu.h"
 
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
 void
 cmac_diag_setup_host(void)
 {

nimble/transport/dialog_cmac/cmac_driver/include/cmac_driver/cmac_shared.h

@@ -131,7 +131,7 @@ struct cmac_shared_data {
     uint8_t mbox_c2s_buf[ MYNEWT_VAL(CMAC_MBOX_SIZE_C2S) ];
 };
 
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
 extern volatile struct cmac_shared_data *g_cmac_shared_data;
 #elif MYNEWT_VAL(BLE_CONTROLLER)
 extern volatile struct cmac_shared_data g_cmac_shared_data;
@@ -161,7 +161,7 @@ void cmac_rand_set_isr_cb(cmac_rand_isr_cb_t cb);
 void cmac_shared_init(void);
 void cmac_shared_sync(void);
 
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
 #define CMAC_SHARED_LOCK_VAL    0x40000000
 #elif MYNEWT_VAL(BLE_CONTROLLER)
 #define CMAC_SHARED_LOCK_VAL    0xc0000000

nimble/transport/dialog_cmac/cmac_driver/pkg.yml

@@ -37,3 +37,6 @@ pkg.post_link_cmds.BLE_CONTROLLER:
 
 pkg.pre_link_cmds.BLE_HOST:
     scripts/build_libcmac.sh: 100
+
+pkg.pre_link_cmds.BLE_HCI_BRIDGE:
+    scripts/build_libcmac.sh: 100

nimble/transport/dialog_cmac/cmac_driver/src/cmac_mbox.c

@@ -49,7 +49,7 @@ cmac_mbox_set_write_notif_cb(cmac_mbox_write_notif_cb *cb)
 int
 cmac_mbox_read(void)
 {
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
     volatile struct cmac_mbox *mbox = &g_cmac_shared_data->mbox_c2s;
     uint8_t *mbox_buf = (uint8_t *)&g_cmac_shared_data->mbox_c2s_buf;
     const uint16_t mbox_size = MYNEWT_VAL(CMAC_MBOX_SIZE_C2S);
@@ -96,7 +96,7 @@ cmac_mbox_read(void)
 int
 cmac_mbox_write(const void *data, uint16_t len)
 {
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
     volatile struct cmac_mbox *mbox = &g_cmac_shared_data->mbox_s2c;
     uint8_t *mbox_buf = (uint8_t *)&g_cmac_shared_data->mbox_s2c_buf;
     const uint16_t mbox_size = MYNEWT_VAL(CMAC_MBOX_SIZE_S2C);

nimble/transport/dialog_cmac/cmac_driver/src/cmac_rand.c

@@ -26,7 +26,7 @@
 #include "os/os_arch.h"
 #include "os/os.h"
 
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
 int
 cmac_rand_is_active(void)
 {

nimble/transport/dialog_cmac/cmac_driver/src/cmac_shared.c

@@ -34,7 +34,7 @@
 #define min(_a, _b)     ((_a) < (_b) ? (_a) : (_b))
 #endif
 
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
 volatile struct cmac_shared_data *g_cmac_shared_data;
 #include "mcu/da1469x_clock.h"
 #define MCU_DIAG_SER(_x)
@@ -45,7 +45,7 @@ volatile struct cmac_shared_data g_cmac_shared_data     __attribute__((section("
 void
 cmac_shared_init(void)
 {
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
     g_cmac_shared_data = (void *)(MCU_MEM_SYSRAM_START_ADDRESS +
                                   MEMCTRL->CMI_SHARED_BASE_REG);
 
@@ -77,7 +77,7 @@ cmac_shared_sync(void)
      * to wait until CMAC finished initialization as otherwise host may start
      * sending HCI packets which will timeout as there is no one to read them.
      */
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
     assert(g_cmac_shared_data->magic_sys == 0);
 
     while (g_cmac_shared_data->magic_cmac != CMAC_SHARED_MAGIC_CMAC);

nimble/transport/dialog_cmac/src/ble_hci_cmac_common.c

@@ -41,6 +41,7 @@
                                          BLE_MBUF_MEMBLOCK_OVERHEAD +       \
                                          BLE_HCI_DATA_HDR_SZ, OS_ALIGNMENT)
 
+#if !MYNEWT_VAL(BLE_HCI_BRIDGE)
 static uint8_t ble_hci_pool_cmd_mempool_buf[
     OS_MEMPOOL_BYTES(HCI_CMD_COUNT, BLE_HCI_TRANS_CMD_SZ)];
 static struct os_mempool ble_hci_pool_cmd_mempool;
@@ -54,6 +55,7 @@ static uint8_t ble_hci_pool_evt_lo_mempool_buf[
     OS_MEMPOOL_BYTES(MYNEWT_VAL(BLE_HCI_EVT_LO_BUF_COUNT),
                      MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE))];
 static struct os_mempool ble_hci_pool_evt_lo_mempool;
+#endif
 
 static uint8_t ble_hci_pool_acl_mempool_buf[
     OS_MEMPOOL_BYTES(MYNEWT_VAL(BLE_ACL_BUF_COUNT),
@@ -66,6 +68,7 @@ __attribute__((weak)) void ble_hci_trans_notify_free(void);
 static os_mempool_put_fn *g_ble_hci_pool_acl_mempool_put_cb;
 static void *g_ble_hci_pool_acl_mempool_put_arg;
 
+#if !MYNEWT_VAL(BLE_HCI_BRIDGE)
 int
 ble_hci_trans_reset(void)
 {
@@ -117,6 +120,7 @@ ble_hci_trans_buf_free(uint8_t *buf)
 
     ble_hci_trans_notify_free();
 }
+#endif
 
 struct os_mbuf *
 ble_hci_cmac_alloc_acl_mbuf(void)
@@ -147,6 +151,7 @@ ble_hci_cmac_free_acl_cb(struct os_mempool_ext *mpe, void *data, void *arg)
 }
 
 
+#if !MYNEWT_VAL(BLE_HCI_BRIDGE)
 int
 ble_hci_trans_set_acl_free_cb(os_mempool_put_fn *cb, void *arg)
 {
@@ -155,6 +160,7 @@ ble_hci_trans_set_acl_free_cb(os_mempool_put_fn *cb, void *arg)
 
     return 0;
 }
+#endif
 
 void
 ble_hci_cmac_init(void)
@@ -163,6 +169,7 @@ ble_hci_cmac_init(void)
 
     SYSINIT_ASSERT_ACTIVE();
 
+#if !MYNEWT_VAL(BLE_HCI_BRIDGE)
     rc = os_mempool_init(&ble_hci_pool_cmd_mempool,
                          HCI_CMD_COUNT, BLE_HCI_TRANS_CMD_SZ,
                          ble_hci_pool_cmd_mempool_buf, "ble_hci_cmd");
@@ -179,6 +186,7 @@ ble_hci_cmac_init(void)
                          MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE),
                          ble_hci_pool_evt_lo_mempool_buf, "ble_hci_evt_lo");
     SYSINIT_PANIC_ASSERT(rc == 0);
+#endif
 
     rc = os_mempool_ext_init(&ble_hci_pool_acl_mempool,
                              MYNEWT_VAL(BLE_ACL_BUF_COUNT), POOL_ACL_BLOCK_SIZE,

nimble/transport/dialog_cmac/src/ble_hci_cmac_hs.c

@@ -21,7 +21,7 @@
 #include <string.h>
 #include "syscfg/syscfg.h"
 
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
 
 #include "cmac_driver/cmac_shared.h"
 #include "cmac_driver/cmac_host.h"

nimble/transport/dialog_cmac/src/ble_hci_trans_h4.c

@@ -64,7 +64,7 @@ ble_hci_trans_h4_rxs_start(struct ble_hci_trans_h4_rx_state *rxs, uint8_t pkt_ty
     case BLE_HCI_TRANS_H4_PKT_TYPE_ACL:
         rxs->min_len = 4;
         break;
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
     case BLE_HCI_TRANS_H4_PKT_TYPE_EVT:
         rxs->min_len = 2;
         break;
@@ -95,7 +95,7 @@ static int
 ble_hci_trans_h4_rx_state_w4_header(struct ble_hci_trans_h4_rx_state *rxs,
                                     struct input_buffer *ib)
 {
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
     int pool;
 #endif
     int rc;
@@ -127,7 +127,7 @@ ble_hci_trans_h4_rx_state_w4_header(struct ble_hci_trans_h4_rx_state *rxs,
         os_mbuf_append(rxs->om, rxs->hdr, rxs->len);
         rxs->expected_len = get_le16(&rxs->hdr[2]) + 4;
         break;
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
     case BLE_HCI_TRANS_H4_PKT_TYPE_EVT:
         pool = BLE_HCI_TRANS_BUF_EVT_HI;
         if (rxs->hdr[0] == BLE_HCI_EVCODE_LE_META) {
@@ -194,7 +194,7 @@ ble_hci_trans_h4_rx_state_w4_payload(struct ble_hci_trans_h4_rx_state *rxs,
 #if MYNEWT_VAL(BLE_CONTROLLER)
     case BLE_HCI_TRANS_H4_PKT_TYPE_CMD:
 #endif
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
     case BLE_HCI_TRANS_H4_PKT_TYPE_EVT:
 #endif
         if (rxs->buf) {
@@ -240,7 +240,7 @@ ble_hci_trans_h4_rx_state_completed(struct ble_hci_trans_h4_rx_state *rxs,
 #if MYNEWT_VAL(BLE_CONTROLLER)
     case BLE_HCI_TRANS_H4_PKT_TYPE_CMD:
 #endif
-#if MYNEWT_VAL(BLE_HOST)
+#if MYNEWT_VAL(BLE_HOST) || MYNEWT_VAL(BLE_HCI_BRIDGE)
     case BLE_HCI_TRANS_H4_PKT_TYPE_EVT:
 #endif
         if (rxs->buf) {