Bluetooth: btnxpuart: Revert baudrate change in nxp_shutdown

This reverts the change baudrate logic in nxp_shutdown.

Earlier, when the driver was removed, it restored the controller
baudrate to fw_init_baudrate, so that on re-loading the driver, things
work fine.

However, if the driver was removed while hci0 interface is down, the
change baudrate vendor command could not be sent by the driver. When the
driver was re-loaded, host and controller baudrate would be mismatched
and hci initialization would fail. The only way to recover would be to
reboot the system.

This issue was fixed by moving the restore baudrate logic from
nxp_serdev_remove() to nxp_shutdown().

This fix however caused another issue with the command "hciconfig hci0
reset", which makes hci0 DOWN and UP immediately.

Running "bluetoothctl power off" and "bluetoothctl power on" in a tight
loop works fine.

To maintain support for "hciconfig reset" command, the above mentioned fix
is reverted.

Fixes: 6fca6781d19d ("Bluetooth: btnxpuart: Move vendor specific initialization to .post_init")
Signed-off-by: Neeraj Sanjay Kale <neeraj.sanjaykale@nxp.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/btnxpuart.c b/drivers/bluetooth/btnxpuart.c
index 5091dea762a0734c9a8d6faaa362244a96fd91c0..2d58b8be2c5fb43c15667e06918585b38eff944d 100644 (file)
--- a/drivers/bluetooth/btnxpuart.c
+++ b/drivers/bluetooth/btnxpuart.c
@@ -1445,9 +1445,6 @@ static int nxp_shutdown(struct hci_dev *hdev)
                /* HCI_NXP_IND_RESET command may not returns any response */
                if (!IS_ERR(skb))
                        kfree_skb(skb);
-       } else if (nxpdev->current_baudrate != nxpdev->fw_init_baudrate) {
-               nxpdev->new_baudrate = nxpdev->fw_init_baudrate;
-               nxp_set_baudrate_cmd(hdev, NULL);
        }
 
        return 0;
@@ -1799,13 +1796,15 @@ static void nxp_serdev_remove(struct serdev_device *serdev)
                clear_bit(BTNXPUART_FW_DOWNLOADING, &nxpdev->tx_state);
                wake_up_interruptible(&nxpdev->check_boot_sign_wait_q);
                wake_up_interruptible(&nxpdev->fw_dnld_done_wait_q);
-       }
-
-       if (test_bit(HCI_RUNNING, &hdev->flags)) {
-               /* Ensure shutdown callback is executed before unregistering, so
-                * that baudrate is reset to initial value.
+       } else {
+               /* Restore FW baudrate to fw_init_baudrate if changed.
+                * This will ensure FW baudrate is in sync with
+                * driver baudrate in case this driver is re-inserted.
                 */
-               nxp_shutdown(hdev);
+               if (nxpdev->current_baudrate != nxpdev->fw_init_baudrate) {
+                       nxpdev->new_baudrate = nxpdev->fw_init_baudrate;
+                       nxp_set_baudrate_cmd(hdev, NULL);
+               }
        }
 
        ps_cleanup(nxpdev);