OSDN Git Service

Merge tag 'modules-for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...
[tomoyo/tomoyo-test1.git] / drivers / bluetooth / hci_qca.c
index d6e0c99..439392b 100644 (file)
@@ -29,6 +29,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/serdev.h>
+#include <linux/mutex.h>
 #include <asm/unaligned.h>
 
 #include <net/bluetooth/bluetooth.h>
@@ -69,7 +70,8 @@ enum qca_flags {
        QCA_IBS_ENABLED,
        QCA_DROP_VENDOR_EVENT,
        QCA_SUSPENDING,
-       QCA_MEMDUMP_COLLECTION
+       QCA_MEMDUMP_COLLECTION,
+       QCA_HW_ERROR_EVENT
 };
 
 
@@ -138,18 +140,19 @@ struct qca_data {
        u32 tx_idle_delay;
        struct timer_list wake_retrans_timer;
        u32 wake_retrans;
-       struct timer_list memdump_timer;
        struct workqueue_struct *workqueue;
        struct work_struct ws_awake_rx;
        struct work_struct ws_awake_device;
        struct work_struct ws_rx_vote_off;
        struct work_struct ws_tx_vote_off;
        struct work_struct ctrl_memdump_evt;
+       struct delayed_work ctrl_memdump_timeout;
        struct qca_memdump_data *qca_memdump;
        unsigned long flags;
        struct completion drop_ev_comp;
        wait_queue_head_t suspend_wait_q;
        enum qca_memdump_states memdump_state;
+       struct mutex hci_memdump_lock;
 
        /* For debugging purpose */
        u64 ibs_sent_wacks;
@@ -522,23 +525,28 @@ static void hci_ibs_wake_retrans_timeout(struct timer_list *t)
                hci_uart_tx_wakeup(hu);
 }
 
-static void hci_memdump_timeout(struct timer_list *t)
+
+static void qca_controller_memdump_timeout(struct work_struct *work)
 {
-       struct qca_data *qca = from_timer(qca, t, tx_idle_timer);
+       struct qca_data *qca = container_of(work, struct qca_data,
+                                       ctrl_memdump_timeout.work);
        struct hci_uart *hu = qca->hu;
-       struct qca_memdump_data *qca_memdump = qca->qca_memdump;
-       char *memdump_buf = qca_memdump->memdump_buf_tail;
-
-       bt_dev_err(hu->hdev, "clearing allocated memory due to memdump timeout");
-       /* Inject hw error event to reset the device and driver. */
-       hci_reset_dev(hu->hdev);
-       vfree(memdump_buf);
-       kfree(qca_memdump);
-       qca->memdump_state = QCA_MEMDUMP_TIMEOUT;
-       del_timer(&qca->memdump_timer);
-       cancel_work_sync(&qca->ctrl_memdump_evt);
+
+       mutex_lock(&qca->hci_memdump_lock);
+       if (test_bit(QCA_MEMDUMP_COLLECTION, &qca->flags)) {
+               qca->memdump_state = QCA_MEMDUMP_TIMEOUT;
+               if (!test_bit(QCA_HW_ERROR_EVENT, &qca->flags)) {
+                       /* Inject hw error event to reset the device
+                        * and driver.
+                        */
+                       hci_reset_dev(hu->hdev);
+               }
+       }
+
+       mutex_unlock(&qca->hci_memdump_lock);
 }
 
