Bluetooth: hci_qca: Convert timeout from jiffies to ms

Since the timer uses jiffies as its unit rather than ms, the timeout value
must be converted from ms to jiffies when configuring the timer. Otherwise,
the intended 8s timeout is incorrectly set to approximately 33s.

To improve readability, embed msecs_to_jiffies() directly in the macro
definitions and drop the _MS suffix from macros that now yield jiffies
values: MEMDUMP_TIMEOUT, FW_DOWNLOAD_TIMEOUT, IBS_DISABLE_SSR_TIMEOUT,
CMD_TRANS_TIMEOUT, and IBS_BTSOC_TX_IDLE_TIMEOUT.

IBS_WAKE_RETRANS_TIMEOUT_MS and IBS_HOST_TX_IDLE_TIMEOUT_MS are
intentionally left unchanged. Their values are stored in the struct fields
wake_retrans and tx_idle_delay, which hold ms values at runtime and can be
modified via debugfs. The msecs_to_jiffies() conversion happens at each
call site against the field value, so it cannot be embedded in the macro.

Wake timer depends on commit c347ca17d62a

Cc: stable@vger.kernel.org
Fixes: d841502c79e3 ("Bluetooth: hci_qca: Collect controller memory dump during SSR")
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Shuai Zhang <shuai.zhang@oss.qualcomm.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index cd1834246b4793939c2f92af32ce7212f1f3d86a..ed280399bf4741977a021614cfe68e2b816fb4c2 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -48,13 +48,12 @@
 #define HCI_MAX_IBS_SIZE       10
 
 #define IBS_WAKE_RETRANS_TIMEOUT_MS    100
-#define IBS_BTSOC_TX_IDLE_TIMEOUT_MS   200
+#define IBS_BTSOC_TX_IDLE_TIMEOUT      msecs_to_jiffies(200)
 #define IBS_HOST_TX_IDLE_TIMEOUT_MS    2000
-#define CMD_TRANS_TIMEOUT_MS           100
-#define MEMDUMP_TIMEOUT_MS             8000
-#define IBS_DISABLE_SSR_TIMEOUT_MS \
-       (MEMDUMP_TIMEOUT_MS + FW_DOWNLOAD_TIMEOUT_MS)
-#define FW_DOWNLOAD_TIMEOUT_MS         3000
+#define CMD_TRANS_TIMEOUT              msecs_to_jiffies(100)
+#define MEMDUMP_TIMEOUT                        msecs_to_jiffies(8000)
+#define FW_DOWNLOAD_TIMEOUT            msecs_to_jiffies(3000)
+#define IBS_DISABLE_SSR_TIMEOUT                (MEMDUMP_TIMEOUT + FW_DOWNLOAD_TIMEOUT)
 
 /* susclk rate */
 #define SUSCLK_RATE_32KHZ      32768
@@ -1096,7 +1095,7 @@ static void qca_controller_memdump(struct work_struct *work)
 
                        queue_delayed_work(qca->workqueue,
                                           &qca->ctrl_memdump_timeout,
-                                          msecs_to_jiffies(MEMDUMP_TIMEOUT_MS));
+                                          MEMDUMP_TIMEOUT);
                        skb_pull(skb, sizeof(qca_memdump->ram_dump_size));
                        qca_memdump->current_seq_no = 0;
                        qca_memdump->received_dump = 0;
@@ -1369,7 +1368,7 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)
 
        if (hu->serdev)
                serdev_device_wait_until_sent(hu->serdev,
-                     msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS));
+                     CMD_TRANS_TIMEOUT);
 
        /* Give the controller time to process the request */
        switch (qca_soc_type(hu)) {
@@ -1401,8 +1400,8 @@ static inline void host_set_baudrate(struct hci_uart *hu, unsigned int speed)
 
 static int qca_send_power_pulse(struct hci_uart *hu, bool on)
 {
+       int timeout = CMD_TRANS_TIMEOUT;
        int ret;
-       int timeout = msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS);
        u8 cmd = on ? QCA_WCN3990_POWERON_PULSE : QCA_WCN3990_POWEROFF_PULSE;
 
        /* These power pulses are single byte command which are sent
@@ -1607,7 +1606,7 @@ static void qca_wait_for_dump_collection(struct hci_dev *hdev)
        struct qca_data *qca = hu->priv;
 
        wait_on_bit_timeout(&qca->flags, QCA_MEMDUMP_COLLECTION,
-                           TASK_UNINTERRUPTIBLE, MEMDUMP_TIMEOUT_MS);
+                           TASK_UNINTERRUPTIBLE, MEMDUMP_TIMEOUT);
 
        clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);
 }
@@ -2591,7 +2590,7 @@ static void qca_serdev_remove(struct serdev_device *serdev)
 static void qca_serdev_shutdown(struct serdev_device *serdev)
 {
        int ret;
-       int timeout = msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS);
+       int timeout = CMD_TRANS_TIMEOUT;
        struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev);
        struct hci_uart *hu = &qcadev->serdev_hu;
        struct hci_dev *hdev = hu->hdev;
@@ -2648,7 +2647,7 @@ static int __maybe_unused qca_suspend(struct device *dev)
        bool tx_pending = false;
        int ret = 0;
        u8 cmd;
-       u32 wait_timeout = 0;
+       unsigned long wait_timeout = 0;
 
        set_bit(QCA_SUSPENDING, &qca->flags);
 
@@ -2669,15 +2668,15 @@ static int __maybe_unused qca_suspend(struct device *dev)
        if (test_bit(QCA_IBS_DISABLED, &qca->flags) ||
            test_bit(QCA_SSR_TRIGGERED, &qca->flags)) {
                wait_timeout = test_bit(QCA_SSR_TRIGGERED, &qca->flags) ?
-                                       IBS_DISABLE_SSR_TIMEOUT_MS :
-                                       FW_DOWNLOAD_TIMEOUT_MS;
+                                       IBS_DISABLE_SSR_TIMEOUT :
+                                       FW_DOWNLOAD_TIMEOUT;
 
                /* QCA_IBS_DISABLED flag is set to true, During FW download
                 * and during memory dump collection. It is reset to false,
                 * After FW download complete.
                 */
                wait_on_bit_timeout(&qca->flags, QCA_IBS_DISABLED,
-                           TASK_UNINTERRUPTIBLE, msecs_to_jiffies(wait_timeout));
+                           TASK_UNINTERRUPTIBLE, wait_timeout);
 
                if (test_bit(QCA_IBS_DISABLED, &qca->flags)) {
                        bt_dev_err(hu->hdev, "SSR or FW download time out");
@@ -2729,7 +2728,7 @@ static int __maybe_unused qca_suspend(struct device *dev)
 
        if (tx_pending) {
                serdev_device_wait_until_sent(hu->serdev,
-                                             msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS));
+                                             CMD_TRANS_TIMEOUT);
                serial_clock_vote(HCI_IBS_TX_VOTE_CLOCK_OFF, hu);
        }
 
@@ -2738,7 +2737,7 @@ static int __maybe_unused qca_suspend(struct device *dev)
         */
        ret = wait_event_interruptible_timeout(qca->suspend_wait_q,
                        qca->rx_ibs_state == HCI_IBS_RX_ASLEEP,
-                       msecs_to_jiffies(IBS_BTSOC_TX_IDLE_TIMEOUT_MS));
+                       IBS_BTSOC_TX_IDLE_TIMEOUT);
        if (ret == 0) {
                ret = -ETIMEDOUT;
                goto error;