Bluetooth: btintel_pcie: Increase the tx and rx descriptor count

[ Upstream commit 2dd711102ce69ae41f65d09c012441227d4aa983 ]

This change addresses latency issues observed in HID use cases where
events arrive in bursts. By increasing the Rx descriptor count to 64,
the firmware can handle bursty data more effectively, reducing latency
and preventing buffer overflows.

Signed-off-by: Chandrashekar Devegowda <chandrashekar.devegowda@intel.com>
Signed-off-by: Kiran K <kiran.k@intel.com>
Fixes: c2b636b3f788 ("Bluetooth: btintel_pcie: Add support for PCIe transport")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
index b8065b7ec70b63081130578694f1e7746339fe66..c02d671396e245226875820868fe11e166369798 100644 (file)
--- a/drivers/bluetooth/btintel_pcie.c
+++ b/drivers/bluetooth/btintel_pcie.c
@@ -1148,8 +1148,8 @@ static int btintel_pcie_alloc(struct btintel_pcie_data *data)
         *  + size of index * Number of queues(2) * type of index array(4)
         *  + size of context information
         */
-       total = (sizeof(struct tfd) + sizeof(struct urbd0) + sizeof(struct frbd)
-               + sizeof(struct urbd1)) * BTINTEL_DESCS_COUNT;
+       total = (sizeof(struct tfd) + sizeof(struct urbd0)) * BTINTEL_PCIE_TX_DESCS_COUNT;
+       total += (sizeof(struct frbd) + sizeof(struct urbd1)) * BTINTEL_PCIE_RX_DESCS_COUNT;
 
        /* Add the sum of size of index array and size of ci struct */
        total += (sizeof(u16) * BTINTEL_PCIE_NUM_QUEUES * 4) + sizeof(struct ctx_info);
@@ -1174,36 +1174,36 @@ static int btintel_pcie_alloc(struct btintel_pcie_data *data)
        data->dma_v_addr = v_addr;
 
        /* Setup descriptor count */
-       data->txq.count = BTINTEL_DESCS_COUNT;
-       data->rxq.count = BTINTEL_DESCS_COUNT;
+       data->txq.count = BTINTEL_PCIE_TX_DESCS_COUNT;
+       data->rxq.count = BTINTEL_PCIE_RX_DESCS_COUNT;
 
        /* Setup tfds */
        data->txq.tfds_p_addr = p_addr;
        data->txq.tfds = v_addr;
 
-       p_addr += (sizeof(struct tfd) * BTINTEL_DESCS_COUNT);
-       v_addr += (sizeof(struct tfd) * BTINTEL_DESCS_COUNT);
+       p_addr += (sizeof(struct tfd) * BTINTEL_PCIE_TX_DESCS_COUNT);
+       v_addr += (sizeof(struct tfd) * BTINTEL_PCIE_TX_DESCS_COUNT);
 
        /* Setup urbd0 */
        data->txq.urbd0s_p_addr = p_addr;
        data->txq.urbd0s = v_addr;
 
-       p_addr += (sizeof(struct urbd0) * BTINTEL_DESCS_COUNT);
-       v_addr += (sizeof(struct urbd0) * BTINTEL_DESCS_COUNT);
+       p_addr += (sizeof(struct urbd0) * BTINTEL_PCIE_TX_DESCS_COUNT);
+       v_addr += (sizeof(struct urbd0) * BTINTEL_PCIE_TX_DESCS_COUNT);
 
        /* Setup FRBD*/
        data->rxq.frbds_p_addr = p_addr;
        data->rxq.frbds = v_addr;
 
-       p_addr += (sizeof(struct frbd) * BTINTEL_DESCS_COUNT);
-       v_addr += (sizeof(struct frbd) * BTINTEL_DESCS_COUNT);
+       p_addr += (sizeof(struct frbd) * BTINTEL_PCIE_RX_DESCS_COUNT);
+       v_addr += (sizeof(struct frbd) * BTINTEL_PCIE_RX_DESCS_COUNT);
 
        /* Setup urbd1 */
        data->rxq.urbd1s_p_addr = p_addr;
        data->rxq.urbd1s = v_addr;
 
-       p_addr += (sizeof(struct urbd1) * BTINTEL_DESCS_COUNT);
-       v_addr += (sizeof(struct urbd1) * BTINTEL_DESCS_COUNT);
+       p_addr += (sizeof(struct urbd1) * BTINTEL_PCIE_RX_DESCS_COUNT);
+       v_addr += (sizeof(struct urbd1) * BTINTEL_PCIE_RX_DESCS_COUNT);
 
        /* Setup data buffers for txq */
        err = btintel_pcie_setup_txq_bufs(data, &data->txq);

diff --git a/drivers/bluetooth/btintel_pcie.h b/drivers/bluetooth/btintel_pcie.h
index 5f7747f334ab802bb7a368654347808bb1f145fd..ee0eec0237afda1fa73f9d0d5e10ad98377aa2b4 100644 (file)
--- a/drivers/bluetooth/btintel_pcie.h
+++ b/drivers/bluetooth/btintel_pcie.h
@@ -81,8 +81,11 @@ enum {
 /* Default interrupt timeout in msec */
 #define BTINTEL_DEFAULT_INTR_TIMEOUT_MS        3000
 
-/* The number of descriptors in TX/RX queues */
-#define BTINTEL_DESCS_COUNT    16
+/* The number of descriptors in TX queues */
+#define BTINTEL_PCIE_TX_DESCS_COUNT    32
+
+/* The number of descriptors in RX queues */
+#define BTINTEL_PCIE_RX_DESCS_COUNT    64
 
 /* Number of Queue for TX and RX
  * It indicates the index of the IA(Index Array)