2019-06-14 07:24:19

by Sascha Hauer

[permalink] [raw]
Subject: [PATCH 2/3] 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 <[email protected]>
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 50212ac629e3..a0a74362455e 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);