+
 /* Initialize protocol */
 static int qca_open(struct hci_uart *hu)
 {
@@ -558,6 +566,7 @@ static int qca_open(struct hci_uart *hu)
        skb_queue_head_init(&qca->tx_wait_q);
        skb_queue_head_init(&qca->rx_memdump_q);
        spin_lock_init(&qca->hci_ibs_lock);
+       mutex_init(&qca->hci_memdump_lock);
        qca->workqueue = alloc_ordered_workqueue("qca_wq", 0);
        if (!qca->workqueue) {
                BT_ERR("QCA Workqueue not initialized properly");
@@ -570,6 +579,8 @@ static int qca_open(struct hci_uart *hu)
        INIT_WORK(&qca->ws_rx_vote_off, qca_wq_serial_rx_clock_vote_off);
        INIT_WORK(&qca->ws_tx_vote_off, qca_wq_serial_tx_clock_vote_off);
        INIT_WORK(&qca->ctrl_memdump_evt, qca_controller_memdump);
+       INIT_DELAYED_WORK(&qca->ctrl_memdump_timeout,
+                         qca_controller_memdump_timeout);
        init_waitqueue_head(&qca->suspend_wait_q);
 
        qca->hu = hu;
@@ -596,7 +607,6 @@ static int qca_open(struct hci_uart *hu)
 
        timer_setup(&qca->tx_idle_timer, hci_ibs_tx_idle_timeout, 0);
        qca->tx_idle_delay = IBS_HOST_TX_IDLE_TIMEOUT_MS;
-       timer_setup(&qca->memdump_timer, hci_memdump_timeout, 0);
 
        BT_DBG("HCI_UART_QCA open, tx_idle_delay=%u, wake_retrans=%u",
               qca->tx_idle_delay, qca->wake_retrans);
@@ -677,7 +687,6 @@ static int qca_close(struct hci_uart *hu)
        skb_queue_purge(&qca->rx_memdump_q);
        del_timer(&qca->tx_idle_timer);
        del_timer(&qca->wake_retrans_timer);
-       del_timer(&qca->memdump_timer);
        destroy_workqueue(qca->workqueue);
        qca->hu = NULL;
 
@@ -963,11 +972,20 @@ static void qca_controller_memdump(struct work_struct *work)
 
        while ((skb = skb_dequeue(&qca->rx_memdump_q))) {
 
+               mutex_lock(&qca->hci_memdump_lock);
+               /* Skip processing the received packets if timeout detected. */
+               if (qca->memdump_state == QCA_MEMDUMP_TIMEOUT) {
+                       mutex_unlock(&qca->hci_memdump_lock);
+                       return;
+               }
+
                if (!qca_memdump) {
                        qca_memdump = kzalloc(sizeof(struct qca_memdump_data),
                                              GFP_ATOMIC);
-                       if (!qca_memdump)
+                       if (!qca_memdump) {
+                               mutex_unlock(&qca->hci_memdump_lock);
                                return;
+                       }
 
                        qca->qca_memdump = qca_memdump;
                }
@@ -992,13 +1010,15 @@ static void qca_controller_memdump(struct work_struct *work)
                        if (!(dump_size)) {
                                bt_dev_err(hu->hdev, "Rx invalid memdump size");
                                kfree_skb(skb);
+                               mutex_unlock(&qca->hci_memdump_lock);
                                return;
                        }
 
                        bt_dev_info(hu->hdev, "QCA collecting dump of size:%u",
                                    dump_size);
-                       mod_timer(&qca->memdump_timer, (jiffies +
-                                 msecs_to_jiffies(MEMDUMP_TIMEOUT_MS)));
+                       queue_delayed_work(qca->workqueue,
+                                          &qca->ctrl_memdump_timeout,
+                                       msecs_to_jiffies(MEMDUMP_TIMEOUT_MS));
 
                        skb_pull(skb, sizeof(dump_size));
                        memdump_buf = vmalloc(dump_size);
@@ -1016,6 +1036,7 @@ static void qca_controller_memdump(struct work_struct *work)
                        kfree(qca_memdump);
                        kfree_skb(skb);
                        qca->qca_memdump = NULL;
+                       mutex_unlock(&qca->hci_memdump_lock);
                        return;
                }
 
@@ -1046,16 +1067,20 @@ static void qca_controller_memdump(struct work_struct *work)
                        memdump_buf = qca_memdump->memdump_buf_head;
                        dev_coredumpv(&hu->serdev->dev, memdump_buf,
                                      qca_memdump->received_dump, GFP_KERNEL);
-                       del_timer(&qca->memdump_timer);
+                       cancel_delayed_work(&qca->ctrl_memdump_timeout);
                        kfree(qca->qca_memdump);
                        qca->qca_memdump = NULL;
                        qca->memdump_state = QCA_MEMDUMP_COLLECTED;
+                       clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);
                }
+
+               mutex_unlock(&qca->hci_memdump_lock);
        }
 
 }
 
