From a55b896455f558075197d89e026c91fcea263627 Mon Sep 17 00:00:00 2001 From: Sascha Hauer <s.hauer@pengutronix.de> Date: Fri, 14 Jun 2019 09:23:50 +0200 Subject: [PATCH] Bluetooth: hci_mrvl: Wait for final ack before switching baudrate For the Marvell HCI UART we have to upload two firmware files. The first one is only for switching the baudrate of the device to a higher baudrate. After the baudrate switching firmware has been uploaded the device waits for a final ack (0x5a) before actually switching the baudrate. To send this final ack with the old baudrate give the hci ldisc workqueue a chance to run before switching the baudrate. Without this the final ack will never be received by the device and firmware upload fails. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> --- drivers/bluetooth/hci_mrvl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/bluetooth/hci_mrvl.c b/drivers/bluetooth/hci_mrvl.c index 50212ac629e35..a0a74362455ec 100644 --- a/drivers/bluetooth/hci_mrvl.c +++ b/drivers/bluetooth/hci_mrvl.c @@ -339,6 +339,9 @@ static int mrvl_setup(struct hci_uart *hu) return -EINVAL; } + /* Let the final ack go out before switching the baudrate */ + hci_uart_wait_until_sent(hu); + hci_uart_set_baudrate(hu, 3000000); hci_uart_set_flow_control(hu, false); -- GitLab