]> asedeno.scripts.mit.edu Git - linux.git/blobdiff - drivers/bluetooth/hci_qca.c
Merge tag 'pci-v5.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[linux.git] / drivers / bluetooth / hci_qca.c
index 82e4cd4b66633cc76efb3793ef1052119aed8ee7..d6e0c99ee5eb1d5d9b832941a8768271baf0e610 100644 (file)
@@ -55,6 +55,9 @@
 /* Controller debug log header */
 #define QCA_DEBUG_HANDLE       0x2EDC
 
+/* max retry count when init fails */
+#define MAX_INIT_RETRIES 3
+
 /* Controller dump header */
 #define QCA_SSR_DUMP_HANDLE            0x0108
 #define QCA_DUMP_PACKET_SIZE           255
@@ -541,7 +544,6 @@ static int qca_open(struct hci_uart *hu)
 {
        struct qca_serdev *qcadev;
        struct qca_data *qca;
-       int ret;
 
        BT_DBG("hu %p qca_open", hu);
 
@@ -582,23 +584,10 @@ static int qca_open(struct hci_uart *hu)
        hu->priv = qca;
 
        if (hu->serdev) {
-
                qcadev = serdev_device_get_drvdata(hu->serdev);
-               if (!qca_is_wcn399x(qcadev->btsoc_type)) {
-                       gpiod_set_value_cansleep(qcadev->bt_en, 1);
-                       /* Controller needs time to bootup. */
-                       msleep(150);
-               } else {
+               if (qca_is_wcn399x(qcadev->btsoc_type)) {
                        hu->init_speed = qcadev->init_speed;
                        hu->oper_speed = qcadev->oper_speed;
-                       ret = qca_regulator_enable(qcadev);
-                       if (ret) {
-                               destroy_workqueue(qca->workqueue);
-                               kfree_skb(qca->rx_skb);
-                               hu->priv = NULL;
-                               kfree(qca);
-                               return ret;
-                       }
                }
        }
 
@@ -677,7 +666,6 @@ static int qca_flush(struct hci_uart *hu)
 /* Close protocol */
 static int qca_close(struct hci_uart *hu)
 {
-       struct qca_serdev *qcadev;
        struct qca_data *qca = hu->priv;
 
        BT_DBG("hu %p qca close", hu);
@@ -693,14 +681,7 @@ static int qca_close(struct hci_uart *hu)
        destroy_workqueue(qca->workqueue);
        qca->hu = NULL;
 
-       if (hu->serdev) {
-               qcadev = serdev_device_get_drvdata(hu->serdev);
-               if (qca_is_wcn399x(qcadev->btsoc_type))
-                       qca_power_shutdown(hu);
-               else
-                       gpiod_set_value_cansleep(qcadev->bt_en, 0);
-
-       }
+       qca_power_shutdown(hu);
 
        kfree_skb(qca->rx_skb);
 
@@ -1531,11 +1512,37 @@ static int qca_wcn3990_init(struct hci_uart *hu)
        return 0;
 }
 
+static int qca_power_on(struct hci_dev *hdev)
+{
+       struct hci_uart *hu = hci_get_drvdata(hdev);
+       enum qca_btsoc_type soc_type = qca_soc_type(hu);
+       struct qca_serdev *qcadev;
+       int ret = 0;
+
+       /* Non-serdev device usually is powered by external power
+        * and don't need additional action in driver for power on
+        */
+       if (!hu->serdev)
+               return 0;
+
+       if (qca_is_wcn399x(soc_type)) {
+               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);
+       }
+
+       return ret;
+}
+
 static int qca_setup(struct hci_uart *hu)
 {
        struct hci_dev *hdev = hu->hdev;
        struct qca_data *qca = hu->priv;
        unsigned int speed, qca_baudrate = QCA_BAUDRATE_115200;
+       unsigned int retries = 0;
        enum qca_btsoc_type soc_type = qca_soc_type(hu);
        const char *firmware_name = qca_get_firmware_name(hu);
        int ret;
@@ -1553,24 +1560,21 @@ static int qca_setup(struct hci_uart *hu)
         */
        set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
 
-       if (qca_is_wcn399x(soc_type)) {
-               bt_dev_info(hdev, "setting up wcn3990");
+       bt_dev_info(hdev, "setting up %s",
+               qca_is_wcn399x(soc_type) ? "wcn399x" : "ROME");
 
-               /* Enable NON_PERSISTENT_SETUP QUIRK to ensure to execute
-                * setup for every hci up.
-                */
-               set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks);
+retry:
+       ret = qca_power_on(hdev);
+       if (ret)
+               return ret;
+
+       if (qca_is_wcn399x(soc_type)) {
                set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
-               hu->hdev->shutdown = qca_power_off;
-               ret = qca_wcn3990_init(hu);
-               if (ret)
-                       return ret;
 
                ret = qca_read_soc_version(hdev, &soc_ver, soc_type);
                if (ret)
                        return ret;
        } else {
-               bt_dev_info(hdev, "ROME setup");
                qca_set_speed(hu, QCA_INIT_SPEED);
        }
 
@@ -1609,6 +1613,20 @@ static int qca_setup(struct hci_uart *hu)
                 * patch/nvm-config is found, so run with original fw/config.
                 */
                ret = 0;
+       } else {
+               if (retries < MAX_INIT_RETRIES) {
+                       qca_power_shutdown(hu);
+                       if (hu->serdev) {
+                               serdev_device_close(hu->serdev);
+                               ret = serdev_device_open(hu->serdev);
+                               if (ret) {
+                                       bt_dev_err(hdev, "failed to open port");
+                                       return ret;
+                               }
+                       }
+                       retries++;
+                       goto retry;
+               }
        }
 
        /* Setup bdaddr */
@@ -1673,6 +1691,7 @@ static void qca_power_shutdown(struct hci_uart *hu)
        struct qca_serdev *qcadev;
        struct qca_data *qca = hu->priv;
        unsigned long flags;
+       enum qca_btsoc_type soc_type = qca_soc_type(hu);
 
        qcadev = serdev_device_get_drvdata(hu->serdev);
 
@@ -1685,11 +1704,22 @@ static void qca_power_shutdown(struct hci_uart *hu)
        qca_flush(hu);
        spin_unlock_irqrestore(&qca->hci_ibs_lock, flags);
 
-       host_set_baudrate(hu, 2400);
-       qca_send_power_pulse(hu, false);
-       qca_regulator_disable(qcadev);
        hu->hdev->hw_error = NULL;
        hu->hdev->cmd_timeout = NULL;
+
+       /* Non-serdev device usually is powered by external power
+        * and don't need additional action in driver for power down
+        */
+       if (!hu->serdev)
+               return;
+
+       if (qca_is_wcn399x(soc_type)) {
+               host_set_baudrate(hu, 2400);
+               qca_send_power_pulse(hu, false);
+               qca_regulator_disable(qcadev);
+       } else {
+               gpiod_set_value_cansleep(qcadev->bt_en, 0);
+       }
 }
 
 static int qca_power_off(struct hci_dev *hdev)