-int qca_controller_memdump_event(struct hci_dev *hdev, struct sk_buff *skb)
+static int qca_controller_memdump_event(struct hci_dev *hdev,
+                                       struct sk_buff *skb)
 {
        struct hci_uart *hu = hci_get_drvdata(hdev);
        struct qca_data *qca = hu->priv;
@@ -1406,30 +1431,21 @@ static void qca_wait_for_dump_collection(struct hci_dev *hdev)
 {
        struct hci_uart *hu = hci_get_drvdata(hdev);
        struct qca_data *qca = hu->priv;
-       struct qca_memdump_data *qca_memdump = qca->qca_memdump;
-       char *memdump_buf = NULL;
 
        wait_on_bit_timeout(&qca->flags, QCA_MEMDUMP_COLLECTION,
                            TASK_UNINTERRUPTIBLE, MEMDUMP_TIMEOUT_MS);
 
        clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);
-       if (qca->memdump_state == QCA_MEMDUMP_IDLE) {
-               bt_dev_err(hu->hdev, "Clearing the buffers due to timeout");
-               if (qca_memdump)
-                       memdump_buf = qca_memdump->memdump_buf_tail;
-               vfree(memdump_buf);
-               kfree(qca_memdump);
-               qca->memdump_state = QCA_MEMDUMP_TIMEOUT;
-               del_timer(&qca->memdump_timer);
-               cancel_work_sync(&qca->ctrl_memdump_evt);
-       }
 }
 
 static void qca_hw_error(struct hci_dev *hdev, u8 code)
 {
        struct hci_uart *hu = hci_get_drvdata(hdev);
        struct qca_data *qca = hu->priv;
+       struct qca_memdump_data *qca_memdump = qca->qca_memdump;
+       char *memdump_buf = NULL;
 
+       set_bit(QCA_HW_ERROR_EVENT, &qca->flags);
        bt_dev_info(hdev, "mem_dump_status: %d", qca->memdump_state);
 
        if (qca->memdump_state == QCA_MEMDUMP_IDLE) {
@@ -1449,6 +1465,23 @@ static void qca_hw_error(struct hci_dev *hdev, u8 code)
                bt_dev_info(hdev, "waiting for dump to complete");
                qca_wait_for_dump_collection(hdev);
        }
+
+       if (qca->memdump_state != QCA_MEMDUMP_COLLECTED) {
+               bt_dev_err(hu->hdev, "clearing allocated memory due to memdump timeout");
+               mutex_lock(&qca->hci_memdump_lock);
+               if (qca_memdump)
+                       memdump_buf = qca_memdump->memdump_buf_head;
+               vfree(memdump_buf);
+               kfree(qca_memdump);
+               qca->qca_memdump = NULL;
+               qca->memdump_state = QCA_MEMDUMP_TIMEOUT;
+               cancel_delayed_work(&qca->ctrl_memdump_timeout);
+               skb_queue_purge(&qca->rx_memdump_q);
+               mutex_unlock(&qca->hci_memdump_lock);
+               cancel_work_sync(&qca->ctrl_memdump_evt);
+       }
+
+       clear_bit(QCA_HW_ERROR_EVENT, &qca->flags);
 }
 
 static void qca_cmd_timeout(struct hci_dev *hdev)
@@ -1529,9 +1562,11 @@ static int qca_power_on(struct hci_dev *hdev)
                ret = qca_wcn3990_init(hu);
        } else {
                qcadev = serdev_device_get_drvdata(hu->serdev);
-               gpiod_set_value_cansleep(qcadev->bt_en, 1);
-               /* Controller needs time to bootup. */
-               msleep(150);
+               if (qcadev->bt_en) {
+                       gpiod_set_value_cansleep(qcadev->bt_en, 1);
+                       /* Controller needs time to bootup. */
+                       msleep(150);
+               }
        }
 
        return ret;
@@ -1717,7 +1752,7 @@ static void qca_power_shutdown(struct hci_uart *hu)
                host_set_baudrate(hu, 2400);
                qca_send_power_pulse(hu, false);
                qca_regulator_disable(qcadev);
-       } else {
+       } else if (qcadev->bt_en) {
                gpiod_set_value_cansleep(qcadev->bt_en, 0);
        }
 }
