Revert "[nrf fromtree] Bluetooth: Controller: Fix HCI command buffer allocation failure"

This reverts commit eabfcff.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

include/zephyr/bluetooth/buf.h

@@ -100,13 +100,13 @@ struct bt_buf_data {
   * available for the HCI driver to allocate from.
   *
   * TODO: When CONFIG_BT_BUF_ACL_RX_COUNT is removed,
-  *       remove the MAX and only keep the 1.
+  *       remove the MAX and only keep (CONFIG_BT_MAX_CONN + 1)
   */
-#define BT_BUF_ACL_RX_COUNT_EXTRA CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA
-#define BT_BUF_ACL_RX_COUNT       (MAX(CONFIG_BT_BUF_ACL_RX_COUNT, 1) + BT_BUF_ACL_RX_COUNT_EXTRA)
+#define BT_BUF_ACL_RX_COUNT                                                                        \
+	(MAX(CONFIG_BT_BUF_ACL_RX_COUNT, (CONFIG_BT_MAX_CONN + 1)) +                               \
+	 CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA)
 #else
-#define BT_BUF_ACL_RX_COUNT_EXTRA 0
-#define BT_BUF_ACL_RX_COUNT       0
+#define BT_BUF_ACL_RX_COUNT 0
 #endif /* CONFIG_BT_CONN && CONFIG_BT_HCI_HOST */
 
 #if defined(CONFIG_BT_BUF_ACL_RX_COUNT) && CONFIG_BT_BUF_ACL_RX_COUNT > 0
@@ -120,15 +120,10 @@ BUILD_ASSERT(BT_BUF_ACL_RX_COUNT <= BT_BUF_ACL_RX_COUNT_MAX,
 #define BT_BUF_RX_SIZE (MAX(MAX(BT_BUF_ACL_RX_SIZE, BT_BUF_EVT_RX_SIZE), \
 			    BT_BUF_ISO_RX_SIZE))
 
-/* Controller can generate up to CONFIG_BT_BUF_ACL_TX_COUNT number of unique HCI Number of Completed
- * Packets events.
- */
-BUILD_ASSERT(CONFIG_BT_BUF_EVT_RX_COUNT > CONFIG_BT_BUF_ACL_TX_COUNT,
-	     "Increase Event RX buffer count to be greater than ACL TX buffer count");
-
-/** Buffer count needed for HCI ACL or HCI ISO plus Event RX buffers */
-#define BT_BUF_RX_COUNT (CONFIG_BT_BUF_EVT_RX_COUNT + \
-			 MAX(BT_BUF_ACL_RX_COUNT, BT_BUF_ISO_RX_COUNT))
+/** Buffer count needed for HCI ACL, HCI ISO or Event RX buffers */
+#define BT_BUF_RX_COUNT (MAX(MAX(CONFIG_BT_BUF_EVT_RX_COUNT, \
+				 BT_BUF_ACL_RX_COUNT), \
+			     BT_BUF_ISO_RX_COUNT))
 
 /** Data size needed for HCI Command buffers. */
 #define BT_BUF_CMD_TX_SIZE BT_BUF_CMD_SIZE(CONFIG_BT_BUF_CMD_TX_SIZE)

samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf

@@ -13,7 +13,12 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_HCI_RAW_RESERVE=1
 CONFIG_BT_MAX_CONN=2
 
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10
+
 CONFIG_BT_BUF_EVT_RX_COUNT=16
+
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251

samples/bluetooth/hci_ipc/nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf

@@ -11,6 +11,11 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_HCI_RAW_RESERVE=1
 CONFIG_BT_MAX_CONN=16
 
+
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10
+
 # Controller
 CONFIG_BT_LL_SW_SPLIT=y
 

samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf

@@ -13,7 +13,12 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_HCI_RAW_RESERVE=1
 CONFIG_BT_MAX_CONN=2
 
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10
+
 CONFIG_BT_BUF_EVT_RX_COUNT=16
+
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251

samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf

@@ -13,7 +13,12 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_HCI_RAW_RESERVE=1
 CONFIG_BT_MAX_CONN=2
 
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10
+
 CONFIG_BT_BUF_EVT_RX_COUNT=16
+
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251

samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf

@@ -13,7 +13,12 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_HCI_RAW_RESERVE=1
 CONFIG_BT_MAX_CONN=2
 
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10
+
 CONFIG_BT_BUF_EVT_RX_COUNT=16
+
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251

samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf

@@ -12,6 +12,10 @@ CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_HCI_RAW_RESERVE=1
 
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10
+
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251

samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf

@@ -12,6 +12,10 @@ CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
 CONFIG_BT_HCI_RAW_RESERVE=1
 
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10
+
 CONFIG_BT_BUF_EVT_RX_SIZE=255
 CONFIG_BT_BUF_ACL_RX_SIZE=255
 CONFIG_BT_BUF_ACL_TX_SIZE=251

samples/bluetooth/hci_ipc/prj.conf

@@ -11,6 +11,11 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_HCI_RAW_RESERVE=1
 CONFIG_BT_MAX_CONN=16
 
+
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10
+
 # Enable and adjust the below value as necessary
 # CONFIG_BT_BUF_EVT_RX_COUNT=16
 # CONFIG_BT_BUF_EVT_RX_SIZE=255

samples/bluetooth/hci_uart/prj.conf

@@ -17,3 +17,7 @@ CONFIG_BT_TINYCRYPT_ECC=n
 CONFIG_BT_CTLR_DTM_HCI=y
 
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
+
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10