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

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index ecb74965be10831169f1228479be132bb122c8ca..d6e0c99ee5eb1d5d9b832941a8768271baf0e610 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -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
@@ -1539,6 +1542,7 @@ 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;
@@ -1559,17 +1563,13 @@ static int qca_setup(struct hci_uart *hu)
        bt_dev_info(hdev, "setting up %s",
                qca_is_wcn399x(soc_type) ? "wcn399x" : "ROME");
 
+retry:
        ret = qca_power_on(hdev);
        if (ret)
                return ret;
 
        if (qca_is_wcn399x(soc_type)) {
-               /* Enable NON_PERSISTENT_SETUP QUIRK to ensure to execute
-                * setup for every hci up.
-                */
-               set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks);
                set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
-               hu->hdev->shutdown = qca_power_off;
 
                ret = qca_read_soc_version(hdev, &soc_ver, soc_type);
                if (ret)
@@ -1613,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 */
@@ -1794,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;
 
@@ -1819,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;
@@ -1832,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;
@@ -1858,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)