@@ -1726,9 +1761,11 @@ static int qca_power_off(struct hci_dev *hdev)
 {
        struct hci_uart *hu = hci_get_drvdata(hdev);
        struct qca_data *qca = hu->priv;
+       enum qca_btsoc_type soc_type = qca_soc_type(hu);
 
        /* Stop sending shutdown command if soc crashes. */
-       if (qca->memdump_state == QCA_MEMDUMP_IDLE) {
+       if (qca_is_wcn399x(soc_type)
+               && qca->memdump_state == QCA_MEMDUMP_IDLE) {
                qca_send_pre_shutdown_cmd(hdev);
                usleep_range(8000, 10000);
        }
@@ -1755,7 +1792,11 @@ static int qca_regulator_enable(struct qca_serdev *qcadev)
 
        power->vregs_on = true;
 
-       return 0;
+       ret = clk_prepare_enable(qcadev->susclk);
+       if (ret)
+               qca_regulator_disable(qcadev);
+
+       return ret;
 }
 
 static void qca_regulator_disable(struct qca_serdev *qcadev)
@@ -1773,6 +1814,8 @@ static void qca_regulator_disable(struct qca_serdev *qcadev)
 
        regulator_bulk_disable(power->num_vregs, power->vreg_bulk);
        power->vregs_on = false;
+
+       clk_disable_unprepare(qcadev->susclk);
 }
 
 static int qca_init_regulators(struct qca_power *qca,
@@ -1811,6 +1854,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
        struct hci_dev *hdev;
        const struct qca_vreg_data *data;
        int err;
+       bool power_ctrl_enabled = true;
 
        qcadev = devm_kzalloc(&serdev->dev, sizeof(*qcadev), GFP_KERNEL);
        if (!qcadev)
@@ -1839,6 +1883,12 @@ static int qca_serdev_probe(struct serdev_device *serdev)
 
                qcadev->bt_power->vregs_on = false;
 
+               qcadev->susclk = devm_clk_get_optional(&serdev->dev, NULL);
+               if (IS_ERR(qcadev->susclk)) {
+                       dev_err(&serdev->dev, "failed to acquire clk\n");
+                       return PTR_ERR(qcadev->susclk);
+               }
+
                device_property_read_u32(&serdev->dev, "max-speed",
                                         &qcadev->oper_speed);
                if (!qcadev->oper_speed)
@@ -1851,38 +1901,40 @@ static int qca_serdev_probe(struct serdev_device *serdev)
                }
        } else {
                qcadev->btsoc_type = QCA_ROME;
-               qcadev->bt_en = devm_gpiod_get(&serdev->dev, "enable",
+               qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable",
                                               GPIOD_OUT_LOW);
-               if (IS_ERR(qcadev->bt_en)) {
-                       dev_err(&serdev->dev, "failed to acquire enable gpio\n");
-                       return PTR_ERR(qcadev->bt_en);
+               if (!qcadev->bt_en) {
+                       dev_warn(&serdev->dev, "failed to acquire enable gpio\n");
+                       power_ctrl_enabled = false;
                }
 
-               qcadev->susclk = devm_clk_get(&serdev->dev, NULL);
-               if (IS_ERR(qcadev->susclk)) {
-                       dev_err(&serdev->dev, "failed to acquire clk\n");
-                       return PTR_ERR(qcadev->susclk);
-               }
-
-               err = clk_set_rate(qcadev->susclk, SUSCLK_RATE_32KHZ);
-               if (err)
-                       return err;
+               qcadev->susclk = devm_clk_get_optional(&serdev->dev, NULL);
+               if (!qcadev->susclk) {
+                       dev_warn(&serdev->dev, "failed to acquire clk\n");
+               } else {
+                       err = clk_set_rate(qcadev->susclk, SUSCLK_RATE_32KHZ);
+                       if (err)
+                               return err;
 
-               err = clk_prepare_enable(qcadev->susclk);
-               if (err)
-                       return err;
+                       err = clk_prepare_enable(qcadev->susclk);
+                       if (err)
+                               return err;
+               }
 
                err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
                if (err) {
                        BT_ERR("Rome serdev registration failed");
-                       clk_disable_unprepare(qcadev->susclk);
+                       if (qcadev->susclk)
+                               clk_disable_unprepare(qcadev->susclk);
                        return err;
                }
        }
 
-       hdev = qcadev->serdev_hu.hdev;
-       set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks);
-       hdev->shutdown = qca_power_off;
+       if (power_ctrl_enabled) {
+               hdev = qcadev->serdev_hu.hdev;
+               set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks);
+               hdev->shutdown = qca_power_off;
+       }
 
        return 0;
 }
@@ -1893,7 +1945,7 @@ static void qca_serdev_remove(struct serdev_device *serdev)
 
        if (qca_is_wcn399x(qcadev->btsoc_type))
                qca_power_shutdown(&qcadev->serdev_hu);
-       else
+       else if (qcadev->susclk)
                clk_disable_unprepare(qcadev->susclk);
 
        hci_uart_unregister_device(&qcadev->serdev_hu);