@@ -1778,6 +1808,7 @@ static int qca_init_regulators(struct qca_power *qca,
 static int qca_serdev_probe(struct serdev_device *serdev)
 {
        struct qca_serdev *qcadev;
+       struct hci_dev *hdev;
        const struct qca_vreg_data *data;
        int err;
 
@@ -1803,7 +1834,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
                                          data->num_vregs);
                if (err) {
                        BT_ERR("Failed to init regulators:%d", err);
-                       goto out;
+                       return err;
                }
 
                qcadev->bt_power->vregs_on = false;
@@ -1816,7 +1847,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
                err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
                if (err) {
                        BT_ERR("wcn3990 serdev registration failed");
-                       goto out;
+                       return err;
                }
        } else {
                qcadev->btsoc_type = QCA_ROME;
@@ -1842,12 +1873,18 @@ static int qca_serdev_probe(struct serdev_device *serdev)
                        return err;
 
                err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
-               if (err)
+               if (err) {
+                       BT_ERR("Rome serdev registration failed");
                        clk_disable_unprepare(qcadev->susclk);
+                       return err;
+               }
        }
 
-out:   return err;
+       hdev = qcadev->serdev_hu.hdev;
+       set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks);
+       hdev->shutdown = qca_power_off;
 
+       return 0;
 }
 
 static void qca_serdev_remove(struct serdev_device *serdev)